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-server.c | |
| parent | e54d56b7b22dfc4a6eccb4e75e6d76e168fe90a0 (diff) | |
Use DBUS_ERROR_INIT instead of dbus_error_init wherever it's clearly equivalent
Diffstat (limited to 'dbus/dbus-server.c')
| -rw-r--r-- | dbus/dbus-server.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c index 755fadad..f04829b6 100644 --- a/dbus/dbus-server.c +++ b/dbus/dbus-server.c @@ -543,7 +543,7 @@ dbus_server_listen (const char *address, DBusServer *server; DBusAddressEntry **entries; int len, i; - DBusError first_connect_error; + DBusError first_connect_error = DBUS_ERROR_INIT; dbus_bool_t handled_once; _dbus_return_val_if_fail (address != NULL, NULL); @@ -553,9 +553,8 @@ dbus_server_listen (const char *address, return NULL; server = NULL; - dbus_error_init (&first_connect_error); handled_once = FALSE; - + for (i = 0; i < len; i++) { int j; @@ -563,9 +562,8 @@ dbus_server_listen (const char *address, for (j = 0; j < (int) _DBUS_N_ELEMENTS (listen_funcs); ++j) { DBusServerListenResult result; - DBusError tmp_error; - - dbus_error_init (&tmp_error); + DBusError tmp_error = DBUS_ERROR_INIT; + result = (* listen_funcs[j].func) (entries[i], &server, &tmp_error); @@ -1167,11 +1165,10 @@ _dbus_server_test (void) for (i = 0; i < _DBUS_N_ELEMENTS (valid_addresses); i++) { - DBusError error; + DBusError error = DBUS_ERROR_INIT; char *address; char *id; - - dbus_error_init (&error); + server = dbus_server_listen (valid_addresses[i], &error); if (server == NULL) { |