dbus/tools dbus-cleanup-sockets.c, 1.1, 1.2 dbus-launch.c, 1.10, 1.11 dbus-tree-view.c, 1.9, 1.10 dbus-viewer.c, 1.15, 1.16

[John Palmieri]

Update of /cvs/dbus/dbus/tools
In directory gabe:/tmp/cvs-serv31793/tools

Modified Files:
	dbus-cleanup-sockets.c dbus-launch.c dbus-tree-view.c 
	dbus-viewer.c 
Log Message:
* 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>) 


Index: dbus-cleanup-sockets.c
===================================================================
RCS file: /cvs/dbus/dbus/tools/dbus-cleanup-sockets.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dbus-cleanup-sockets.c	1 Jun 2003 07:33:59 -0000	1.1
+++ dbus-cleanup-sockets.c	30 Nov 2005 19:32:27 -0000	1.2
@@ -376,14 +376,12 @@
 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 @@
           dirname = arg;
         }
 
-      prev_arg = arg;
-
       ++i;
     }
 

Index: dbus-launch.c
===================================================================
RCS file: /cvs/dbus/dbus/tools/dbus-launch.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dbus-launch.c	12 Jul 2005 21:09:53 -0000	1.10
+++ dbus-launch.c	30 Nov 2005 19:32:27 -0000	1.11
@@ -137,7 +137,7 @@
   
   while (TRUE)
     {
-      size_t chunk;    
+      ssize_t chunk;    
       size_t to_read;
       
     again:
@@ -190,7 +190,7 @@
   
   while (TRUE)
     {
-      size_t chunk;    
+      ssize_t chunk;    
       size_t to_read;
       
     again:
@@ -323,7 +323,6 @@
   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 @@
   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 @@
           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)
         {

Index: dbus-tree-view.c
===================================================================
RCS file: /cvs/dbus/dbus/tools/dbus-tree-view.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dbus-tree-view.c	27 Feb 2005 17:38:12 -0000	1.9
+++ dbus-tree-view.c	30 Nov 2005 19:32:27 -0000	1.10
@@ -223,10 +223,6 @@
               const char   **path,
               NodeInfo      *node)
 {
-  GtkTreeStore *store;
-
-  store = GTK_TREE_STORE (model);
-
   if (path[0] == NULL)
     {
       /* Setting '/' */

Index: dbus-viewer.c
===================================================================
RCS file: /cvs/dbus/dbus/tools/dbus-viewer.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- dbus-viewer.c	31 Jul 2005 14:58:42 -0000	1.15
+++ dbus-viewer.c	30 Nov 2005 19:32:27 -0000	1.16
@@ -484,7 +484,6 @@
 int
 main (int argc, char **argv)
 {
-  const char *prev_arg;
   int i;
   GSList *files;
   gboolean end_of_args;
@@ -506,7 +505,6 @@
   services = FALSE;
   end_of_args = FALSE;
   files = NULL;
-  prev_arg = NULL;
   i = 1;
   while (i < argc)
     {
@@ -538,8 +536,6 @@
       else
         files = g_slist_prepend (files, (char*) arg);
       
-      prev_arg = arg;
-      
       ++i;
     }