#include <babeltrace/ref.h>
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/values.h>
+#include <babeltrace/values-internal.h>
#include <inttypes.h>
-#include <assert.h>
#include <babeltrace/compat/string-internal.h>
+#include <babeltrace/assert-internal.h>
#define BT_ATTR_NAME_INDEX 0
#define BT_ATTR_VALUE_INDEX 1
goto end;
}
- attr_field_obj = bt_value_array_get(attr_obj, index);
+ if (index >= bt_value_array_size(attr_obj)) {
+ BT_LOGW("Invalid parameter: index is out of bounds: "
+ "index=%" PRIu64 ", count=%" PRId64,
+ index, bt_value_array_size(attr_obj));
+ goto end;
+ }
+
+ attr_field_obj = bt_value_array_borrow(attr_obj, index);
if (!attr_field_obj) {
BT_LOGE("Cannot get attributes object's array value's element by index: "
"value-addr=%p, index=%" PRIu64, attr_obj, index);
goto end;
}
- attr_field_name_obj = bt_value_array_get(attr_field_obj,
+ attr_field_name_obj = bt_value_array_borrow(attr_field_obj,
BT_ATTR_NAME_INDEX);
if (!attr_field_name_obj) {
BT_LOGE("Cannot get attribute array value's element by index: "
}
end:
- BT_PUT(attr_field_name_obj);
- BT_PUT(attr_field_obj);
return ret;
}
BT_HIDDEN
-struct bt_value *bt_attributes_get_field_value(struct bt_value *attr_obj,
+struct bt_value *bt_attributes_borrow_field_value(struct bt_value *attr_obj,
uint64_t index)
{
struct bt_value *value_obj = NULL;
goto end;
}
- attr_field_obj = bt_value_array_get(attr_obj, index);
+ if (index >= bt_value_array_size(attr_obj)) {
+ BT_LOGW("Invalid parameter: index is out of bounds: "
+ "index=%" PRIu64 ", count=%" PRId64,
+ index, bt_value_array_size(attr_obj));
+ goto end;
+ }
+
+ attr_field_obj = bt_value_array_borrow(attr_obj, index);
if (!attr_field_obj) {
BT_LOGE("Cannot get attributes object's array value's element by index: "
"value-addr=%p, index=%" PRIu64, attr_obj, index);
goto end;
}
- value_obj = bt_value_array_get(attr_field_obj,
+ value_obj = bt_value_array_borrow(attr_field_obj,
BT_ATTR_VALUE_INDEX);
if (!value_obj) {
BT_LOGE("Cannot get attribute array value's element by index: "
}
end:
- BT_PUT(attr_field_obj);
return value_obj;
}
static
-struct bt_value *bt_attributes_get_field_by_name(
+struct bt_value *bt_attributes_borrow_field_by_name(
struct bt_value *attr_obj, const char *name)
{
uint64_t i;
int ret;
const char *field_name;
- value_obj = bt_value_array_get(attr_obj, i);
+ value_obj = bt_value_array_borrow(attr_obj, i);
if (!value_obj) {
BT_LOGE("Cannot get attributes object's array value's element by index: "
"value-addr=%p, index=%" PRIu64, attr_obj, i);
goto error;
}
- attr_field_name_obj = bt_value_array_get(value_obj, 0);
+ attr_field_name_obj = bt_value_array_borrow(value_obj,
+ BT_ATTR_NAME_INDEX);
if (!attr_field_name_obj) {
BT_LOGE("Cannot get attribute array value's element by index: "
"value-addr=%p, index=%" PRIu64,
- value_obj, (int64_t) 0);
+ value_obj, (int64_t) BT_ATTR_NAME_INDEX);
goto error;
}
}
if (!strcmp(field_name, name)) {
- BT_PUT(attr_field_name_obj);
break;
}
- BT_PUT(attr_field_name_obj);
- BT_PUT(value_obj);
+ value_obj = NULL;
}
return value_obj;
error:
- BT_PUT(attr_field_name_obj);
- BT_PUT(value_obj);
-
+ value_obj = NULL;
return value_obj;
}
goto end;
}
- attr_field_obj = bt_attributes_get_field_by_name(attr_obj, name);
+ attr_field_obj = bt_attributes_borrow_field_by_name(attr_obj, name);
if (attr_field_obj) {
ret = bt_value_array_set(attr_field_obj,
BT_ATTR_VALUE_INDEX, value_obj);
+ attr_field_obj = NULL;
goto end;
}
}
end:
- BT_PUT(attr_field_obj);
-
+ bt_put(attr_field_obj);
return ret;
}
BT_HIDDEN
-struct bt_value *bt_attributes_get_field_value_by_name(
+struct bt_value *bt_attributes_borrow_field_value_by_name(
struct bt_value *attr_obj, const char *name)
{
struct bt_value *value_obj = NULL;
goto end;
}
- attr_field_obj = bt_attributes_get_field_by_name(attr_obj, 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-addr=%p, name=\"%s\"", attr_obj, name);
goto end;
}
- value_obj = bt_value_array_get(attr_field_obj,
+ value_obj = bt_value_array_borrow(attr_field_obj,
BT_ATTR_VALUE_INDEX);
if (!value_obj) {
BT_LOGE("Cannot get attribute array value's element by index: "
}
end:
- BT_PUT(attr_field_obj);
-
return value_obj;
}
BT_LOGD("Freezing attributes object: value-addr=%p", attr_obj);
count = bt_value_array_size(attr_obj);
- assert(count >= 0);
+ BT_ASSERT(count >= 0);
/*
* We do not freeze the array value object itself here, since
for (i = 0; i < count; ++i) {
struct bt_value *obj = NULL;
- obj = bt_attributes_get_field_value(attr_obj, i);
+ obj = bt_attributes_borrow_field_value(attr_obj, i);
if (!obj) {
BT_LOGE("Cannot get attributes object's field value by index: "
"value-addr=%p, index=%" PRIu64,
}
bt_value_freeze(obj);
- BT_PUT(obj);
}
end: