From 695443f8d5e0da5fbff3b44279a0ed6abafdf3bb Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 26 Feb 2007 10:57:20 +0000 Subject: Use GLib memory allocation functions --- hcid/dbus-common.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'hcid/dbus-common.c') diff --git a/hcid/dbus-common.c b/hcid/dbus-common.c index aabd58cd..2c84a5b2 100644 --- a/hcid/dbus-common.c +++ b/hcid/dbus-common.c @@ -273,11 +273,7 @@ static gboolean system_bus_reconnect(void *data) return TRUE; } - dl = malloc(HCI_MAX_DEV * sizeof(*dr) + sizeof(*dl)); - if (!dl) { - error("Can't allocate memory"); - goto failed; - } + dl = g_malloc0(HCI_MAX_DEV * sizeof(*dr) + sizeof(*dl)); dl->dev_num = HCI_MAX_DEV; dr = dl->dev_req; @@ -300,8 +296,7 @@ failed: if (sk >= 0) close(sk); - if (dl) - free(dl); + g_free(dl); return ret_val; } -- cgit