lib: value.c: remove BT_VALUE_FROM_CONCRETE() macro

[babeltrace.git] / lib / value.c

diff --git a/lib/value.c b/lib/value.c
index eb78ca9ecd10b5ba975ad0776c4d4b47b9a9f852..6e33ae7b23e5ee8d2c97ea596fe356fb3bf499ee 100644 (file)
--- a/lib/value.c
+++ b/lib/value.c
@@ -34,11 +34,9 @@
 #include <babeltrace/compat/glib-internal.h>
 #include <babeltrace/types.h>
 #include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/object-internal.h>
 #include <babeltrace/value-internal.h>
 #include <babeltrace/assert-internal.h>
 
-#define BT_VALUE_FROM_CONCRETE(_concrete) ((struct bt_value *) (_concrete))
 #define BT_VALUE_TO_BOOL(_base) ((struct bt_value_bool *) (_base))
 #define BT_VALUE_TO_INTEGER(_base) ((struct bt_value_integer *) (_base))
 #define BT_VALUE_TO_REAL(_base) ((struct bt_value_real *) (_base))
@@ -61,12 +59,6 @@
                "Index is out of bound: "                               \
                "index=%" PRIu64 ", count=%u", (_index), (_count));
 
-struct bt_value {
-       struct bt_object base;
-       enum bt_value_type type;
-       bt_bool frozen;
-};
-
 static
 void bt_value_null_instance_release_func(struct bt_object *obj)
 {
@@ -87,37 +79,7 @@ struct bt_value bt_value_null_instance = {
        .frozen = BT_TRUE,
 };
 
-struct bt_value *bt_value_null = &bt_value_null_instance;
-
-struct bt_value_bool {
-       struct bt_value base;
-       bt_bool value;
-};
-
-struct bt_value_integer {
-       struct bt_value base;
-       int64_t value;
-};
-
-struct bt_value_real {
-       struct bt_value base;
-       double value;
-};
-
-struct bt_value_string {
-       struct bt_value base;
-       GString *gstr;
-};
-
-struct bt_value_array {
-       struct bt_value base;
-       GPtrArray *garray;
-};
-
-struct bt_value_map {
-       struct bt_value base;
-       GHashTable *ght;
-};
+struct bt_value *const bt_value_null = &bt_value_null_instance;
 
 static
 void bt_value_destroy(struct bt_object *obj);
@@ -612,7 +574,7 @@ struct bt_value *bt_value_bool_create_init(bt_bool val)
        BT_LOGD("Created boolean value object: addr=%p", bool_obj);
 
 end:
-       return (void *) BT_VALUE_FROM_CONCRETE(bool_obj);
+       return (void *) bool_obj;
 }
 
 struct bt_value *bt_value_bool_create(void)
@@ -637,7 +599,7 @@ struct bt_value *bt_value_integer_create_init(int64_t val)
                integer_obj);
 
 end:
-       return (void *) BT_VALUE_FROM_CONCRETE(integer_obj);
+       return (void *) integer_obj;
 }
 
 struct bt_value *bt_value_integer_create(void)
@@ -662,7 +624,7 @@ struct bt_value *bt_value_real_create_init(double val)
                real_obj);
 
 end:
-       return (void *) BT_VALUE_FROM_CONCRETE(real_obj);
+       return (void *) real_obj;
 }
 
 struct bt_value *bt_value_real_create(void)
@@ -699,7 +661,7 @@ struct bt_value *bt_value_string_create_init(const char *val)
                string_obj);
 
 end:
-       return (void *) BT_VALUE_FROM_CONCRETE(string_obj);
+       return (void *) string_obj;
 }
 
 struct bt_value *bt_value_string_create(void)
@@ -732,7 +694,7 @@ struct bt_value *bt_value_array_create(void)
                array_obj);
 
 end:
-       return (void *) BT_VALUE_FROM_CONCRETE(array_obj);
+       return (void *) array_obj;
 }
 
 struct bt_value *bt_value_map_create(void)
@@ -760,7 +722,7 @@ struct bt_value *bt_value_map_create(void)
                map_obj);
 
 end:
-       return (void *) BT_VALUE_FROM_CONCRETE(map_obj);
+       return (void *) map_obj;
 }
 
 bt_bool bt_value_bool_get(const struct bt_value *bool_obj)