dbus/bus main.c,1.25,1.26 bus.c,1.54,1.55

[Olivier Andrieu]

Update of /cvs/dbus/dbus/bus
In directory pdx:/tmp/cvs-serv31180/bus

Modified Files:
	main.c bus.c 
Log Message:
* bus/bus.c (process_config_first_time_only): get rid of an unused
  DBusError that was causing a memoy leak (bug #989). 

* dbus/dbus-keyring.c, dbus/dbus-message.c: fix compilation on
  Solaris/Forte C (bug #974) 

* bus/main.c (main): plug two minuscule memleaks.


Index: main.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/main.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- main.c	10 Aug 2004 03:06:59 -0000	1.25
+++ main.c	10 Aug 2004 21:32:25 -0000	1.26
@@ -351,6 +351,7 @@
           print_addr_fd = val;
         }
     }
+  _dbus_string_free (&addr_fd);
 
   print_pid_fd = -1;
   if (print_pid)
@@ -372,6 +373,7 @@
           print_pid_fd = val;
         }
     }
+  _dbus_string_free (&pid_fd);
 
   if (!bus_selinux_init ())
     {

Index: bus.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/bus.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- bus.c	10 Aug 2004 03:06:59 -0000	1.54
+++ bus.c	10 Aug 2004 21:32:25 -0000	1.55
@@ -282,17 +282,14 @@
     {
       DBusString u;
       DBusStat stbuf;
-      DBusError tmp_error;
       
-      dbus_error_init (&tmp_error);
       _dbus_string_init_const (&u, pidfile);
       
-      if (_dbus_stat (&u, &stbuf, &tmp_error))
+      if (_dbus_stat (&u, &stbuf, NULL))
 	{
 	  dbus_set_error (error, DBUS_ERROR_FAILED,
 			  "The pid file \"%s\" exists, if the message bus is not running, remove this file",
 			  pidfile);
-	  dbus_error_free (&tmp_error);
 	  goto failed;
 	}
     }