return field->class;
}
-struct bt_private_field_class *bt_private_field_borrow_private_class(
+struct bt_private_field_class *bt_private_field_borrow_class(
struct bt_private_field *field)
{
return (void *) bt_field_borrow_class((void *) field);
}
struct bt_private_field *
-bt_private_field_array_borrow_element_private_field_by_index(
+bt_private_field_array_borrow_element_field_by_index(
struct bt_private_field *field, uint64_t index)
{
return (void *) bt_field_array_borrow_element_field_by_index(
}
struct bt_private_field *
-bt_private_field_structure_borrow_member_private_field_by_index(
+bt_private_field_structure_borrow_member_field_by_index(
struct bt_private_field *field, uint64_t index)
{
return (void *) bt_field_structure_borrow_member_field_by_index(
}
struct bt_private_field *
-bt_private_field_structure_borrow_member_private_field_by_name(
+bt_private_field_structure_borrow_member_field_by_name(
struct bt_private_field *field, const char *name)
{
return (void *) bt_field_structure_borrow_member_field_by_name(
}
struct bt_private_field *
-bt_private_field_variant_borrow_selected_option_private_field(
+bt_private_field_variant_borrow_selected_option_field(
struct bt_private_field *field)
{
return (void *) bt_field_variant_borrow_selected_option_field(
(void *) field);
}
-int bt_private_field_variant_select_option_private_field(
+int bt_private_field_variant_select_option_field(
struct bt_private_field *priv_field, uint64_t index)
{
struct bt_field *field = (void *) priv_field;
{
BT_ASSERT(field);
BT_LOGD_STR("Putting field's class.");
- bt_object_put_ref(field->class);
+ BT_OBJECT_PUT_REF_AND_RESET(field->class);
}
static
if (struct_field->fields) {
g_ptr_array_free(struct_field->fields, TRUE);
+ struct_field->fields = NULL;
}
g_free(field);
if (var_field->fields) {
g_ptr_array_free(var_field->fields, TRUE);
+ var_field->fields = NULL;
}
g_free(field);
if (array_field->fields) {
g_ptr_array_free(array_field->fields, TRUE);
+ array_field->fields = NULL;
}
g_free(field);
if (string_field->buf) {
g_array_free(string_field->buf, TRUE);
+ string_field->buf = NULL;
}
g_free(field);
end:
return is_set;
}
-
-struct bt_field *bt_field_borrow_from_private(
- struct bt_private_field *priv_field)
-{
- return (void *) priv_field;
-}