From ff3eac88dc790d4ea62f852a45f25ad7815e492b Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Tue, 18 Dec 2018 13:23:32 -0500 Subject: [PATCH] Cleanup: add bt_ctf_value_type stringifying function This fixes the following Clang warning: trace.c:270:5: error: implicit conversion from enumeration type 'enum bt_ctf_value_type' to different enumeration type 'enum bt_value_type' [-Werror,-Wenum-conversion] Signed-off-by: Francis Deslauriers --- .../babeltrace/ctf-writer/values-internal.h | 23 +++++++++++++++++++ lib/ctf-writer/trace.c | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/include/babeltrace/ctf-writer/values-internal.h b/include/babeltrace/ctf-writer/values-internal.h index 332626f2..ca87255a 100644 --- a/include/babeltrace/ctf-writer/values-internal.h +++ b/include/babeltrace/ctf-writer/values-internal.h @@ -331,4 +331,27 @@ BT_HIDDEN enum bt_ctf_value_status bt_ctf_private_value_map_insert_empty_map_entry( struct bt_ctf_private_value *map_obj, const char *key); +static inline +const char *bt_ctf_value_type_string(enum bt_ctf_value_type type) +{ + switch (type) { + case BT_CTF_VALUE_TYPE_NULL: + return "BT_CTF_VALUE_TYPE_NULL"; + case BT_CTF_VALUE_TYPE_BOOL: + return "BT_CTF_VALUE_TYPE_BOOL"; + case BT_CTF_VALUE_TYPE_INTEGER: + return "BT_CTF_VALUE_TYPE_INTEGER"; + case BT_CTF_VALUE_TYPE_REAL: + return "BT_CTF_VALUE_TYPE_REAL"; + case BT_CTF_VALUE_TYPE_STRING: + return "BT_CTF_VALUE_TYPE_STRING"; + case BT_CTF_VALUE_TYPE_ARRAY: + return "BT_CTF_VALUE_TYPE_ARRAY"; + case BT_CTF_VALUE_TYPE_MAP: + return "BT_CTF_VALUE_TYPE_MAP"; + default: + return "(unknown)"; + } +}; + #endif /* BABELTRACE_CTF_WRITER_VALUES_INTERNAL_H */ diff --git a/lib/ctf-writer/trace.c b/lib/ctf-writer/trace.c index 2ef0d8e5..5957c1e8 100644 --- a/lib/ctf-writer/trace.c +++ b/lib/ctf-writer/trace.c @@ -266,7 +266,7 @@ int bt_ctf_trace_common_set_environment_field(struct bt_ctf_trace_common *trace, "trace-addr=%p, trace-name=\"%s\", " "env-name=\"%s\", env-value-type=%s", trace, bt_ctf_trace_common_get_name(trace), name, - bt_common_value_type_string( + bt_ctf_value_type_string( bt_ctf_value_get_type( bt_ctf_private_value_as_value(value)))); ret = -1; -- 2.34.1