X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fdata-stream-file.c;h=803d424f518108c62879f1dba11966997bcbd4ef;hb=7b53201cfb06ec02f4203e28458dfbcf53d87988;hp=3657199044a4ae10c944074ad7c723d1e7d871b8;hpb=7b33a0e0d8f23d90285ea7c7820a725bcbd96c6b;p=babeltrace.git

diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c
index 36571990..803d424f 100644
--- a/plugins/ctf/fs-src/data-stream-file.c
+++ b/plugins/ctf/fs-src/data-stream-file.c
@@ -181,7 +181,9 @@ struct bt_stream *medop_borrow_stream(
 	struct bt_stream_class *ds_file_stream_class;
 	struct bt_stream *stream = NULL;
 
-	ds_file_stream_class = bt_stream_borrow_class(ds_file->stream);
+	ds_file_stream_class = bt_stream_borrow_class(
+		ds_file->stream);
+
 	if (stream_class != ds_file_stream_class) {
 		/*
 		 * Not supported: two packets described by two different
@@ -294,7 +296,8 @@ static
 int convert_cycles_to_ns(struct bt_clock_class *clock_class,
 		uint64_t cycles, int64_t *ns)
 {
-	return bt_clock_class_cycles_to_ns_from_origin(clock_class, cycles, ns);
+	return bt_clock_class_cycles_to_ns_from_origin(clock_class, cycles,
+						       ns);
 }
 
 static
@@ -621,7 +624,7 @@ error:
 BT_HIDDEN
 struct ctf_fs_ds_file *ctf_fs_ds_file_create(
 		struct ctf_fs_trace *ctf_fs_trace,
-		struct bt_private_connection_private_notification_iterator *pc_notif_iter,
+		struct bt_self_notification_iterator *pc_notif_iter,
 		struct bt_notif_iter *notif_iter,
 		struct bt_stream *stream, const char *path)
 {
@@ -639,7 +642,8 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create(
 		goto error;
 	}
 
-	ds_file->stream = bt_get(stream);
+	ds_file->stream = stream;
+	bt_object_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");
@@ -691,8 +695,7 @@ void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file)
 		return;
 	}
 
-	bt_put(ds_file->cc_prio_map);
-	bt_put(ds_file->stream);
+	bt_object_put_ref(ds_file->stream);
 	(void) ds_file_munmap(ds_file);
 
 	if (ds_file->file) {