test: Don't use dbus_internal prefix for functions not in libdbus

As in the previous commit, this prefix is meaningless in translation
units that don't get compiled into libdbus.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=107349
Reviewed-by: Thiago Macieira <thiago@kde.org>

diff --git a/dbus/dbus-marshal-byteswap-util.c b/dbus/dbus-marshal-byteswap-util.c
index cdca3f4485b7918cebcaf3a0d7ced07c4cd37bd3..4891e0de3a6b164f3ffabee42cde93b432487d62 100644 (file)
--- a/dbus/dbus-marshal-byteswap-util.c
+++ b/dbus/dbus-marshal-byteswap-util.c
@@ -43,9 +43,7 @@ do_byteswap_test (int byte_order)
   opposite_order = byte_order == DBUS_LITTLE_ENDIAN ? DBUS_BIG_ENDIAN : DBUS_LITTLE_ENDIAN;
   
   sequence = 0;
-  while (dbus_internal_do_not_use_generate_bodies (sequence,
-                                                   byte_order,
-                                                   &signature, &body))
+  while (_dbus_test_generate_bodies (sequence, byte_order, &signature, &body))
     {
       DBusString copy;
       DBusTypeReader body_reader;

diff --git a/dbus/dbus-marshal-recursive-util.c b/dbus/dbus-marshal-recursive-util.c
index e10b7a6f11b3e58e60962ea9d8dde4b8df7f770a..97bc5fe3fe83c0d2111d7b8d6c18ee6dd742a386 100644 (file)
--- a/dbus/dbus-marshal-recursive-util.c
+++ b/dbus/dbus-marshal-recursive-util.c
@@ -1637,10 +1637,10 @@ build_body (TestTypeNode **nodes,
 }
 
 dbus_bool_t
-dbus_internal_do_not_use_generate_bodies (int           sequence,
-                                          int           byte_order,
-                                          DBusString   *signature,
-                                          DBusString   *body)
+_dbus_test_generate_bodies (int           sequence,
+                            int           byte_order,
+                            DBusString   *signature,
+                            DBusString   *body)
 {
   TestTypeNode *nodes[1];
   int i;

diff --git a/dbus/dbus-marshal-validate-util.c b/dbus/dbus-marshal-validate-util.c
index dc074b2d1697d7b6494f114835912a15f74d6707..2ef13a637de37a1cf9e06e6d80f7e9cbfdbd45a9 100644 (file)
--- a/dbus/dbus-marshal-validate-util.c
+++ b/dbus/dbus-marshal-validate-util.c
@@ -443,9 +443,8 @@ _dbus_marshal_validate_test (void)
       _dbus_test_fatal ("oom");
 
     sequence = 0;
-    while (dbus_internal_do_not_use_generate_bodies (sequence,
-                                                     DBUS_LITTLE_ENDIAN,
-                                                     &signature, &body))
+    while (_dbus_test_generate_bodies (sequence, DBUS_LITTLE_ENDIAN,
+                                       &signature, &body))
       {
         DBusValidity validity;
 
@@ -468,9 +467,8 @@ _dbus_marshal_validate_test (void)
       }
                                                      
     sequence = 0;
-    while (dbus_internal_do_not_use_generate_bodies (sequence,
-                                                     DBUS_BIG_ENDIAN,
-                                                     &signature, &body))
+    while (_dbus_test_generate_bodies (sequence, DBUS_BIG_ENDIAN,
+                                       &signature, &body))
       {
         DBusValidity validity;
 

diff --git a/dbus/dbus-message-factory.c b/dbus/dbus-message-factory.c
index f358eb1111ca1464ce31ac04bb94802a887b460e..6a8433e92e9c9e388846ba7b275bfdd09ef871ae 100644 (file)
--- a/dbus/dbus-message-factory.c
+++ b/dbus/dbus-message-factory.c
@@ -188,9 +188,8 @@ generate_many_bodies_inner (DBusMessageDataIter *iter,
   if (!_dbus_string_init (&signature) || !_dbus_string_init (&body))
     _dbus_test_fatal ("oom");
 
-  if (dbus_internal_do_not_use_generate_bodies (iter_get_sequence (iter),
-                                                byte_order,
-                                                &signature, &body))
+  if (_dbus_test_generate_bodies (iter_get_sequence (iter), byte_order,
+                                  &signature, &body))
     {
       const char *v_SIGNATURE;
 

diff --git a/dbus/dbus-test.h b/dbus/dbus-test.h
index 89cb23b540575fc869c2afdb955c5d971b4b946d..111e52f13712d4e6bf39193497c7d34fa1ea9c4b 100644 (file)
--- a/dbus/dbus-test.h
+++ b/dbus/dbus-test.h
@@ -96,13 +96,12 @@ dbus_bool_t _dbus_object_tree_test       (void);
 
 dbus_bool_t _dbus_credentials_test       (const char *test_data_dir);
 
-void        _dbus_run_tests                            (const char          *test_data_dir,
-                                                        const char          *specific_test);
-
-dbus_bool_t dbus_internal_do_not_use_generate_bodies    (int           sequence,
-                                                         int           byte_order,
-                                                         DBusString   *signature,
-                                                         DBusString   *body);
+void        _dbus_run_tests              (const char *test_data_dir,
+                                          const char *specific_test);
 
+dbus_bool_t _dbus_test_generate_bodies   (int         sequence,
+                                          int         byte_order,
+                                          DBusString *signature,
+                                          DBusString *body);
 
 #endif /* DBUS_TEST_H */