summaryrefslogtreecommitdiffstats
path: root/hcid/dbus-database.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-database.c
parentf3695d5fc4559135a5c97ffbcb38961fbc1bb0d1 (diff)
More changes do use glib memory allocation
Diffstat (limited to 'hcid/dbus-database.c')
-rw-r--r--hcid/dbus-database.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/hcid/dbus-database.c b/hcid/dbus-database.c
index ab3a6938..86053915 100644
--- a/hcid/dbus-database.c
+++ b/hcid/dbus-database.c
@@ -84,7 +84,7 @@ static void exit_callback(const char *name, void *user_data)
if (user_record->sender)
g_free(user_record->sender);
- free(user_record);
+ g_free(user_record);
}
static DBusHandlerResult add_service_record(DBusConnection *conn,
@@ -111,20 +111,20 @@ static DBusHandlerResult add_service_record(DBusConnection *conn,
sdp_record = sdp_extract_pdu(record, &scanned);
if (!sdp_record) {
error("Parsing of service record failed");
- free(user_record);
+ g_free(user_record);
return error_failed(conn, msg, EIO);
}
if (scanned != len) {
error("Size mismatch of service record");
- free(user_record);
+ g_free(user_record);
sdp_record_free(sdp_record);
return error_failed(conn, msg, EIO);
}
if (add_record_to_server(sdp_record) < 0) {
error("Failed to register service record");
- free(user_record);
+ g_free(user_record);
sdp_record_free(sdp_record);
return error_failed(conn, msg, EIO);
}
@@ -136,7 +136,7 @@ static DBusHandlerResult add_service_record(DBusConnection *conn,
if (register_sdp_binary((uint8_t *) record, size,
&user_record->handle) < 0) {
error("Failed to register service record");
- free(user_record);
+ g_free(user_record);
return error_failed(conn, msg, errno);
}
}
@@ -250,7 +250,7 @@ static DBusHandlerResult remove_service_record(DBusConnection *conn,
if (user_record->sender)
g_free(user_record->sender);
- free(user_record);
+ g_free(user_record);
reply = dbus_message_new_method_return(msg);
if (!reply)