Fix -Wmissing-prototypes/-Wmissing-declarations warnings

[babeltrace.git] / src / ctf-writer / attributes.c

diff --git a/src/ctf-writer/attributes.c b/src/ctf-writer/attributes.c
index ba4711293132ce38bef407a0ebff847bbe57dc60..5d17f7a9f60523e011414f39976a6893074d6764 100644 (file)
--- a/src/ctf-writer/attributes.c
+++ b/src/ctf-writer/attributes.c
@@ -28,6 +28,8 @@
 #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 +82,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 +98,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 +142,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 +178,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 +320,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