diff options
author | John (J5) Palmieri <johnp@redhat.com> | 2005-11-30 19:32:27 +0000 |
---|---|---|
committer | John (J5) Palmieri <johnp@redhat.com> | 2005-11-30 19:32:27 +0000 |
commit | 0ca96ec548a6e4a1e39429f3c0480adfe7e2eab8 (patch) | |
tree | 90cf95cc76cdd8e3242eb94e9ae7703b8fbd829d /dbus | |
parent | 111118fd8a9240440ec0e4b9710bebf91e186881 (diff) |
* dbus/dbus-auth.c, dbus/dbus-connection.c, dbus/dbus-keyring.c,
dbus/dbus-server-debug-pipe.c, glib/dbus-binding-tool-glib.c
glib/dbus-glib-tool.c, glib/dbus-gparser.c, glib/dbus-gproxy.c
test/test-segfault.c, test/test-utils.c,
test/glib/test-dbus-glib.c, tools/dbus-cleanup-sockets.c
tools/dbus-launch.c, tools/dbus-tree-view.c, tools/dbus-viewer.c:
Various cleanup of dead code and compiler warnings (patch from
Kjartan Maraas <kmaraas at gnome.org>)
Diffstat (limited to 'dbus')
-rw-r--r-- | dbus/dbus-auth.c | 2 | ||||
-rw-r--r-- | dbus/dbus-connection.c | 2 | ||||
-rw-r--r-- | dbus/dbus-keyring.c | 4 | ||||
-rw-r--r-- | dbus/dbus-server-debug-pipe.c | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c index 8c45f625..63348536 100644 --- a/dbus/dbus-auth.c +++ b/dbus/dbus-auth.c @@ -543,8 +543,6 @@ sha1_handle_first_client_response (DBusAuth *auth, if (auth->keyring == NULL) { - DBusError error; - dbus_error_init (&error); auth->keyring = _dbus_keyring_new_homedir (data, &auth->context, diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index 31aea4c9..3c8c765d 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -2762,7 +2762,7 @@ dbus_connection_send_with_reply_and_block (DBusConnection *connection, _dbus_return_val_if_fail (connection != NULL, NULL); _dbus_return_val_if_fail (message != NULL, NULL); - _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, FALSE); + _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, NULL); _dbus_return_val_if_error_is_set (error, NULL); if (!dbus_connection_send_with_reply (connection, message, diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c index 77d90605..018f45af 100644 --- a/dbus/dbus-keyring.c +++ b/dbus/dbus-keyring.c @@ -730,7 +730,7 @@ _dbus_keyring_new_homedir (const DBusString *username, if (!_dbus_string_init (&homedir)) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); - return FALSE; + return NULL; } _dbus_string_init_const (&dotdir, ".dbus-keyrings"); @@ -855,7 +855,7 @@ _dbus_keyring_new_homedir (const DBusString *username, if (keyring) _dbus_keyring_unref (keyring); _dbus_string_free (&homedir); - return FALSE; + return NULL; } diff --git a/dbus/dbus-server-debug-pipe.c b/dbus/dbus-server-debug-pipe.c index 9c147c6c..57882d97 100644 --- a/dbus/dbus-server-debug-pipe.c +++ b/dbus/dbus-server-debug-pipe.c @@ -289,7 +289,7 @@ _dbus_transport_debug_pipe_new (const char *server_name, dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); _dbus_transport_unref (server_transport); _dbus_transport_unref (client_transport); - return FALSE; + return NULL; } connection = _dbus_connection_new_for_transport (server_transport); |