#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"
-#include <babeltrace2/ctf-writer/object.h>
+#include <babeltrace2-ctf-writer/object.h>
#include <inttypes.h>
#include "values.h"
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
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;
}
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;
}
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);
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;
}
}
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