X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Ffield-wrapper.c;h=6d02b757df7685db01f561dc41bde16494dfe544;hb=35fa110e5bea4a35497313adf3e3d0fa09db9ff7;hp=7b13202ae749b437ce6795bcde5ffe34b307057b;hpb=108b91d0ffd01cce874850b767c0f358eb642523;p=babeltrace.git

diff --git a/lib/trace-ir/field-wrapper.c b/lib/trace-ir/field-wrapper.c
index 7b13202a..6d02b757 100644
--- a/lib/trace-ir/field-wrapper.c
+++ b/lib/trace-ir/field-wrapper.c
@@ -24,7 +24,7 @@
 #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>
@@ -58,6 +58,7 @@ void bt_field_wrapper_destroy(struct bt_field_wrapper *field_wrapper)
 	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.");
@@ -66,12 +67,12 @@ void bt_field_wrapper_destroy(struct bt_field_wrapper *field_wrapper)
 
 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: "
@@ -80,10 +81,10 @@ struct bt_field_wrapper *bt_field_wrapper_create(
 	}
 
 	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;
 		}