summaryrefslogtreecommitdiffstats
path: root/dbus
diff options
context:
space:
mode:
authorOlivier Andrieu <oliv__a@users.sourceforge.net>2004-08-10 21:32:25 +0000
committerOlivier Andrieu <oliv__a@users.sourceforge.net>2004-08-10 21:32:25 +0000
commiteb37885909180e7e4c25e5337bec385082174dbd (patch)
tree94c0b405df2efd20b624b82ceda980fdf06e3b6b /dbus
parentcd33e8dd6227e5f66114178ca1dc0f3677893252 (diff)
* 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.
Diffstat (limited to 'dbus')
-rw-r--r--dbus/dbus-keyring.c2
-rw-r--r--dbus/dbus-message.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
index d1444350..9877dca6 100644
--- a/dbus/dbus-keyring.c
+++ b/dbus/dbus-keyring.c
@@ -291,7 +291,7 @@ add_new_key (DBusKey **keys_p,
DBusKey *new;
DBusString bytes;
int id;
- unsigned long timestamp;
+ long timestamp;
const unsigned char *s;
dbus_bool_t retval;
DBusKey *keys;
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index dc0a6a64..b191337e 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -5480,8 +5480,10 @@ _dbus_message_loader_queue_messages (DBusMessageLoader *loader)
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)
{