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-connection.c | |
| parent | e54d56b7b22dfc4a6eccb4e75e6d76e168fe90a0 (diff) | |
Use DBUS_ERROR_INIT instead of dbus_error_init wherever it's clearly equivalent
Diffstat (limited to 'dbus/dbus-connection.c')
| -rw-r--r-- | dbus/dbus-connection.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index b6ecc36d..e6848c1d 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -1709,8 +1709,8 @@ _dbus_connection_open_internal (const char *address, { DBusConnection *connection; DBusAddressEntry **entries; - DBusError tmp_error; - DBusError first_error; + DBusError tmp_error = DBUS_ERROR_INIT; + DBusError first_error = DBUS_ERROR_INIT; int len, i; _DBUS_ASSERT_ERROR_IS_CLEAR (error); @@ -1725,8 +1725,6 @@ _dbus_connection_open_internal (const char *address, connection = NULL; - dbus_error_init (&tmp_error); - dbus_error_init (&first_error); for (i = 0; i < len; i++) { if (shared) @@ -5327,15 +5325,13 @@ dbus_connection_register_object_path (DBusConnection *connection, { char **decomposed_path; dbus_bool_t retval; - DBusError error; + DBusError error = DBUS_ERROR_INIT; _dbus_return_val_if_fail (connection != NULL, FALSE); _dbus_return_val_if_fail (path != NULL, FALSE); _dbus_return_val_if_fail (path[0] == '/', FALSE); _dbus_return_val_if_fail (vtable != NULL, FALSE); - dbus_error_init (&error); - if (!_dbus_decompose_path (path, strlen (path), &decomposed_path, NULL)) return FALSE; @@ -5430,15 +5426,13 @@ dbus_connection_register_fallback (DBusConnection *connection, { char **decomposed_path; dbus_bool_t retval; - DBusError error; + DBusError error = DBUS_ERROR_INIT; _dbus_return_val_if_fail (connection != NULL, FALSE); _dbus_return_val_if_fail (path != NULL, FALSE); _dbus_return_val_if_fail (path[0] == '/', FALSE); _dbus_return_val_if_fail (vtable != NULL, FALSE); - dbus_error_init (&error); - if (!_dbus_decompose_path (path, strlen (path), &decomposed_path, NULL)) return FALSE; |