diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-10 11:41:57 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-11 17:26:30 +0100 |
| commit | f55897af74ac072d3447e5cf513d0f4718b142c7 (patch) | |
| tree | 46d9b68f129998ac8c9fbadf098b6be383519f1a /dbus/dbus-internals.c | |
| parent | e54d56b7b22dfc4a6eccb4e75e6d76e168fe90a0 (diff) | |
Use DBUS_ERROR_INIT instead of dbus_error_init wherever it's clearly equivalent
Diffstat (limited to 'dbus/dbus-internals.c')
| -rw-r--r-- | dbus/dbus-internals.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c index fdc08d3c..c99bee1a 100644 --- a/dbus/dbus-internals.c +++ b/dbus/dbus-internals.c @@ -668,9 +668,7 @@ _dbus_read_uuid_file (const DBusString *filename, dbus_bool_t create_if_not_found, DBusError *error) { - DBusError read_error; - - dbus_error_init (&read_error); + DBusError read_error = DBUS_ERROR_INIT; if (_dbus_read_uuid_file_without_creating (filename, uuid, &read_error)) return TRUE; @@ -719,8 +717,8 @@ _dbus_get_local_machine_uuid_encoded (DBusString *uuid_str) _DBUS_LOCK (machine_uuid); if (machine_uuid_initialized_generation != _dbus_current_generation) { - DBusError error; - dbus_error_init (&error); + DBusError error = DBUS_ERROR_INIT; + if (!_dbus_read_local_machine_uuid (&machine_uuid, FALSE, &error)) { |