From c1091cbbd2477699dc16f8c8e3d15fea2f68d603 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Mon, 14 Aug 2006 19:11:35 +0000 Subject: [PATCH] Patches by Kjartan Maraas * bus/services.c (bus_service_list_queued_owners): Add a pointer cast to fix compiler warning * dbus/dbus-dataslot.c (_dbus_data_slot_list_get): return a NULL instead of FALSE since the return type is not expecting a boolean * dbus/dbus-marshal-basic.c (_dbus_marshal_test): Remove unused variable * dbus/dbus-marshal-recursive-util.c (node_new): return a NULL instead of FALSE since the return type is not expecting a boolean * dbus/dbus-server-debug-pipe.c (_dbus_transport_debug_pipe_new): Send a NULL into _dbus_transport_new_for_fd instead of a FALSE because we are expecting a pointer not a boolean * dbus/dbus-sysdeps-util.c (_dbus_get_tmpdir): add void as the parameter so some compilers don't complain * dbus/dbus-transport-unix.c (_dbus_transport_new_for_domain_socket, _dbus_transport_new_for_tcp_socket): Send a NULL into _dbus_transport_new_for_fd instead of a FALSE because we are expecting a pointer not a boolean * test/shell-test.c (test_command_line): cast the second argument to _dbus_list_append to avoid compiler warnings * test/test-names.c (main): remove unused variable * test/test-service.c (check_hello_from_self_reply): Initialize echo_message and echo_reply to NULL * test/test-shell-service.c (handle_echo): Remove unused variable and cast the third parameter passed to dbus_connection_get_object_path_data to avoid compiler warrnings * test/name-test/test-names.c (clear_message_queue): Remove unused function * test/name-test/test-pending-call-dispatch.c: Fix format string in printf --- ChangeLog | 51 +++++++++++++++++++++++++++++ bus/services.c | 2 +- dbus/dbus-dataslot.c | 2 +- dbus/dbus-marshal-basic.c | 1 - dbus/dbus-marshal-recursive-util.c | 2 +- dbus/dbus-server-debug-pipe.c | 2 +- dbus/dbus-sysdeps-util.c | 2 +- dbus/dbus-sysdeps.c | 2 +- dbus/dbus-sysdeps.h | 2 +- dbus/dbus-transport-unix.c | 4 +-- test/name-test/test-names.c | 19 ----------- test/name-test/test-pending-call-dispatch.c | 2 +- test/shell-test.c | 2 +- test/test-names.c | 1 - test/test-service.c | 2 +- test/test-shell-service.c | 3 +- 16 files changed, 64 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1bba3cb..a99c2a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,56 @@ 2006-08-14 John (J5) Palmieri + Patches by Kjartan Maraas + + * bus/services.c (bus_service_list_queued_owners): + Add a pointer cast to fix compiler warning + + * dbus/dbus-dataslot.c (_dbus_data_slot_list_get): + return a NULL instead of FALSE since the return type + is not expecting a boolean + + * dbus/dbus-marshal-basic.c (_dbus_marshal_test): + Remove unused variable + + * dbus/dbus-marshal-recursive-util.c (node_new): + return a NULL instead of FALSE since the return type + is not expecting a boolean + + * dbus/dbus-server-debug-pipe.c (_dbus_transport_debug_pipe_new): + Send a NULL into _dbus_transport_new_for_fd instead of a FALSE + because we are expecting a pointer not a boolean + + * dbus/dbus-sysdeps-util.c (_dbus_get_tmpdir): + add void as the parameter so some compilers + don't complain + + * dbus/dbus-transport-unix.c (_dbus_transport_new_for_domain_socket, + _dbus_transport_new_for_tcp_socket): + Send a NULL into _dbus_transport_new_for_fd instead of a FALSE + because we are expecting a pointer not a boolean + + * test/shell-test.c (test_command_line): + cast the second argument to _dbus_list_append to avoid compiler + warnings + + * test/test-names.c (main): remove unused variable + + * test/test-service.c (check_hello_from_self_reply): + Initialize echo_message and echo_reply to NULL + + * test/test-shell-service.c (handle_echo): + Remove unused variable and cast the third parameter passed to + dbus_connection_get_object_path_data to avoid compiler warrnings + + * test/name-test/test-names.c (clear_message_queue): + Remove unused function + + * test/name-test/test-pending-call-dispatch.c: + Fix format string in printf + + +2006-08-14 John (J5) Palmieri + * dbus/dbus-bus.c: * test/name-test/test-names.c: Remove test method dbus_bus_connection_get_unique_name because diff --git a/bus/services.c b/bus/services.c index 52f522b..bb7e77f 100644 --- a/bus/services.c +++ b/bus/services.c @@ -1266,7 +1266,7 @@ bus_service_list_queued_owners (BusService *service, owner = (BusOwner *) link->data; uname = bus_connection_get_name (owner->conn); - if (!_dbus_list_append (return_list, uname)) + if (!_dbus_list_append (return_list, (char *)uname)) goto oom; link = _dbus_list_get_next_link (&service->owners, link); diff --git a/dbus/dbus-dataslot.c b/dbus/dbus-dataslot.c index 8b1bbb8..83e2586 100644 --- a/dbus/dbus-dataslot.c +++ b/dbus/dbus-dataslot.c @@ -305,7 +305,7 @@ _dbus_data_slot_list_get (DBusDataSlotAllocator *allocator, * are disabled, since then the asserts are empty. */ if (!_dbus_mutex_lock (allocator->lock)) - return FALSE; + return NULL; _dbus_assert (slot >= 0); _dbus_assert (slot < allocator->n_allocated_slots); _dbus_assert (allocator->allocated_slots[slot].slot_id == slot); diff --git a/dbus/dbus-marshal-basic.c b/dbus/dbus-marshal-basic.c index b983ae5..048e85a 100644 --- a/dbus/dbus-marshal-basic.c +++ b/dbus/dbus-marshal-basic.c @@ -1663,7 +1663,6 @@ _dbus_marshal_test (void) dbus_uint16_t *v_ARRAY_UINT16; dbus_int32_t *v_ARRAY_INT32; dbus_uint32_t *v_ARRAY_UINT32; - double *v_ARRAY_DOUBLE; DBusString t; double v_DOUBLE; double t_DOUBLE; diff --git a/dbus/dbus-marshal-recursive-util.c b/dbus/dbus-marshal-recursive-util.c index 2a2c57d..c2e9b41 100644 --- a/dbus/dbus-marshal-recursive-util.c +++ b/dbus/dbus-marshal-recursive-util.c @@ -945,7 +945,7 @@ node_new (const TestTypeNodeClass *klass) if (!(* klass->construct) (node)) { dbus_free (node); - return FALSE; + return NULL; } } diff --git a/dbus/dbus-server-debug-pipe.c b/dbus/dbus-server-debug-pipe.c index 57882d9..0917c1e 100644 --- a/dbus/dbus-server-debug-pipe.c +++ b/dbus/dbus-server-debug-pipe.c @@ -257,7 +257,7 @@ _dbus_transport_debug_pipe_new (const char *server_name, _dbus_fd_set_close_on_exec (server_fd); client_transport = _dbus_transport_new_for_fd (client_fd, - FALSE, &address); + NULL, &address); if (client_transport == NULL) { _dbus_close (client_fd, NULL); diff --git a/dbus/dbus-sysdeps-util.c b/dbus/dbus-sysdeps-util.c index bfc8780..ebe20b4 100644 --- a/dbus/dbus-sysdeps-util.c +++ b/dbus/dbus-sysdeps-util.c @@ -297,7 +297,7 @@ _dbus_set_signal_handler (int sig, act.sa_handler = handler; act.sa_mask = empty_mask; act.sa_flags = 0; - sigaction (sig, &act, 0); + sigaction (sig, &act, NULL); } diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index 43bfcd8..20ff014 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -3005,7 +3005,7 @@ int _dbus_printf_string_upper_bound (const char *format, * @returns char* - location of temp directory */ char* -_dbus_get_tmpdir() +_dbus_get_tmpdir(void) { char* tmpdir; diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index 8e7c501..1df9986 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -323,7 +323,7 @@ void _dbus_set_signal_handler (int sig, dbus_bool_t _dbus_file_exists (const char *file); dbus_bool_t _dbus_user_at_console (const char *username, DBusError *error); -char* _dbus_get_tmpdir(); +char* _dbus_get_tmpdir(void); /* Define DBUS_VA_COPY() to do the right thing for copying va_list variables. * config.h may have already defined DBUS_VA_COPY as va_copy or __va_copy. diff --git a/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c index 39216ca..b2f7faa 100644 --- a/dbus/dbus-transport-unix.c +++ b/dbus/dbus-transport-unix.c @@ -1229,7 +1229,7 @@ _dbus_transport_new_for_domain_socket (const char *path, _dbus_verbose ("Successfully connected to unix socket %s\n", path); - transport = _dbus_transport_new_for_fd (fd, FALSE, &address); + transport = _dbus_transport_new_for_fd (fd, NULL, &address); if (transport == NULL) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); @@ -1297,7 +1297,7 @@ _dbus_transport_new_for_tcp_socket (const char *host, _dbus_verbose ("Successfully connected to tcp socket %s:%d\n", host, port); - transport = _dbus_transport_new_for_fd (fd, FALSE, &address); + transport = _dbus_transport_new_for_fd (fd, NULL, &address); if (transport == NULL) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); diff --git a/test/name-test/test-names.c b/test/name-test/test-names.c index 3cf7047..d25ff6a 100644 --- a/test/name-test/test-names.c +++ b/test/name-test/test-names.c @@ -193,25 +193,6 @@ check_connection (DBusConnection *conn, return FALSE; } -static void -clear_message_queue (DBusConnection *conn) -{ - int tries; - DBusMessage *msg; - - for (tries = 0; tries < NUM_TRIES_TIL_FAIL; tries++) - { - _dbus_connection_lock (conn); - _dbus_connection_do_iteration_unlocked (conn, - DBUS_ITERATION_DO_READING | - DBUS_ITERATION_DO_WRITING | - DBUS_ITERATION_BLOCK, - 0); - _dbus_connection_unlock (conn); - msg = dbus_connection_pop_message (conn); - } -} - static dbus_bool_t match_acquired_or_lost_signal (DBusConnection *conn, const char *member, const char *name) { diff --git a/test/name-test/test-pending-call-dispatch.c b/test/name-test/test-pending-call-dispatch.c index 4df2ed3..5472649 100644 --- a/test/name-test/test-pending-call-dispatch.c +++ b/test/name-test/test-pending-call-dispatch.c @@ -103,7 +103,7 @@ main (int argc, char *argv[]) /* we just care about seconds */ delta = end_tv_sec - start_tv_sec; - printf ("Iter %i: %is\n", i, delta); + printf ("Iter %i: %lis\n", i, delta); if (delta >= 5) { printf ("Failed: looks like we might have been be stuck in poll ***\n"); diff --git a/test/shell-test.c b/test/shell-test.c index 4115f19..c013467 100644 --- a/test/shell-test.c +++ b/test/shell-test.c @@ -21,7 +21,7 @@ test_command_line (const char *arg1, ...) DBusError error; va_start (var_args, arg1); - _dbus_list_append (&list, arg1); + _dbus_list_append (&list, (char *)arg1); do { tmp = va_arg (var_args, char *); diff --git a/test/test-names.c b/test/test-names.c index b29648d..e618e99 100644 --- a/test/test-names.c +++ b/test/test-names.c @@ -46,7 +46,6 @@ main (int argc, char **argv) { DBusError error; - int result; DBusConnection *connection; dbus_error_init (&error); diff --git a/test/test-service.c b/test/test-service.c index 77b8b3c..ed47a50 100644 --- a/test/test-service.c +++ b/test/test-service.c @@ -27,7 +27,7 @@ check_hello_from_self_reply (DBusPendingCall *pcall, void *user_data) { DBusMessage *reply; - DBusMessage *echo_message, *echo_reply; + DBusMessage *echo_message, *echo_reply = NULL; DBusError error; DBusConnection *connection; diff --git a/test/test-shell-service.c b/test/test-shell-service.c index 79a4949..71b4baa 100644 --- a/test/test-shell-service.c +++ b/test/test-shell-service.c @@ -36,12 +36,11 @@ handle_echo (DBusConnection *connection, DBusMessage *reply; DBusMessageIter iter; int i; - char *s; EchoData *d; _dbus_verbose ("sending reply to Echo method\n"); - if (!dbus_connection_get_object_path_data (connection, echo_path, &d)) + if (!dbus_connection_get_object_path_data (connection, echo_path, (void **)&d)) die ("No memory"); -- 2.7.4