#include <babeltrace/lib-logging-internal.h>
#include <babeltrace/trace-ir/field-wrapper-internal.h>
-#include <babeltrace/trace-ir/fields-internal.h>
+#include <babeltrace/trace-ir/field-internal.h>
#include <babeltrace/object-pool-internal.h>
#include <babeltrace/object-internal.h>
#include <glib.h>
if (field_wrapper->field) {
BT_LOGD_STR("Destroying field.");
bt_field_destroy((void *) field_wrapper->field);
+ field_wrapper->field = NULL;
}
BT_LOGD_STR("Putting stream class.");
BT_HIDDEN
struct bt_field_wrapper *bt_field_wrapper_create(
- struct bt_object_pool *pool, struct bt_field_type *ft)
+ struct bt_object_pool *pool, struct bt_field_class *fc)
{
struct bt_field_wrapper *field_wrapper = NULL;
BT_ASSERT(pool);
- BT_ASSERT(ft);
+ BT_ASSERT(fc);
field_wrapper = bt_object_pool_create_object(pool);
if (!field_wrapper) {
BT_LIB_LOGE("Cannot allocate one field wrapper from field wrapper pool: "
}
if (!field_wrapper->field) {
- field_wrapper->field = (void *) bt_field_create(ft);
+ field_wrapper->field = (void *) bt_field_create(fc);
if (!field_wrapper->field) {
- BT_LIB_LOGE("Cannot create field wrapper from field type: "
- "%![ft-]+F", ft);
+ BT_LIB_LOGE("Cannot create field wrapper from field class: "
+ "%![fc-]+F", fc);
goto error;
}