summaryrefslogtreecommitdiffstats
path: root/hcid/dbus-security.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2007-02-26 13:44:45 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2007-02-26 13:44:45 +0000
commit3d16152fd30f2570ad8e9bb2427045e6fd317ce3 (patch)
tree6d92771a88707cc2b5693bf0de5195d077a0bba0 /hcid/dbus-security.c
parentf3695d5fc4559135a5c97ffbcb38961fbc1bb0d1 (diff)
More changes do use glib memory allocation
Diffstat (limited to 'hcid/dbus-security.c')
-rw-r--r--hcid/dbus-security.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/hcid/dbus-security.c b/hcid/dbus-security.c
index 07a9490f..263517e1 100644
--- a/hcid/dbus-security.c
+++ b/hcid/dbus-security.c
@@ -119,18 +119,16 @@ static void passkey_agent_free(struct passkey_agent *agent)
if (!agent->exited)
release_agent(agent);
- if (agent->name)
- free(agent->name);
- if (agent->path)
- free(agent->path);
- if (agent->addr)
- free(agent->addr);
+ g_free(agent->name);
+ g_free(agent->path);
+ g_free(agent->addr);
+
if (agent->conn)
dbus_connection_unref(agent->conn);
g_slist_free(agent->pending_requests);
- free(agent);
+ g_free(agent);
}
static void agent_exited(const char *name, struct adapter *adapter)