dbus/dbus dbus-message.c,1.137,1.138 dbus-keyring.c,1.24,1.25

[Olivier Andrieu]

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

Modified Files:
	dbus-message.c dbus-keyring.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: dbus-message.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-message.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- dbus-message.c	10 Aug 2004 03:07:00 -0000	1.137
+++ dbus-message.c	10 Aug 2004 21:32:25 -0000	1.138
@@ -5480,8 +5480,10 @@
 	  return TRUE;
         }      
       
-      header_len_unsigned = _dbus_unpack_uint32 (byte_order, header_data + 4);
-      body_len_unsigned = _dbus_unpack_uint32 (byte_order, header_data + 8);
+      header_len_unsigned = _dbus_unpack_uint32 (byte_order, 
+                                                 (const unsigned char *) header_data + 4);
+      body_len_unsigned = _dbus_unpack_uint32 (byte_order, 
+                                               (const unsigned char *) header_data + 8);
 
       if (header_len_unsigned < 16)
         {

Index: dbus-keyring.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-keyring.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- dbus-keyring.c	10 Aug 2004 03:06:59 -0000	1.24
+++ dbus-keyring.c	10 Aug 2004 21:32:25 -0000	1.25
@@ -291,7 +291,7 @@
   DBusKey *new;
   DBusString bytes;
   int id;
-  unsigned long timestamp;
+  long timestamp;
   const unsigned char *s;
   dbus_bool_t retval;
   DBusKey *keys;