lib: rename include dir to babeltrace2

[babeltrace.git] / lib / trace-ir / packet-context-field.c

diff --git a/lib/trace-ir/packet-context-field.c b/lib/trace-ir/packet-context-field.c
index b3827435d7165d43038be29ab8477a302f233329..dbebab8e7d6bb8afca4c3c6d8459242d550b9a0f 100644 (file)
--- a/lib/trace-ir/packet-context-field.c
+++ b/lib/trace-ir/packet-context-field.c
@@ -21,13 +21,13 @@
  */
 
 #define BT_LOG_TAG "PACKET-CONTEXT-FIELD"
-#include <babeltrace/lib-logging-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
 
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/trace-ir/stream-class-internal.h>
-#include <babeltrace/trace-ir/packet-context-field.h>
-#include <babeltrace/trace-ir/fields-internal.h>
-#include <babeltrace/trace-ir/field-wrapper-internal.h>
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/trace-ir/packet-context-field.h>
+#include <babeltrace2/trace-ir/stream-class-internal.h>
+#include <babeltrace2/trace-ir/field-internal.h>
+#include <babeltrace2/trace-ir/field-wrapper-internal.h>
 #include <glib.h>
 
 struct bt_field *bt_packet_context_field_borrow_field(
@@ -36,10 +36,11 @@ struct bt_field *bt_packet_context_field_borrow_field(
        struct bt_field_wrapper *field_wrapper = (void *) context_field;
 
        BT_ASSERT_PRE_NON_NULL(field_wrapper, "Packet context field");
-       return field_wrapper->field;
+       return (void *) field_wrapper->field;
 }
 
-void bt_packet_context_field_release(struct bt_packet_context_field *context_field)
+void bt_packet_context_field_release(
+               struct bt_packet_context_field *context_field)
 {
        struct bt_field_wrapper *field_wrapper = (void *) context_field;
 
@@ -62,13 +63,14 @@ struct bt_packet_context_field *bt_packet_context_field_create(
 
        BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
        BT_ASSERT_PRE(stream_class->frozen,
-               "Stream class is not part of a trace: %!+S", stream_class);
-       BT_ASSERT_PRE(stream_class->packet_context_ft,
-               "Stream class has no packet context field type: %!+S",
+               "Stream class is not part of a trace class: %!+S",
+               stream_class);
+       BT_ASSERT_PRE(stream_class->packet_context_fc,
+               "Stream class has no packet context field class: %!+S",
                stream_class);
        field_wrapper = bt_field_wrapper_create(
                &stream_class->packet_context_field_pool,
-               (void *) stream_class->packet_context_ft);
+               (void *) stream_class->packet_context_fc);
        if (!field_wrapper) {
                BT_LIB_LOGE("Cannot allocate one packet context field from stream class: "
                        "%![sc-]+S", stream_class);