X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-sink%2Fwriter.c;h=b87d78d26ceddf6064aceeaee10a656561faaefc;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hp=ccd57fdd0709bd90a9f044a67a4a3d8749c717c5;hpb=28e6ca8b6e08d1cdd1af81ae819aa39baa206eaf;p=babeltrace.git

diff --git a/plugins/ctf/fs-sink/writer.c b/plugins/ctf/fs-sink/writer.c
index ccd57fdd..b87d78d2 100644
--- a/plugins/ctf/fs-sink/writer.c
+++ b/plugins/ctf/fs-sink/writer.c
@@ -63,10 +63,10 @@ void destroy_writer_component_data(struct writer_component *writer_component)
 }
 
 BT_HIDDEN
-void writer_component_finalize(struct bt_private_component *component)
+void writer_component_finalize(struct bt_self_component *component)
 {
 	struct writer_component *writer_component = (struct writer_component *)
-		bt_private_component_get_user_data(component);
+		bt_self_component_get_user_data(component);
 
 	destroy_writer_component_data(writer_component);
 	g_free(writer_component);
@@ -123,7 +123,7 @@ enum bt_component_status handle_notification(
 	switch (bt_notification_get_type(notification)) {
 	case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
 	{
-		struct bt_packet *packet =
+		const struct bt_packet *packet =
 			bt_notification_packet_begin_get_packet(notification);
 
 		if (!packet) {
@@ -137,7 +137,7 @@ enum bt_component_status handle_notification(
 	}
 	case BT_NOTIFICATION_TYPE_PACKET_END:
 	{
-		struct bt_packet *packet =
+		const struct bt_packet *packet =
 			bt_notification_packet_end_get_packet(notification);
 
 		if (!packet) {
@@ -150,7 +150,7 @@ enum bt_component_status handle_notification(
 	}
 	case BT_NOTIFICATION_TYPE_EVENT:
 	{
-		struct bt_event *event = bt_notification_event_get_event(
+		const struct bt_event *event = bt_notification_event_get_event(
 				notification);
 
 		if (!event) {
@@ -166,7 +166,7 @@ enum bt_component_status handle_notification(
 	}
 	case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
 	{
-		struct bt_stream *stream =
+		const struct bt_stream *stream =
 			bt_notification_stream_begin_get_stream(notification);
 
 		if (!stream) {
@@ -179,7 +179,7 @@ enum bt_component_status handle_notification(
 	}
 	case BT_NOTIFICATION_TYPE_STREAM_END:
 	{
-		struct bt_stream *stream =
+		const struct bt_stream *stream =
 			bt_notification_stream_end_get_stream(notification);
 
 		if (!stream) {
@@ -199,7 +199,7 @@ end:
 
 BT_HIDDEN
 void writer_component_port_connected(
-		struct bt_private_component *component,
+		struct bt_self_component *component,
 		struct bt_private_port *self_port,
 		struct bt_port *other_port)
 {
@@ -207,7 +207,7 @@ void writer_component_port_connected(
 	struct writer_component *writer;
 	enum bt_connection_status conn_status;
 
-	writer = bt_private_component_get_user_data(component);
+	writer = bt_self_component_get_user_data(component);
 	BT_ASSERT(writer);
 	BT_ASSERT(!writer->input_iterator);
 	connection = bt_private_port_get_connection(self_port);
@@ -222,13 +222,13 @@ void writer_component_port_connected(
 }
 
 BT_HIDDEN
-enum bt_component_status writer_run(struct bt_private_component *component)
+enum bt_component_status writer_run(struct bt_self_component *component)
 {
 	enum bt_component_status ret;
 	struct bt_notification *notification = NULL;
 	struct bt_notification_iterator *it;
 	struct writer_component *writer_component =
-		bt_private_component_get_user_data(component);
+		bt_self_component_get_user_data(component);
 	enum bt_notification_iterator_status it_ret;
 
 	if (unlikely(writer_component->error)) {
@@ -291,7 +291,7 @@ end:
 
 BT_HIDDEN
 enum bt_component_status writer_component_init(
-	struct bt_private_component *component, struct bt_value *params,
+	struct bt_self_component *component, struct bt_value *params,
 	UNUSED_VAR void *init_method_data)
 {
 	enum bt_component_status ret;
@@ -305,7 +305,7 @@ enum bt_component_status writer_component_init(
 		goto end;
 	}
 
-	ret = bt_private_component_sink_add_input_port(component,
+	ret = bt_self_component_sink_add_input_port(component,
 		"in", NULL, NULL);
 	if (ret != BT_COMPONENT_STATUS_OK) {
 		goto end;
@@ -338,7 +338,7 @@ enum bt_component_status writer_component_init(
 		goto end;
 	}
 
-	ret = bt_private_component_set_user_data(component, writer_component);
+	ret = bt_self_component_set_user_data(component, writer_component);
 	if (ret != BT_COMPONENT_STATUS_OK) {
 		goto error;
 	}