X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Fpacket-context-field.c;h=2df09f085ae4d5c2ac289457c9abc2600ff53b23;hb=35fa110e5bea4a35497313adf3e3d0fa09db9ff7;hp=967ba52c75cec7a6968261ca410e917ef6ecf0c7;hpb=9e550e5f4bc9f2c09c3f85305c89c01e0da57424;p=babeltrace.git

diff --git a/lib/trace-ir/packet-context-field.c b/lib/trace-ir/packet-context-field.c
index 967ba52c..2df09f08 100644
--- a/lib/trace-ir/packet-context-field.c
+++ b/lib/trace-ir/packet-context-field.c
@@ -24,14 +24,14 @@
 #include <babeltrace/lib-logging-internal.h>
 
 #include <babeltrace/assert-pre-internal.h>
+#include <babeltrace/trace-ir/packet-context-field.h>
 #include <babeltrace/trace-ir/stream-class-internal.h>
-#include <babeltrace/trace-ir/private-packet-context-field.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_packet_context_field_borrow_private_field(
-		struct bt_private_packet_context_field *context_field)
+struct bt_field *bt_packet_context_field_borrow_field(
+		struct bt_packet_context_field *context_field)
 {
 	struct bt_field_wrapper *field_wrapper = (void *) context_field;
 
@@ -39,8 +39,8 @@ struct bt_private_field *bt_private_packet_context_field_borrow_private_field(
 	return (void *) field_wrapper->field;
 }
 
-void bt_private_packet_context_field_release(
-		struct bt_private_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;
 
@@ -56,17 +56,17 @@ void bt_private_packet_context_field_release(
 	bt_field_wrapper_destroy(field_wrapper);
 }
 
-struct bt_private_packet_context_field *bt_private_packet_context_field_create(
-		struct bt_private_stream_class *priv_stream_class)
+struct bt_packet_context_field *bt_packet_context_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(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,