X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Fattributes.c;h=78d892b2b167168e164f2c4d3fb3fc39835762f7;hb=393729a6d00d2d9132000692547720e2e177d69b;hp=e79dc58f1d3d34158d757448c058dec3cd7dd96e;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/ctf-writer/attributes.c b/src/ctf-writer/attributes.c
index e79dc58f..78d892b2 100644
--- a/src/ctf-writer/attributes.c
+++ b/src/ctf-writer/attributes.c
@@ -25,13 +25,13 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-ATTRS"
+#define BT_LOG_TAG "CTF-WRITER/ATTRS"
 #include "logging.h"
 
 #include "common/assert.h"
-#include "common/babeltrace.h"
+#include "common/macros.h"
 #include "compat/string.h"
-#include <babeltrace2/ctf-writer/object.h>
+#include <babeltrace2-ctf-writer/object.h>
 #include <inttypes.h>
 
 #include "values.h"
@@ -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);
@@ -205,7 +205,7 @@ struct bt_ctf_private_value *bt_ctf_attributes_borrow_field_by_name(
 		field_name = bt_ctf_value_string_get(
 			bt_ctf_private_value_as_value(attr_field_name_obj));
 
-		if (!strcmp(field_name, name)) {
+		if (strcmp(field_name, name) == 0) {
 			break;
 		}
 
@@ -318,7 +318,7 @@ 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));
+	count = bt_ctf_value_array_get_length(bt_ctf_private_value_as_value(attr_obj));
 	BT_ASSERT(count >= 0);
 
 	/*