Make API CTF-agnostic

[babeltrace.git] / lib / ctf-ir / field-wrapper.c

diff --git a/lib/ctf-ir/field-wrapper.c b/lib/ctf-ir/field-wrapper.c
index 5917f70d831c7f040ebff958af556ad07a837508..ee28705f682e40a07fab62da10f4e0d8a6e3e44f 100644 (file)
--- a/lib/ctf-ir/field-wrapper.c
+++ b/lib/ctf-ir/field-wrapper.c
@@ -42,8 +42,7 @@ struct bt_field_wrapper *bt_field_wrapper_new(void *data)
                goto end;
        }
 
-       bt_object_init(field_wrapper, NULL);
-       bt_object_set_is_shared((void *) field_wrapper, false);
+       bt_object_init_unique(&field_wrapper->base);
        BT_LOGD("Created empty field wrapper object: addr=%p",
                field_wrapper);
 
@@ -58,7 +57,7 @@ void bt_field_wrapper_destroy(struct bt_field_wrapper *field_wrapper)
 
        if (field_wrapper->field) {
                BT_LOGD_STR("Destroying field.");
-               bt_field_destroy_recursive((void *) field_wrapper->field);
+               bt_field_destroy((void *) field_wrapper->field);
        }
 
        BT_LOGD_STR("Putting stream class.");
@@ -81,7 +80,7 @@ struct bt_field_wrapper *bt_field_wrapper_create(
        }
 
        if (!field_wrapper->field) {
-               field_wrapper->field = (void *) bt_field_create_recursive(ft);
+               field_wrapper->field = (void *) bt_field_create(ft);
                if (!field_wrapper->field) {
                        BT_LIB_LOGE("Cannot create field wrapper from field type: "
                                "%![ft-]+F", ft);