* dbus/dbus-auth.c, dbus/dbus-connection.c, dbus/dbus-keyring.c,

  dbus/dbus-server-debug-pipe.c, glib/dbus-binding-tool-glib.c
  glib/dbus-glib-tool.c, glib/dbus-gparser.c, glib/dbus-gproxy.c
  test/test-segfault.c, test/test-utils.c,
  test/glib/test-dbus-glib.c, tools/dbus-cleanup-sockets.c
  tools/dbus-launch.c, tools/dbus-tree-view.c, tools/dbus-viewer.c:
  Various cleanup of dead code and compiler warnings (patch from
  Kjartan Maraas <kmaraas at gnome.org>)

4 files changed, 5 insertions, 18 deletions

diff --git a/tools/dbus-cleanup-sockets.c b/tools/dbus-cleanup-sockets.c
index f163848c..1cd9b3cd 100644
--- a/tools/dbus-cleanup-sockets.c
+++ b/tools/dbus-cleanup-sockets.c
@@ -376,14 +376,12 @@ version (void)
 int
 main (int argc, char **argv)
 {
-  const char *prev_arg;
   int i;
   int saw_doubledash;
   const char *dirname;
 
   saw_doubledash = FALSE;
   dirname = NULL;
-  prev_arg = NULL;
   i = 1;
   while (i < argc)
     {
@@ -413,8 +411,6 @@ main (int argc, char **argv)
           dirname = arg;
         }
 
-      prev_arg = arg;
-
       ++i;
     }
 
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index ad4fd5a4..beb298c1 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -137,7 +137,7 @@ read_line (int        fd,
   
   while (TRUE)
     {
-      size_t chunk;    
+      ssize_t chunk;    
       size_t to_read;
       
     again:
@@ -190,7 +190,7 @@ read_pid (int        fd,
   
   while (TRUE)
     {
-      size_t chunk;    
+      ssize_t chunk;    
       size_t to_read;
       
     again:
@@ -323,7 +323,6 @@ kill_bus_when_session_ends (void)
   int x_fd;
   fd_set read_set;
   fd_set err_set;
-  int ret;
   struct sigaction act;
   sigset_t empty_mask;
 #ifdef DBUS_BUILD_X11
@@ -336,7 +335,7 @@ kill_bus_when_session_ends (void)
   act.sa_handler = signal_handler;
   act.sa_mask    = empty_mask;
   act.sa_flags   = 0;
-  sigaction (SIGHUP,  &act, 0);
+  sigaction (SIGHUP,  &act, NULL);
   
 #ifdef DBUS_BUILD_X11
   xdisplay = XOpenDisplay (NULL);
@@ -386,8 +385,8 @@ kill_bus_when_session_ends (void)
           FD_SET (x_fd, &err_set);
         }
       
-      ret = select (MAX (tty_fd, x_fd) + 1,
-                    &read_set, NULL, &err_set, NULL);
+      select (MAX (tty_fd, x_fd) + 1,
+              &read_set, NULL, &err_set, NULL);
 
       if (got_sighup)
         {
diff --git a/tools/dbus-tree-view.c b/tools/dbus-tree-view.c
index b4404457..448d770d 100644
--- a/tools/dbus-tree-view.c
+++ b/tools/dbus-tree-view.c
@@ -223,10 +223,6 @@ model_update (GtkTreeModel  *model,
               const char   **path,
               NodeInfo      *node)
 {
-  GtkTreeStore *store;
-
-  store = GTK_TREE_STORE (model);
-
   if (path[0] == NULL)
     {
       /* Setting '/' */
diff --git a/tools/dbus-viewer.c b/tools/dbus-viewer.c
index 8eb63dd3..2ff3267f 100644
--- a/tools/dbus-viewer.c
+++ b/tools/dbus-viewer.c
@@ -484,7 +484,6 @@ version (void)
 int
 main (int argc, char **argv)
 {
-  const char *prev_arg;
   int i;
   GSList *files;
   gboolean end_of_args;
@@ -506,7 +505,6 @@ main (int argc, char **argv)
   services = FALSE;
   end_of_args = FALSE;
   files = NULL;
-  prev_arg = NULL;
   i = 1;
   while (i < argc)
     {
@@ -538,8 +536,6 @@ main (int argc, char **argv)
       else
         files = g_slist_prepend (files, (char*) arg);
       
-      prev_arg = arg;
-      
       ++i;
     }