X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Fevent-header-field.c;h=da7e8c94759e3452c32d00abf17736d6ddf06de4;hb=35fa110e5bea4a35497313adf3e3d0fa09db9ff7;hp=370611744837260570dd9dcd9530a8870eca9a3c;hpb=9e550e5f4bc9f2c09c3f85305c89c01e0da57424;p=babeltrace.git

diff --git a/lib/trace-ir/event-header-field.c b/lib/trace-ir/event-header-field.c
index 37061174..da7e8c94 100644
--- a/lib/trace-ir/event-header-field.c
+++ b/lib/trace-ir/event-header-field.c
@@ -24,14 +24,14 @@
 #include <babeltrace/lib-logging-internal.h>
 
 #include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/trace-ir/private-event-header-field.h>
+#include <babeltrace/trace-ir/event-header-field.h>
 #include <babeltrace/trace-ir/stream-class-internal.h>
-#include <babeltrace/trace-ir/fields-internal.h>
+#include <babeltrace/trace-ir/field-internal.h>
 #include <babeltrace/trace-ir/field-wrapper-internal.h>
 #include <glib.h>
 
-struct bt_private_field *bt_private_event_header_field_borrow_private_field(
-		struct bt_private_event_header_field *header_field)
+struct bt_field *bt_event_header_field_borrow_field(
+		struct bt_event_header_field *header_field)
 {
 	struct bt_field_wrapper *field_wrapper = (void *) header_field;
 
@@ -39,8 +39,8 @@ struct bt_private_field *bt_private_event_header_field_borrow_private_field(
 	return (void *) field_wrapper->field;
 }
 
-void bt_private_event_header_field_release(
-		struct bt_private_event_header_field *header_field)
+void bt_event_header_field_release(
+		struct bt_event_header_field *header_field)
 {
 	struct bt_field_wrapper *field_wrapper = (void *) header_field;
 
@@ -56,17 +56,16 @@ void bt_private_event_header_field_release(
 	bt_field_wrapper_destroy(field_wrapper);
 }
 
-struct bt_private_event_header_field *bt_private_event_header_field_create(
-		struct bt_private_stream_class *priv_stream_class)
+struct bt_event_header_field *bt_event_header_field_create(
+		struct bt_stream_class *stream_class)
 {
-	struct bt_stream_class *stream_class = (void *) priv_stream_class;
 	struct bt_field_wrapper *field_wrapper;
 
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-	BT_ASSERT_PRE(bt_stream_class_borrow_trace_inline(stream_class),
+	BT_ASSERT_PRE(bt_stream_class_borrow_trace_class_inline(stream_class),
 		"Stream class is not part of a trace: %!+S", stream_class);
 	BT_ASSERT_PRE(stream_class->event_header_fc,
-		"Stream class has no event header field classe: %!+S",
+		"Stream class has no event header field class: %!+S",
 		stream_class);
 	field_wrapper = bt_field_wrapper_create(
 		&stream_class->event_header_field_pool,