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-keyring.c | |
| parent | e54d56b7b22dfc4a6eccb4e75e6d76e168fe90a0 (diff) | |
Use DBUS_ERROR_INIT instead of dbus_error_init wherever it's clearly equivalent
Diffstat (limited to 'dbus/dbus-keyring.c')
| -rw-r--r-- | dbus/dbus-keyring.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c index 4b7182df..de6a5ea4 100644 --- a/dbus/dbus-keyring.c +++ b/dbus/dbus-keyring.c @@ -201,9 +201,8 @@ _dbus_keyring_lock (DBusKeyring *keyring) n_timeouts = 0; while (n_timeouts < MAX_LOCK_TIMEOUTS) { - DBusError error; + DBusError error = DBUS_ERROR_INIT; - dbus_error_init (&error); if (_dbus_create_file_exclusively (&keyring->filename_lock, &error)) break; @@ -219,13 +218,11 @@ _dbus_keyring_lock (DBusKeyring *keyring) if (n_timeouts == MAX_LOCK_TIMEOUTS) { - DBusError error; - + DBusError error = DBUS_ERROR_INIT; + _dbus_verbose ("Lock file timed out %d times, assuming stale\n", n_timeouts); - dbus_error_init (&error); - if (!_dbus_delete_file (&keyring->filename_lock, &error)) { _dbus_verbose ("Couldn't delete old lock file: %s\n", @@ -250,8 +247,8 @@ _dbus_keyring_lock (DBusKeyring *keyring) static void _dbus_keyring_unlock (DBusKeyring *keyring) { - DBusError error; - dbus_error_init (&error); + DBusError error = DBUS_ERROR_INIT; + if (!_dbus_delete_file (&keyring->filename_lock, &error)) { _dbus_warn ("Failed to delete lock file: %s\n", |