From 11cd69be12a8f694b9ddc9b8d8cc6936b7f51596 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 3 May 2019 11:37:37 -0400 Subject: [PATCH] lib: value.c: remove BT_VALUE_FROM_CONCRETE() macro MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We can just cast to `void *` directly like we do everywhere else in the library. Signed-off-by: Philippe Proulx Change-Id: If09f1be2e7f8f9cf3bf964a7d4ada5b3307ef7f4 Reviewed-on: https://review.lttng.org/c/babeltrace/+/1256 CI-Build: Jérémie Galarneau Tested-by: jenkins --- lib/value.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/value.c b/lib/value.c index 07985ea8..6e33ae7b 100644 --- a/lib/value.c +++ b/lib/value.c @@ -37,7 +37,6 @@ #include #include -#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)) @@ -575,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) @@ -600,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) @@ -625,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) @@ -662,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) @@ -695,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) @@ -723,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) -- 2.34.1