summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2018-07-23 17:32:27 +0100
committerSimon McVittie <smcv@collabora.com>2018-08-02 15:26:24 +0100
commit7efc06293ab8a6bf4aba50dac0da55e4a583360a (patch)
tree918910052f767a3c7d0faee400acdf13f2d9cfcb
parenta20c5b4d6fd5618ed0870cc84c4491f418e1a696 (diff)
downloaddbus-7efc06293ab8a6bf4aba50dac0da55e4a583360a.tar.gz
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>
-rw-r--r--dbus/dbus-uuidgen.c8
-rw-r--r--dbus/dbus-uuidgen.h8
-rw-r--r--tools/dbus-uuidgen.c2
3 files changed, 9 insertions, 9 deletions
diff --git a/dbus/dbus-uuidgen.c b/dbus/dbus-uuidgen.c
index b4041633..52cd2520 100644
--- 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 7003f163..50983809 100644
--- 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 337bdd0b..6d8d97a2 100644
--- 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);