Attachment 97973 Details for Bug 77941 – [1/2] _dbus_write_uuid_file: factor out function to write a known UUID

[patch] [1/2] _dbus_write_uuid_file: factor out function to write a known UUID

0001-_dbus_write_uuid_file-factor-out-function-to-write-a.patch (text/plain), 2.39 KB, created by Simon McVittie on 2014-04-25 17:59:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-04-25 17:59:54 UTC

Size: 2.39 KB

patch

obsolete

>From e25d53aa5d277284efd16e5f5cca97304dcd4470 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 25 Apr 2014 18:30:19 +0100
>Subject: [PATCH 1/2] _dbus_write_uuid_file: factor out function to write a
> known UUID
>
>---
> dbus/dbus-internals.c | 21 ++++++++++++++-------
> dbus/dbus-internals.h |  4 ++++
> 2 files changed, 18 insertions(+), 7 deletions(-)
>
>diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c
>index e248259..575a087 100644
>--- a/dbus/dbus-internals.c
>+++ b/dbus/dbus-internals.c
>@@ -745,10 +745,18 @@ _dbus_read_uuid_file_without_creating (const DBusString *filename,
>   return FALSE;
> }
> 
>-static dbus_bool_t
>-_dbus_create_uuid_file_exclusively (const DBusString *filename,
>-                                    DBusGUID         *uuid,
>-                                    DBusError        *error)
>+/**
>+ * Write the give UUID to a file.
>+ *
>+ * @param filename the file to write
>+ * @param uuid the UUID to save
>+ * @param error used to raise an error
>+ * @returns #FALSE on error
>+ */
>+dbus_bool_t
>+_dbus_write_uuid_file (const DBusString *filename,
>+                       const DBusGUID   *uuid,
>+                       DBusError        *error)
> {
>   DBusString encoded;
> 
>@@ -757,8 +765,6 @@ _dbus_create_uuid_file_exclusively (const DBusString *filename,
>       _DBUS_SET_OOM (error);
>       return FALSE;
>     }
>-
>-  _dbus_generate_uuid (uuid);
>   
>   if (!_dbus_uuid_encode (uuid, &encoded))
>     {
>@@ -825,7 +831,8 @@ _dbus_read_uuid_file (const DBusString *filename,
>   else
>     {
>       dbus_error_free (&read_error);
>-      return _dbus_create_uuid_file_exclusively (filename, uuid, error);
>+      _dbus_generate_uuid (uuid);
>+      return _dbus_write_uuid_file (filename, uuid, error);
>     }
> }
> 
>diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
>index c5a3c9b..c64d756 100644
>--- a/dbus/dbus-internals.h
>+++ b/dbus/dbus-internals.h
>@@ -361,6 +361,10 @@ dbus_bool_t _dbus_read_uuid_file (const DBusString *filename,
>                                   dbus_bool_t       create_if_not_found,
>                                   DBusError        *error);
> 
>+dbus_bool_t _dbus_write_uuid_file (const DBusString *filename,
>+                                   const DBusGUID   *uuid,
>+                                   DBusError        *error);
>+
> dbus_bool_t _dbus_get_local_machine_uuid_encoded (DBusString *uuid_str);
> 
> #define _DBUS_PASTE2(a, b) a ## b
>-- 
>2.0.0.rc0
>

Actions: View | Splinter Review

Attachments on bug 77941: 97973 | 97974

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.