Attachment 140787 Details for Bug 107349 – Rename dbus_internal_do_not_use_get_uuid to _dbus_get_uuid

[patch] Rename dbus_internal_do_not_use_get_uuid to _dbus_get_uuid

0004-Rename-dbus_internal_do_not_use_get_uuid-to-_dbus_ge.patch (text/plain), 2.64 KB, created by Simon McVittie on 2018-07-23 17:11:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2018-07-23 17:11:08 UTC

Size: 2.64 KB

patch

obsolete

>From e3135182a774954a8ed45243001ccb2df25f2f60 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Mon, 23 Jul 2018 17:32:27 +0100
>Subject: [PATCH 4/7] 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>
>---
> dbus/dbus-uuidgen.c  | 8 ++++----
> dbus/dbus-uuidgen.h  | 8 ++++----
> tools/dbus-uuidgen.c | 2 +-
> 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);
>-- 
>2.18.0
>

Actions: View | Splinter Review

Attachments on bug 107349: 140784 | 140785 | 140786 | 140787 | 140788 | 140789 | 140790 | 140791 | 140792 | 140794

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.