8 files changed, 8 insertions, 9 deletions
diff --git a/dbus/dbus-dataslot.c b/dbus/dbus-dataslot.c
index 8b1bbb87..83e25865 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 b983ae56..048e85a1 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 2a2c57d9..c2e9b411 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 57882d97..0917c1e0 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 bfc87801..ebe20b4a 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 43bfcd8c..20ff014f 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 8e7c5019..1df9986e 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 39216cab..b2f7faa3 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);