From 3c89788fa483ebda858ab66797e2834af94b798f Mon Sep 17 00:00:00 2001
From: Kjartan Maraas <kmaraas@gnome.org>
Date: Tue, 21 Apr 2009 12:52:22 -0400
Subject: Bug 19502 - Sparse warning cleanups

This patch makes various things that should be static static,
corrects some "return FALSE" where it should be NULL, etc.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 dbus/dbus-connection.c        | 4 ++--
 dbus/dbus-keyring.c           | 4 ++--
 dbus/dbus-string.c            | 2 +-
 dbus/dbus-sysdeps-util-unix.c | 3 ++-
 dbus/dbus-transport.c         | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'dbus')

diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index ae07adf0..d44d728b 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -2927,7 +2927,7 @@ dbus_connection_get_server_id (DBusConnection *connection)
 {
   char *id;
 
-  _dbus_return_val_if_fail (connection != NULL, FALSE);
+  _dbus_return_val_if_fail (connection != NULL, NULL);
   
   CONNECTION_LOCK (connection);
   id = _dbus_strdup (_dbus_transport_get_server_id (connection->transport));
@@ -3340,7 +3340,7 @@ dbus_connection_send_with_reply_and_block (DBusConnection     *connection,
  * 
  * @param connection the connection.
  */
-DBusDispatchStatus
+static DBusDispatchStatus
 _dbus_connection_flush_unlocked (DBusConnection *connection)
 {
   /* We have to specify DBUS_ITERATION_DO_READING here because
diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
index de6a5ea4..8cc4048f 100644
--- a/dbus/dbus-keyring.c
+++ b/dbus/dbus-keyring.c
@@ -1075,7 +1075,7 @@ _dbus_keyring_test (void)
   dbus_error_init (&error);
   ring1 = _dbus_keyring_new_for_credentials (NULL, &context,
                                              &error);
-  _dbus_assert (ring1);
+  _dbus_assert (ring1 != NULL);
   _dbus_assert (error.name == NULL);
 
   id = _dbus_keyring_get_best_key (ring1, &error);
@@ -1087,7 +1087,7 @@ _dbus_keyring_test (void)
     }
 
   ring2 = _dbus_keyring_new_for_credentials (NULL, &context, &error);
-  _dbus_assert (ring2);
+  _dbus_assert (ring2 != NULL);
   _dbus_assert (error.name == NULL);
   
   if (ring1->n_keys != ring2->n_keys)
diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c
index 6b9b2bfe..85812c48 100644
--- a/dbus/dbus-string.c
+++ b/dbus/dbus-string.c
@@ -1245,7 +1245,7 @@ _dbus_string_append_printf_valist  (DBusString        *str,
                                     va_list            args)
 {
   int len;
-  va_list args_copy;
+  va_list args_copy = 0;
 
   DBUS_STRING_PREAMBLE (str);
 
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
index df9f7116..dbab8236 100644
--- a/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@ -1234,4 +1234,5 @@ fail:
   _dbus_string_free (&cmdline);
   _dbus_string_free (&path);
   return FALSE;
-}
\ No newline at end of file
+}
+
diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
index 90291980..35b7027d 100644
--- a/dbus/dbus-transport.c
+++ b/dbus/dbus-transport.c
@@ -242,7 +242,7 @@ check_address (const char *address, DBusError *error)
   _dbus_assert (*address != '\0');
 
   if (!dbus_parse_address (address, &entries, &len, error))
-    return FALSE;              /* not a valid address */
+    return NULL;              /* not a valid address */
 
   for (i = 0; i < len; i++)
     {
-- 
cgit