dbus/dbus dbus-dataslot.c, 1.11, 1.12 dbus-marshal-basic.c, 1.27,
1.28 dbus-marshal-recursive-util.c, 1.10,
1.11 dbus-server-debug-pipe.c, 1.19, 1.20 dbus-sysdeps-util.c,
1.7, 1.8 dbus-sysdeps.c, 1.106, 1.107 dbus-sysdeps.h, 1.53,
1.54 dbus-transport-unix.c, 1.49, 1.50
John Palmieri
johnp at kemper.freedesktop.org
Mon Aug 14 12:11:37 PDT 2006
Update of /cvs/dbus/dbus/dbus
In directory kemper:/tmp/cvs-serv23710/dbus
Modified Files:
dbus-dataslot.c dbus-marshal-basic.c
dbus-marshal-recursive-util.c dbus-server-debug-pipe.c
dbus-sysdeps-util.c dbus-sysdeps.c dbus-sysdeps.h
dbus-transport-unix.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: dbus-dataslot.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-dataslot.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dbus-dataslot.c 9 Aug 2006 19:45:24 -0000 1.11
+++ dbus-dataslot.c 14 Aug 2006 19:11:35 -0000 1.12
@@ -305,7 +305,7 @@
* 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);
Index: dbus-marshal-basic.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-marshal-basic.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- dbus-marshal-basic.c 17 Jul 2006 18:23:39 -0000 1.27
+++ dbus-marshal-basic.c 14 Aug 2006 19:11:35 -0000 1.28
@@ -1663,7 +1663,6 @@
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;
Index: dbus-marshal-recursive-util.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-marshal-recursive-util.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dbus-marshal-recursive-util.c 23 Apr 2005 22:34:48 -0000 1.10
+++ dbus-marshal-recursive-util.c 14 Aug 2006 19:11:35 -0000 1.11
@@ -945,7 +945,7 @@
if (!(* klass->construct) (node))
{
dbus_free (node);
- return FALSE;
+ return NULL;
}
}
Index: dbus-server-debug-pipe.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-server-debug-pipe.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- dbus-server-debug-pipe.c 30 Nov 2005 19:32:26 -0000 1.19
+++ dbus-server-debug-pipe.c 14 Aug 2006 19:11:35 -0000 1.20
@@ -257,7 +257,7 @@
_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);
Index: dbus-sysdeps-util.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-util.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dbus-sysdeps-util.c 8 Aug 2006 23:29:03 -0000 1.7
+++ dbus-sysdeps-util.c 14 Aug 2006 19:11:35 -0000 1.8
@@ -297,7 +297,7 @@
act.sa_handler = handler;
act.sa_mask = empty_mask;
act.sa_flags = 0;
- sigaction (sig, &act, 0);
+ sigaction (sig, &act, NULL);
}
Index: dbus-sysdeps.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- dbus-sysdeps.c 10 Aug 2006 20:09:43 -0000 1.106
+++ dbus-sysdeps.c 14 Aug 2006 19:11:35 -0000 1.107
@@ -3005,7 +3005,7 @@
* @returns char* - location of temp directory
*/
char*
-_dbus_get_tmpdir()
+_dbus_get_tmpdir(void)
{
char* tmpdir;
Index: dbus-sysdeps.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- dbus-sysdeps.h 10 Aug 2006 20:09:43 -0000 1.53
+++ dbus-sysdeps.h 14 Aug 2006 19:11:35 -0000 1.54
@@ -323,7 +323,7 @@
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.
Index: dbus-transport-unix.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-transport-unix.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- dbus-transport-unix.c 30 May 2006 15:34:10 -0000 1.49
+++ dbus-transport-unix.c 14 Aug 2006 19:11:35 -0000 1.50
@@ -1229,7 +1229,7 @@
_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_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);
More information about the dbus-commit
mailing list