bt_field_class_*_create(): accept mandatory trace class

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

diff --git a/lib/trace-ir/packet-header-field.c b/lib/trace-ir/packet-header-field.c
index b02704bc11529aabb15ad3c6e67b35ca759fa2ea..8f72a42a6f0279b9ae7483779748af92871e23e4 100644 (file)
--- a/lib/trace-ir/packet-header-field.c
+++ b/lib/trace-ir/packet-header-field.c
@@ -24,14 +24,14 @@
 #include <babeltrace/lib-logging-internal.h>
 
 #include <babeltrace/assert-pre-internal.h>
+#include <babeltrace/trace-ir/packet-header-field.h>
 #include <babeltrace/trace-ir/trace-internal.h>
-#include <babeltrace/trace-ir/private-packet-header-field.h>
 #include <babeltrace/trace-ir/field-wrapper-internal.h>
-#include <babeltrace/trace-ir/fields-internal.h>
+#include <babeltrace/trace-ir/field-internal.h>
 #include <glib.h>
 
-struct bt_private_field *bt_private_packet_header_field_borrow_private_field(
-               struct bt_private_packet_header_field *header_field)
+struct bt_field *bt_packet_header_field_borrow_field(
+               struct bt_packet_header_field *header_field)
 {
        struct bt_field_wrapper *field_wrapper = (void *) header_field;
 
@@ -39,8 +39,8 @@ struct bt_private_field *bt_private_packet_header_field_borrow_private_field(
        return (void *) field_wrapper->field;
 }
 
-void bt_private_packet_header_field_release(
-               struct bt_private_packet_header_field *header_field)
+void bt_packet_header_field_release(
+               struct bt_packet_header_field *header_field)
 {
        struct bt_field_wrapper *field_wrapper = (void *) header_field;
 
@@ -56,26 +56,25 @@ void bt_private_packet_header_field_release(
        bt_field_wrapper_destroy(field_wrapper);
 }
 
-struct bt_private_packet_header_field *bt_private_packet_header_field_create(
-               struct bt_private_trace *priv_trace)
+struct bt_packet_header_field *bt_packet_header_field_create(
+               struct bt_trace_class *tc)
 {
        struct bt_field_wrapper *field_wrapper;
-       struct bt_trace *trace = (void *) priv_trace;
 
-       BT_ASSERT_PRE_NON_NULL(trace, "Trace");
-       BT_ASSERT_PRE(trace->packet_header_fc,
-               "Trace has no packet header field classe: %!+t", trace);
+       BT_ASSERT_PRE_NON_NULL(tc, "Trace class");
+       BT_ASSERT_PRE(tc->packet_header_fc,
+               "Trace class has no packet header field class: %!+T", tc);
        field_wrapper = bt_field_wrapper_create(
-               &trace->packet_header_field_pool,
-               (void *) trace->packet_header_fc);
+               &tc->packet_header_field_pool,
+               (void *) tc->packet_header_fc);
        if (!field_wrapper) {
-               BT_LIB_LOGE("Cannot allocate one packet header field from trace: "
-                       "%![trace-]+t", trace);
+               BT_LIB_LOGE("Cannot allocate one packet header field from trace class: "
+                       "%![tc-]+T", tc);
                goto error;
        }
 
        BT_ASSERT(field_wrapper->field);
-       bt_trace_freeze(trace);
+       bt_trace_class_freeze(tc);
        goto end;
 
 error: