Rename "default beginning/end CS" -> "beginning/end default CS"

[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 a8eddee6a6458029e99ac3d5f9de85ec01557c8b..2df09f085ae4d5c2ac289457c9abc2600ff53b23 100644 (file)
--- a/lib/trace-ir/packet-context-field.c
+++ b/lib/trace-ir/packet-context-field.c
@@ -24,9 +24,9 @@
 #include <babeltrace/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/stream-class-internal.h>
+#include <babeltrace/trace-ir/field-internal.h>
 #include <babeltrace/trace-ir/field-wrapper-internal.h>
 #include <glib.h>
 
@@ -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,9 +63,10 @@ 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);
+               "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 classe: %!+S",
+               "Stream class has no packet context field class: %!+S",
                stream_class);
        field_wrapper = bt_field_wrapper_create(
                &stream_class->packet_context_field_pool,