X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fattributes.c;h=8f03c799a79aa1b590a2432499e12d739ce71edd;hb=6e30bfdaa1314e2fca0a82d9bf39e6d55780e7fb;hp=488dd86feab50bb4449d400797c7c255ef9d5555;hpb=acfa811244c6c27fedf0e2ebfb283ab42cc7e25e;p=babeltrace.git

diff --git a/src/lib/trace-ir/attributes.c b/src/lib/trace-ir/attributes.c
index 488dd86f..8f03c799 100644
--- 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",
@@ -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);
 
 	/*