dbus/test shell-test.c, 1.2, 1.3 test-names.c, 1.1, 1.2 test-service.c, 1.23, 1.24 test-shell-service.c, 1.1, 1.2

John Palmieri johnp at kemper.freedesktop.org
Mon Aug 14 12:11:37 PDT 2006


Update of /cvs/dbus/dbus/test
In directory kemper:/tmp/cvs-serv23710/test

Modified Files:
	shell-test.c test-names.c test-service.c test-shell-service.c 
Log Message:
Patches by Kjartan Maraas <kmaraas at gnome dot org>

        * 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


Index: shell-test.c
===================================================================
RCS file: /cvs/dbus/dbus/test/shell-test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- shell-test.c	10 Aug 2006 20:09:43 -0000	1.2
+++ shell-test.c	14 Aug 2006 19:11:35 -0000	1.3
@@ -21,7 +21,7 @@
   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 *);

Index: test-names.c
===================================================================
RCS file: /cvs/dbus/dbus/test/test-names.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- test-names.c	12 Sep 2005 08:19:33 -0000	1.1
+++ test-names.c	14 Aug 2006 19:11:35 -0000	1.2
@@ -46,7 +46,6 @@
       char **argv)
 {
   DBusError error;
-  int result;
   DBusConnection *connection;
   
   dbus_error_init (&error);

Index: test-service.c
===================================================================
RCS file: /cvs/dbus/dbus/test/test-service.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- test-service.c	15 Jul 2005 15:21:43 -0000	1.23
+++ test-service.c	14 Aug 2006 19:11:35 -0000	1.24
@@ -27,7 +27,7 @@
                              void *user_data)
 {
   DBusMessage *reply;
-  DBusMessage *echo_message, *echo_reply;
+  DBusMessage *echo_message, *echo_reply = NULL;
   DBusError error;
   DBusConnection *connection;
   

Index: test-shell-service.c
===================================================================
RCS file: /cvs/dbus/dbus/test/test-shell-service.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- test-shell-service.c	14 Jul 2005 20:44:15 -0000	1.1
+++ test-shell-service.c	14 Aug 2006 19:11:35 -0000	1.2
@@ -36,12 +36,11 @@
   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");
 
 



More information about the dbus-commit mailing list