dbus/test/name-test test-names.c, 1.2, 1.3 test-pending-call-dispatch.c, 1.1, 1.2

[John Palmieri]

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

Modified Files:
	test-names.c test-pending-call-dispatch.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: test-names.c
===================================================================
RCS file: /cvs/dbus/dbus/test/name-test/test-names.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test-names.c	14 Aug 2006 18:12:20 -0000	1.2
+++ test-names.c	14 Aug 2006 19:11:35 -0000	1.3
@@ -193,25 +193,6 @@
   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)
 {

Index: test-pending-call-dispatch.c
===================================================================
RCS file: /cvs/dbus/dbus/test/name-test/test-pending-call-dispatch.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- test-pending-call-dispatch.c	2 Mar 2006 22:24:28 -0000	1.1
+++ test-pending-call-dispatch.c	14 Aug 2006 19:11:35 -0000	1.2
@@ -103,7 +103,7 @@
 
       /* 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");