X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fdata-stream-file.c;h=dca33e2e4b8da85b083f29c1a61c124a15a8f807;hb=b19ff26f04df428047676dd736bd7cc9473906fe;hp=d046b0dfd679eb55e011f03980fd26dd1d9484be;hpb=40f4ba76dd6f9508ca51b6220eaed57632281a07;p=babeltrace.git

diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c
index d046b0df..dca33e2e 100644
--- a/plugins/ctf/fs-src/data-stream-file.c
+++ b/plugins/ctf/fs-src/data-stream-file.c
@@ -173,13 +173,13 @@ end:
 }
 
 static
-struct bt_stream *medop_borrow_stream(
-		struct bt_stream_class *stream_class, int64_t stream_id,
+bt_stream *medop_borrow_stream(
+		bt_stream_class *stream_class, int64_t stream_id,
 		void *data)
 {
 	struct ctf_fs_ds_file *ds_file = data;
-	struct bt_stream_class *ds_file_stream_class;
-	struct bt_stream *stream = NULL;
+	bt_stream_class *ds_file_stream_class;
+	bt_stream *stream = NULL;
 
 	ds_file_stream_class = bt_stream_borrow_class(
 		ds_file->stream);
@@ -293,7 +293,7 @@ struct ctf_fs_ds_index_entry *ctf_fs_ds_index_add_new_entry(
 }
 
 static
-int convert_cycles_to_ns(struct bt_clock_class *clock_class,
+int convert_cycles_to_ns(bt_clock_class *clock_class,
 		uint64_t cycles, int64_t *ns)
 {
 	return bt_clock_class_cycles_to_ns_from_origin(clock_class, cycles,
@@ -624,9 +624,9 @@ error:
 BT_HIDDEN
 struct ctf_fs_ds_file *ctf_fs_ds_file_create(
 		struct ctf_fs_trace *ctf_fs_trace,
-		struct bt_self_notification_iterator *pc_notif_iter,
+		bt_self_notification_iterator *pc_notif_iter,
 		struct bt_notif_iter *notif_iter,
-		struct bt_stream *stream, const char *path)
+		bt_stream *stream, const char *path)
 {
 	int ret;
 	const size_t page_size = bt_common_get_page_size();
@@ -643,7 +643,7 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create(
 	}
 
 	ds_file->stream = stream;
-	bt_object_get_ref(ds_file->stream);
+	bt_stream_get_ref(ds_file->stream);
 	ds_file->metadata = ctf_fs_trace->metadata;
 	g_string_assign(ds_file->file->path, path);
 	ret = ctf_fs_file_open(ds_file->file, "rb");
@@ -695,7 +695,7 @@ void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file)
 		return;
 	}
 
-	bt_object_put_ref(ds_file->stream);
+	bt_stream_put_ref(ds_file->stream);
 	(void) ds_file_munmap(ds_file);
 
 	if (ds_file->file) {
@@ -708,7 +708,7 @@ void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file)
 BT_HIDDEN
 enum bt_notification_iterator_status ctf_fs_ds_file_next(
 		struct ctf_fs_ds_file *ds_file,
-		struct bt_private_notification **notif)
+		bt_notification **notif)
 {
 	enum bt_notif_iter_status notif_iter_status;
 	enum bt_notification_iterator_status status;
@@ -742,8 +742,8 @@ enum bt_notification_iterator_status ctf_fs_ds_file_next(
 BT_HIDDEN
 int ctf_fs_ds_file_borrow_packet_header_context_fields(
 		struct ctf_fs_ds_file *ds_file,
-		struct bt_field **packet_header_field,
-		struct bt_field **packet_context_field)
+		bt_field **packet_header_field,
+		bt_field **packet_context_field)
 {
 	enum bt_notif_iter_status notif_iter_status;
 	int ret = 0;