X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-sink%2Fwriter.c;h=ff6035133bcd21ead40114a6e8e33cd2e6529fec;hb=b19ff26f04df428047676dd736bd7cc9473906fe;hp=8f2ffd8a92f3421d720ada71d47043fb7e8a7269;hpb=0d72b8c329ad51d14ab4e83330b38c2c8da69dd4;p=babeltrace.git

diff --git a/plugins/ctf/fs-sink/writer.c b/plugins/ctf/fs-sink/writer.c
index 8f2ffd8a..ff603513 100644
--- a/plugins/ctf/fs-sink/writer.c
+++ b/plugins/ctf/fs-sink/writer.c
@@ -63,7 +63,7 @@ void destroy_writer_component_data(struct writer_component *writer_component)
 }
 
 BT_HIDDEN
-void writer_component_finalize(struct bt_self_component *component)
+void writer_component_finalize(bt_self_component *component)
 {
 	struct writer_component *writer_component = (struct writer_component *)
 		bt_self_component_get_user_data(component);
@@ -111,7 +111,7 @@ end:
 static
 enum bt_component_status handle_notification(
 		struct writer_component *writer_component,
-		const struct bt_notification *notification)
+		const bt_notification *notification)
 {
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 
@@ -121,10 +121,10 @@ enum bt_component_status handle_notification(
 	}
 
 	switch (bt_notification_get_type(notification)) {
-	case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+	case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
 	{
-		const struct bt_packet *packet =
-			bt_notification_packet_begin_get_packet(notification);
+		const bt_packet *packet =
+			bt_notification_packet_beginning_get_packet(notification);
 
 		if (!packet) {
 			ret = BT_COMPONENT_STATUS_ERROR;
@@ -132,12 +132,12 @@ enum bt_component_status handle_notification(
 		}
 
 		ret = writer_new_packet(writer_component, packet);
-		bt_object_put_ref(packet);
+		bt_packet_put_ref(packet);
 		break;
 	}
 	case BT_NOTIFICATION_TYPE_PACKET_END:
 	{
-		const struct bt_packet *packet =
+		const bt_packet *packet =
 			bt_notification_packet_end_get_packet(notification);
 
 		if (!packet) {
@@ -145,12 +145,12 @@ enum bt_component_status handle_notification(
 			goto end;
 		}
 		ret = writer_close_packet(writer_component, packet);
-		bt_object_put_ref(packet);
+		bt_packet_put_ref(packet);
 		break;
 	}
 	case BT_NOTIFICATION_TYPE_EVENT:
 	{
-		const struct bt_event *event = bt_notification_event_get_event(
+		const bt_event *event = bt_notification_event_get_event(
 				notification);
 
 		if (!event) {
@@ -164,22 +164,22 @@ enum bt_component_status handle_notification(
 		}
 		break;
 	}
-	case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
+	case BT_NOTIFICATION_TYPE_STREAM_BEGINNING:
 	{
-		const struct bt_stream *stream =
-			bt_notification_stream_begin_get_stream(notification);
+		const bt_stream *stream =
+			bt_notification_stream_beginning_get_stream(notification);
 
 		if (!stream) {
 			ret = BT_COMPONENT_STATUS_ERROR;
 			goto end;
 		}
 		ret = writer_stream_begin(writer_component, stream);
-		bt_object_put_ref(stream);
+		bt_stream_put_ref(stream);
 		break;
 	}
 	case BT_NOTIFICATION_TYPE_STREAM_END:
 	{
-		const struct bt_stream *stream =
+		const bt_stream *stream =
 			bt_notification_stream_end_get_stream(notification);
 
 		if (!stream) {
@@ -187,7 +187,7 @@ enum bt_component_status handle_notification(
 			goto end;
 		}
 		ret = writer_stream_end(writer_component, stream);
-		bt_object_put_ref(stream);
+		bt_stream_put_ref(stream);
 		break;
 	}
 	default:
@@ -199,9 +199,9 @@ end:
 
 BT_HIDDEN
 void writer_component_port_connected(
-		struct bt_self_component *component,
+		bt_self_component *component,
 		struct bt_private_port *self_port,
-		const struct bt_port *other_port)
+		const bt_port *other_port)
 {
 	struct bt_private_connection *connection;
 	struct writer_component *writer;
@@ -222,11 +222,11 @@ void writer_component_port_connected(
 }
 
 BT_HIDDEN
-enum bt_component_status writer_run(struct bt_self_component *component)
+enum bt_component_status writer_run(bt_self_component *component)
 {
 	enum bt_component_status ret;
-	const struct bt_notification *notification = NULL;
-	struct bt_notification_iterator *it;
+	const bt_notification *notification = NULL;
+	bt_notification_iterator *it;
 	struct writer_component *writer_component =
 		bt_self_component_get_user_data(component);
 	enum bt_notification_iterator_status it_ret;
@@ -265,12 +265,12 @@ end:
 
 static
 enum bt_component_status apply_one_bool(const char *key,
-		struct bt_value *params,
+		bt_value *params,
 		bool *option,
 		bool *found)
 {
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-	struct bt_value *value = NULL;
+	bt_value *value = NULL;
 	enum bt_value_status status;
 	bt_bool bool_val;
 
@@ -285,19 +285,19 @@ enum bt_component_status apply_one_bool(const char *key,
 		*found = true;
 	}
 end:
-	bt_object_put_ref(value);
+	bt_value_put_ref(value);
 	return ret;
 }
 
 BT_HIDDEN
 enum bt_component_status writer_component_init(
-	struct bt_self_component *component, struct bt_value *params,
+	bt_self_component *component, bt_value *params,
 	UNUSED_VAR void *init_method_data)
 {
 	enum bt_component_status ret;
 	enum bt_value_status value_ret;
 	struct writer_component *writer_component = create_writer_component();
-	struct bt_value *value = NULL;
+	bt_value *value = NULL;
 	const char *path;
 
 	if (!writer_component) {