}
BT_HIDDEN
-int64_t bt_attributes_get_count(const struct bt_value *attr_obj)
+uint64_t bt_attributes_get_count(const struct bt_value *attr_obj)
{
- return bt_value_array_get_size(attr_obj);
+ return bt_value_array_get_length(attr_obj);
}
BT_HIDDEN
const char *bt_attributes_get_field_name(const struct bt_value *attr_obj,
uint64_t index)
{
- const char *ret = NULL;
const struct bt_value *attr_field_obj = NULL;
const struct bt_value *attr_field_name_obj = NULL;
- BT_ASSERT(attr_obj);
- BT_ASSERT(index < bt_value_array_get_size(attr_obj));
+ BT_ASSERT_DBG(attr_obj);
+ BT_ASSERT_DBG(index < bt_value_array_get_length(attr_obj));
attr_field_obj = bt_value_array_borrow_element_by_index_const(
attr_obj, index);
- if (!attr_field_obj) {
- BT_LIB_LOGE_APPEND_CAUSE(
- "Cannot borrow attributes object's array value's element by index: "
- "%![value-]+v, index=%" PRIu64, attr_obj, index);
- goto end;
- }
attr_field_name_obj =
bt_value_array_borrow_element_by_index_const(attr_field_obj,
BT_ATTR_NAME_INDEX);
- if (!attr_field_name_obj) {
- BT_LIB_LOGE_APPEND_CAUSE(
- "Cannot get attribute array value's element by index: "
- "%![value-]+v, index=%" PRIu64, attr_field_obj,
- (uint64_t) BT_ATTR_NAME_INDEX);
- goto end;
- }
-
- ret = bt_value_string_get(attr_field_name_obj);
-end:
- return ret;
+ return bt_value_string_get(attr_field_name_obj);
}
BT_HIDDEN
struct bt_value *bt_attributes_borrow_field_value(
struct bt_value *attr_obj, uint64_t index)
{
- struct bt_value *value_obj = NULL;
struct bt_value *attr_field_obj = NULL;
- BT_ASSERT(attr_obj);
- BT_ASSERT(index < bt_value_array_get_size(attr_obj));
+ BT_ASSERT_DBG(attr_obj);
+ BT_ASSERT_DBG(index < bt_value_array_get_length(attr_obj));
+
attr_field_obj =
bt_value_array_borrow_element_by_index(attr_obj, index);
- if (!attr_field_obj) {
- BT_LIB_LOGE_APPEND_CAUSE(
- "Cannot get attributes object's array value's element by index: "
- "%![value-]+v, index=%" PRIu64, attr_obj, index);
- goto end;
- }
- value_obj = bt_value_array_borrow_element_by_index(
- attr_field_obj, BT_ATTR_VALUE_INDEX);
- if (!value_obj) {
- BT_LIB_LOGE_APPEND_CAUSE(
- "Cannot get attribute array value's element by index: "
- "%![value-]+v, index=%" PRIu64, attr_field_obj,
- (uint64_t) BT_ATTR_VALUE_INDEX);
- }
-
-end:
- return value_obj;
+ return bt_value_array_borrow_element_by_index( attr_field_obj,
+ BT_ATTR_VALUE_INDEX);
}
static
struct bt_value *bt_attributes_borrow_field_by_name(
struct bt_value *attr_obj, const char *name)
{
- uint64_t i;
- int64_t attr_size;
+ uint64_t i, attr_size;
struct bt_value *value_obj = NULL;
struct bt_value *attr_field_name_obj = NULL;
- attr_size = bt_value_array_get_size(attr_obj);
- if (attr_size < 0) {
- BT_LIB_LOGE_APPEND_CAUSE(
- "Cannot get array value's size: %![value-]+v",
- attr_obj);
- goto error;
- }
-
+ attr_size = bt_value_array_get_length(attr_obj);
for (i = 0; i < attr_size; ++i) {
const char *field_name;
value_obj = bt_value_array_borrow_element_by_index(
attr_obj, i);
- if (!value_obj) {
- BT_LIB_LOGE_APPEND_CAUSE(
- "Cannot get attributes object's array value's element by index: "
- "%![value-]+v, index=%" PRIu64, attr_obj, i);
- goto error;
- }
attr_field_name_obj =
bt_value_array_borrow_element_by_index(
value_obj, BT_ATTR_NAME_INDEX);
- if (!attr_field_name_obj) {
- BT_LIB_LOGE_APPEND_CAUSE(
- "Cannot get attribute array value's element by index: "
- "%![value-]+v, index=%" PRIu64,
- value_obj, (int64_t) BT_ATTR_NAME_INDEX);
- goto error;
- }
field_name = bt_value_string_get(attr_field_name_obj);
- if (!strcmp(field_name, name)) {
+ if (strcmp(field_name, name) == 0) {
break;
}
}
return value_obj;
-
-error:
- value_obj = NULL;
- return value_obj;
}
BT_HIDDEN
struct bt_value *value_obj = NULL;
struct bt_value *attr_field_obj = NULL;
- BT_ASSERT(attr_obj);
- BT_ASSERT(name);
+ BT_ASSERT_DBG(attr_obj);
+ BT_ASSERT_DBG(name);
attr_field_obj = bt_attributes_borrow_field_by_name(attr_obj, name);
if (!attr_field_obj) {
BT_LOGD("Cannot find attributes object's field by name: "
value_obj = bt_value_array_borrow_element_by_index(
attr_field_obj, BT_ATTR_VALUE_INDEX);
- if (!value_obj) {
- BT_LIB_LOGE_APPEND_CAUSE(
- "Cannot get attribute array value's element by index: "
- "%![value-]+v, index=%" PRIu64, attr_field_obj,
- (uint64_t) BT_ATTR_VALUE_INDEX);
- }
end:
return value_obj;
BT_HIDDEN
int bt_attributes_freeze(const struct bt_value *attr_obj)
{
- uint64_t i;
- int64_t count;
+ uint64_t i, count;
int ret = 0;
BT_ASSERT(attr_obj);
BT_LOGD("Freezing attributes object: value-addr=%p", attr_obj);
- count = bt_value_array_get_size(attr_obj);
- BT_ASSERT(count >= 0);
+
+ count = bt_value_array_get_length(attr_obj);
/*
* We do not freeze the array value object itself here, since