From 6e30bfdaa1314e2fca0a82d9bf39e6d55780e7fb Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Thu, 24 Oct 2019 10:14:20 -0400 Subject: [PATCH] lib: make `bt_attributes_get_count()` return uint64_t This function cannot return a negative number and cannot fail as it uses the `bt_value_array_get_length()` function. Signed-off-by: Francis Deslauriers Change-Id: I1dfb06ffceaab9ef1c1ab6fa11041a2c3ddeb464 Reviewed-on: https://review.lttng.org/c/babeltrace/+/2248 Tested-by: jenkins --- src/lib/trace-ir/attributes.c | 2 +- src/lib/trace-ir/attributes.h | 2 +- src/lib/trace-ir/trace.c | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/lib/trace-ir/attributes.c b/src/lib/trace-ir/attributes.c index ce58e289..8f03c799 100644 --- a/src/lib/trace-ir/attributes.c +++ b/src/lib/trace-ir/attributes.c @@ -77,7 +77,7 @@ void bt_attributes_destroy(struct bt_value *attr_obj) } BT_HIDDEN -int64_t bt_attributes_get_count(const struct bt_value *attr_obj) +uint64_t bt_attributes_get_count(const struct bt_value *attr_obj) { return bt_value_array_get_length(attr_obj); } diff --git a/src/lib/trace-ir/attributes.h b/src/lib/trace-ir/attributes.h index 60b46d42..6f52d18b 100644 --- a/src/lib/trace-ir/attributes.h +++ b/src/lib/trace-ir/attributes.h @@ -39,7 +39,7 @@ BT_HIDDEN void bt_attributes_destroy(struct bt_value *attr_obj); BT_HIDDEN -int64_t bt_attributes_get_count(const struct bt_value *attr_obj); +uint64_t bt_attributes_get_count(const struct bt_value *attr_obj); BT_HIDDEN const char *bt_attributes_get_field_name(const struct bt_value *attr_obj, diff --git a/src/lib/trace-ir/trace.c b/src/lib/trace-ir/trace.c index 1536feaf..7a610401 100644 --- a/src/lib/trace-ir/trace.c +++ b/src/lib/trace-ir/trace.c @@ -332,12 +332,8 @@ end: uint64_t bt_trace_get_environment_entry_count(const struct bt_trace *trace) { - int64_t ret; - BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace"); - ret = bt_attributes_get_count(trace->environment); - BT_ASSERT(ret >= 0); - return (uint64_t) ret; + return bt_attributes_get_count(trace->environment); } void bt_trace_borrow_environment_entry_by_index_const( -- 2.34.1