lib: make `bt_attributes_get_count()` return uint64_t

[babeltrace.git] / src / lib / trace-ir / attributes.c

diff --git a/src/lib/trace-ir/attributes.c b/src/lib/trace-ir/attributes.c
index d2047b7c72dbf36cb6e70674a28408cac7d1fd4a..8f03c799a79aa1b590a2432499e12d739ce71edd 100644 (file)
--- a/src/lib/trace-ir/attributes.c
+++ b/src/lib/trace-ir/attributes.c
@@ -77,9 +77,9 @@ 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_size(attr_obj);
+       return bt_value_array_get_length(attr_obj);
 }
 
 BT_HIDDEN
@@ -90,8 +90,8 @@ const char *bt_attributes_get_field_name(const struct bt_value *attr_obj,
        const struct bt_value *attr_field_obj = NULL;
        const struct bt_value *attr_field_name_obj = NULL;
 
-       BT_ASSERT(attr_obj);
-       BT_ASSERT(index < bt_value_array_get_size(attr_obj));
+       BT_ASSERT_DBG(attr_obj);
+       BT_ASSERT_DBG(index < bt_value_array_get_length(attr_obj));
        attr_field_obj = bt_value_array_borrow_element_by_index_const(
                attr_obj, index);
        if (!attr_field_obj) {
@@ -125,8 +125,8 @@ struct bt_value *bt_attributes_borrow_field_value(
        struct bt_value *value_obj = NULL;
        struct bt_value *attr_field_obj = NULL;
 
-       BT_ASSERT(attr_obj);
-       BT_ASSERT(index < bt_value_array_get_size(attr_obj));
+       BT_ASSERT_DBG(attr_obj);
+       BT_ASSERT_DBG(index < bt_value_array_get_length(attr_obj));
        attr_field_obj =
                bt_value_array_borrow_element_by_index(attr_obj, index);
        if (!attr_field_obj) {
@@ -158,7 +158,7 @@ struct bt_value *bt_attributes_borrow_field_by_name(
        struct bt_value *value_obj = NULL;
        struct bt_value *attr_field_name_obj = NULL;
 
-       attr_size = bt_value_array_get_size(attr_obj);
+       attr_size = bt_value_array_get_length(attr_obj);
        if (attr_size < 0) {
                BT_LIB_LOGE_APPEND_CAUSE(
                        "Cannot get array value's size: %![value-]+v",
@@ -191,7 +191,7 @@ struct bt_value *bt_attributes_borrow_field_by_name(
 
                field_name = bt_value_string_get(attr_field_name_obj);
 
-               if (!strcmp(field_name, name)) {
+               if (strcmp(field_name, name) == 0) {
                        break;
                }
 
@@ -263,8 +263,8 @@ struct bt_value *bt_attributes_borrow_field_value_by_name(
        struct bt_value *value_obj = NULL;
        struct bt_value *attr_field_obj = NULL;
 
-       BT_ASSERT(attr_obj);
-       BT_ASSERT(name);
+       BT_ASSERT_DBG(attr_obj);
+       BT_ASSERT_DBG(name);
        attr_field_obj = bt_attributes_borrow_field_by_name(attr_obj, name);
        if (!attr_field_obj) {
                BT_LOGD("Cannot find attributes object's field by name: "
@@ -294,7 +294,7 @@ int bt_attributes_freeze(const struct bt_value *attr_obj)
 
        BT_ASSERT(attr_obj);
        BT_LOGD("Freezing attributes object: value-addr=%p", attr_obj);
-       count = bt_value_array_get_size(attr_obj);
+       count = bt_value_array_get_length(attr_obj);
        BT_ASSERT(count >= 0);
 
        /*