From e196f486b4e9b92b9e4307ff2cce6f68e6d2fa88 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 17 Mar 2015 16:42:31 -0400 Subject: [PATCH] objects: simplify destroy functions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- lib/objects.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/objects.c b/lib/objects.c index 5ac72c55..cd86f976 100644 --- a/lib/objects.c +++ b/lib/objects.c @@ -87,9 +87,7 @@ struct bt_object_map { static void bt_object_string_destroy(struct bt_object *object) { - struct bt_object_string *string_obj = BT_OBJECT_TO_STRING(object); - - g_string_free(string_obj->gstr, TRUE); + g_string_free(BT_OBJECT_TO_STRING(object)->gstr, TRUE); } static @@ -105,14 +103,12 @@ void bt_object_array_destroy(struct bt_object *object) static void bt_object_map_destroy(struct bt_object *object) { - struct bt_object_map *map = BT_OBJECT_TO_MAP(object); - /* * Hash table's registered value destructor will take care of * putting each contained object. Keys are GQuarks and cannot * be destroyed anyway. */ - g_hash_table_destroy(map->ght); + g_hash_table_destroy(BT_OBJECT_TO_MAP(object)->ght); } static -- 2.34.1