Rename dbus_internal_do_not_use_get_uuid to _dbus_get_uuid

This was the only remaining symbol using the long prefix. Renaming it
gives us one consistent rule: symbols starting with dbus are public,
symbols starting with _dbus are not.

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-uuidgen.c b/dbus/dbus-uuidgen.c
index b4041633c1124f0ce61e3953db5415a9474f773d..52cd252052e9622b608bc105d454834d2a3c2636 100644 (file)
--- a/dbus/dbus-uuidgen.c
+++ b/dbus/dbus-uuidgen.c
@@ -80,10 +80,10 @@ return_uuid (DBusGUID   *uuid,
  * @returns #FALSE if error is set
  */
 dbus_bool_t
-dbus_internal_do_not_use_get_uuid (const char *filename,
-                                   char      **uuid_p,
-                                   dbus_bool_t create_if_not_found,
-                                   DBusError  *error)
+_dbus_get_uuid (const char   *filename,
+                char        **uuid_p,
+                dbus_bool_t   create_if_not_found,
+                DBusError    *error)
 {
   DBusGUID uuid;
   

diff --git a/dbus/dbus-uuidgen.h b/dbus/dbus-uuidgen.h
index 7003f163014798e4c891bda1e24d2004e2814c85..5098380971224e6305cca8896afe479e1c5e8d0a 100644 (file)
--- a/dbus/dbus-uuidgen.h
+++ b/dbus/dbus-uuidgen.h
@@ -33,10 +33,10 @@
 DBUS_BEGIN_DECLS
 
 DBUS_PRIVATE_EXPORT
-dbus_bool_t dbus_internal_do_not_use_get_uuid    (const char *filename,
-                                                  char      **uuid_p,
-                                                  dbus_bool_t create_if_not_found,
-                                                  DBusError  *error);
+dbus_bool_t _dbus_get_uuid    (const char   *filename,
+                               char        **uuid_p,
+                               dbus_bool_t   create_if_not_found,
+                               DBusError    *error);
 DBUS_PRIVATE_EXPORT
 dbus_bool_t _dbus_create_uuid                    (char      **uuid_p,
                                                   DBusError  *error);

diff --git a/tools/dbus-uuidgen.c b/tools/dbus-uuidgen.c
index 337bdd0b38830bc9543b6ef94a4f0d26f6c3e82b..6d8d97a2abeb109ab7a770cf1ef2412666d031ad 100644 (file)
--- a/tools/dbus-uuidgen.c
+++ b/tools/dbus-uuidgen.c
@@ -132,7 +132,7 @@ main (int argc, char *argv[])
   if (get_uuid || ensure_uuid)
     {
       char *uuid;
-      if (dbus_internal_do_not_use_get_uuid (filename, &uuid, ensure_uuid, &error))
+      if (_dbus_get_uuid (filename, &uuid, ensure_uuid, &error))
         {
           if (get_uuid) /* print nothing on --ensure */
             printf ("%s\n", uuid);