X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Fattributes.c;h=3196be35f0471010ff8312f0f546c77caa26e226;hb=5c97e2daa9712d1fc3e1df186b25367b1e4cb8b1;hp=dc51fc6b2eb23b6e6f8d08bd56be87348974210c;hpb=217cf9d33a3ffc88e6eeaf21f3d46ee00cbeb0c4;p=babeltrace.git

diff --git a/src/ctf-writer/attributes.c b/src/ctf-writer/attributes.c
index dc51fc6b..3196be35 100644
--- a/src/ctf-writer/attributes.c
+++ b/src/ctf-writer/attributes.c
@@ -1,33 +1,17 @@
 /*
- * attributes.c
- *
- * Babeltrace CTF writer - Attributes
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2015 EfficiOS Inc. and Linux Foundation
  * Copyright (c) 2015 Philippe Proulx <pproulx@efficios.com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Babeltrace CTF writer - Attributes
  */
 
 #define BT_LOG_TAG "CTF-WRITER/ATTRS"
 #include "logging.h"
 
+#include "attributes.h"
+
 #include "common/assert.h"
 #include "common/macros.h"
 #include "compat/string.h"
@@ -80,7 +64,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 +80,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 +124,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 +160,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 +189,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,8 +302,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