From 3d16152fd30f2570ad8e9bb2427045e6fd317ce3 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 26 Feb 2007 13:44:45 +0000 Subject: More changes do use glib memory allocation --- common/dbus-helper.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'common/dbus-helper.c') diff --git a/common/dbus-helper.c b/common/dbus-helper.c index 64b00cd8..7c14952b 100644 --- a/common/dbus-helper.c +++ b/common/dbus-helper.c @@ -90,7 +90,7 @@ static void generic_unregister(DBusConnection *connection, void *user_data) if (data->unregister_function) data->unregister_function(connection, data->user_data); - free(data); + g_free(data); } static struct interface_data *find_interface(GSList *interfaces, @@ -153,11 +153,7 @@ dbus_bool_t dbus_connection_create_object_path(DBusConnection *connection, { struct generic_data *data; - data = malloc(sizeof(*data)); - if (!data) - return FALSE; - - memset(data, 0, sizeof(*data)); + data = g_new0(struct generic_data, 1); data->user_data = user_data; data->unregister_function = function; @@ -167,7 +163,7 @@ dbus_bool_t dbus_connection_create_object_path(DBusConnection *connection, if (dbus_connection_register_object_path(connection, path, &generic_table, data) == FALSE) { - free(data); + g_free(data); return FALSE; } @@ -193,11 +189,7 @@ dbus_bool_t dbus_connection_register_interface(DBusConnection *connection, (void *) &data) == FALSE) return FALSE; - iface = malloc(sizeof(*iface)); - if (!iface) - return FALSE; - - memset(iface, 0, sizeof(*iface)); + iface = g_new0(struct interface_data, 1); iface->interface = interface; iface->methods = methods; -- cgit