From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Tue, 17 Mar 2015 20:42:31 +0000 (-0400)
Subject: objects: simplify destroy functions
X-Git-Tag: v2.0.0-pre1~1305
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=e196f486b4e9b92b9e4307ff2cce6f68e6d2fa88;p=babeltrace.git

objects: simplify destroy functions

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

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