X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Fattributes.c;h=3665d1fcda8026abf4fcc798788d3cf82bd5490c;hb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;hp=ba4711293132ce38bef407a0ebff847bbe57dc60;hpb=2242b43d4f50ebdeabb124154fb8ac602c563536;p=babeltrace.git

diff --git a/src/ctf-writer/attributes.c b/src/ctf-writer/attributes.c
index ba471129..3665d1fc 100644
--- a/src/ctf-writer/attributes.c
+++ b/src/ctf-writer/attributes.c
@@ -80,7 +80,7 @@ void bt_ctf_attributes_destroy(struct bt_ctf_private_value *attr_obj)
 BT_HIDDEN
 int64_t bt_ctf_attributes_get_count(struct bt_ctf_private_value *attr_obj)
 {
-	return bt_ctf_value_array_get_size(bt_ctf_private_value_as_value(attr_obj));
+	return bt_ctf_value_array_get_length(bt_ctf_private_value_as_value(attr_obj));
 }
 
 BT_HIDDEN
@@ -96,10 +96,10 @@ const char *bt_ctf_attributes_get_field_name(struct bt_ctf_private_value *attr_o
 		goto end;
 	}
 
-	if (index >= bt_ctf_value_array_get_size(bt_ctf_private_value_as_value(attr_obj))) {
+	if (index >= bt_ctf_value_array_get_length(bt_ctf_private_value_as_value(attr_obj))) {
 		BT_LOGW("Invalid parameter: index is out of bounds: "
 			"index=%" PRIu64 ", count=%" PRId64,
-			index, bt_ctf_value_array_get_size(bt_ctf_private_value_as_value(attr_obj)));
+			index, bt_ctf_value_array_get_length(bt_ctf_private_value_as_value(attr_obj)));
 		goto end;
 	}
 
@@ -140,10 +140,10 @@ struct bt_ctf_private_value *bt_ctf_attributes_borrow_field_value(struct bt_ctf_
 		goto end;
 	}
 
-	if (index >= bt_ctf_value_array_get_size(bt_ctf_private_value_as_value(attr_obj))) {
+	if (index >= bt_ctf_value_array_get_length(bt_ctf_private_value_as_value(attr_obj))) {
 		BT_LOGW("Invalid parameter: index is out of bounds: "
 			"index=%" PRIu64 ", count=%" PRId64,
-			index, bt_ctf_value_array_get_size(bt_ctf_private_value_as_value(attr_obj)));
+			index, bt_ctf_value_array_get_length(bt_ctf_private_value_as_value(attr_obj)));
 		goto end;
 	}
 
@@ -176,7 +176,7 @@ struct bt_ctf_private_value *bt_ctf_attributes_borrow_field_by_name(
 	struct bt_ctf_private_value *value_obj = NULL;
 	struct bt_ctf_private_value *attr_field_name_obj = NULL;
 
-	attr_size = bt_ctf_value_array_get_size(bt_ctf_private_value_as_value(attr_obj));
+	attr_size = bt_ctf_value_array_get_length(bt_ctf_private_value_as_value(attr_obj));
 	if (attr_size < 0) {
 		BT_LOGE("Cannot get array value's size: value-addr=%p",
 			attr_obj);
@@ -318,8 +318,8 @@ int bt_ctf_attributes_freeze(struct bt_ctf_private_value *attr_obj)
 	}
 
 	BT_LOGD("Freezing attributes object: value-addr=%p", attr_obj);
-	count = bt_ctf_value_array_get_size(bt_ctf_private_value_as_value(attr_obj));
-	BT_ASSERT(count >= 0);
+	count = bt_ctf_value_array_get_length(bt_ctf_private_value_as_value(attr_obj));
+	BT_ASSERT_DBG(count >= 0);
 
 	/*
 	 * We do not freeze the array value object itself here, since