Attachment 121630 Details for Bug 92899 – Rename function string_array_length() to _dbus_string_array_length() and move it to dbus-internals.c.

[patch] Rename function string_array_length() to _dbus_string_array_length() and move it to dbus-internals.c.

0004-Rename-function-string_array_length-to-_dbus_string_.patch (text/plain), 4.49 KB, created by Ralf Habacker on 2016-02-09 20:30:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2016-02-09 20:30:17 UTC

Size: 4.49 KB

patch

obsolete

>From 6f20313649d92d445e534a388146419e5552ffdd Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Fri, 27 Nov 2015 12:10:54 +0100
>Subject: [PATCH 4/8] Rename function string_array_length() to
> _dbus_string_array_length() and move it to dbus-internals.c.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92899
>---
> dbus/dbus-internals.c   | 15 +++++++++++++++
> dbus/dbus-internals.h   |  2 ++
> dbus/dbus-object-tree.c | 22 +++++++---------------
> 3 files changed, 24 insertions(+), 15 deletions(-)
>
>diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c
>index d7ef089..f49f8fa 100644
>--- a/dbus/dbus-internals.c
>+++ b/dbus/dbus-internals.c
>@@ -642,6 +642,21 @@ _dbus_string_array_contains (const char **array,
> }
> 
> /**
>+ * Returns the size of a string array
>+ *
>+ * @param array array to search.
>+ * @returns size of array
>+ */
>+size_t
>+_dbus_string_array_length (const char **array)
>+{
>+  size_t i;
>+  for (i = 0; array[i]; i++) {}
>+  return i;
>+}
>+
>+
>+/**
>  * Generates a new UUID. If you change how this is done,
>  * there's some text about it in the spec that should also change.
>  *
>diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
>index 3eb8749..6f92fa4 100644
>--- a/dbus/dbus-internals.h
>+++ b/dbus/dbus-internals.h
>@@ -246,6 +246,8 @@ void*       _dbus_memdup                (const void  *mem,
> DBUS_PRIVATE_EXPORT
> dbus_bool_t _dbus_string_array_contains (const char **array,
>                                          const char  *str);
>+DBUS_PRIVATE_EXPORT
>+size_t      _dbus_string_array_length   (const char **array);
> char**      _dbus_dup_string_array      (const char **array);
> 
> #define _DBUS_INT16_MIN	 ((dbus_int16_t) 0x8000)
>diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c
>index e2a3b73..27481a8 100644
>--- a/dbus/dbus-object-tree.c
>+++ b/dbus/dbus-object-tree.c
>@@ -1592,14 +1592,6 @@ do_test_dispatch (DBusObjectTree *tree,
>   return FALSE;
> }
> 
>-static size_t
>-string_array_length (const char **array)
>-{
>-  size_t i;
>-  for (i = 0; array[i]; i++) ;
>-  return i;
>-}
>-
> typedef struct
> {
>   const char *path;
>@@ -1634,14 +1626,14 @@ run_decompose_tests (void)
>                                  &result, &result_len))
>         return FALSE;
> 
>-      expected_len = string_array_length (decompose_tests[i].result);
>+      expected_len = _dbus_string_array_length (decompose_tests[i].result);
>       
>-      if (result_len != (int) string_array_length ((const char**)result) ||
>+      if (result_len != (int) _dbus_string_array_length ((const char**)result) ||
>           expected_len != result_len ||
>           path_contains (decompose_tests[i].result,
>                          (const char**) result) != STR_EQUAL)
>         {
>-          int real_len = string_array_length ((const char**)result);
>+          int real_len = _dbus_string_array_length ((const char**)result);
>           _dbus_warn ("Expected decompose of %s to have len %d, returned %d, appears to have %d\n",
>                       decompose_tests[i].path, expected_len, result_len,
>                       real_len);
>@@ -1875,7 +1867,7 @@ object_tree_test_iteration (void *data)
>     _dbus_object_tree_list_registered_unlocked (tree, path1, &child_entries);
>     if (child_entries != NULL)
>       {
>-	nb = string_array_length ((const char**)child_entries);
>+	nb = _dbus_string_array_length ((const char**)child_entries);
> 	_dbus_assert (nb == 1);
> 	dbus_free_string_array (child_entries);
>       }
>@@ -1883,7 +1875,7 @@ object_tree_test_iteration (void *data)
>     _dbus_object_tree_list_registered_unlocked (tree, path2, &child_entries);
>     if (child_entries != NULL)
>       {
>-	nb = string_array_length ((const char**)child_entries);
>+	nb = _dbus_string_array_length ((const char**)child_entries);
> 	_dbus_assert (nb == 2);
> 	dbus_free_string_array (child_entries);
>       }
>@@ -1891,7 +1883,7 @@ object_tree_test_iteration (void *data)
>     _dbus_object_tree_list_registered_unlocked (tree, path8, &child_entries);
>     if (child_entries != NULL)
>       {
>-	nb = string_array_length ((const char**)child_entries);
>+	nb = _dbus_string_array_length ((const char**)child_entries);
> 	_dbus_assert (nb == 0);
> 	dbus_free_string_array (child_entries);
>       }
>@@ -1899,7 +1891,7 @@ object_tree_test_iteration (void *data)
>     _dbus_object_tree_list_registered_unlocked (tree, root, &child_entries);
>     if (child_entries != NULL)
>       {
>-	nb = string_array_length ((const char**)child_entries);
>+	nb = _dbus_string_array_length ((const char**)child_entries);
> 	_dbus_assert (nb == 3);
> 	dbus_free_string_array (child_entries);
>       }
>-- 
>2.6.2
>

Actions: View | Splinter Review

Attachments on bug 92899: 119691 | 119735 | 119741 | 119742 | 119743 | 119921 | 120166 | 120169 | 120170 | 120172 | 121599 | 121600 | 121619 | 121621 | 121623 | 121625 | 121626 | 121630 | 121631 | 121632 | 121635

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.