lib: make trace IR API const-correct

[babeltrace.git] / plugins / ctf / fs-src / data-stream-file.c

diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c
index 9f7b7972f192f09dffc47681e32e5105518040e2..d046b0dfd679eb55e011f03980fd26dd1d9484be 100644 (file)
--- 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_object_get_ref(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,7 +695,6 @@ void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file)
                return;
        }
 
-       bt_object_put_ref(ds_file->cc_prio_map);
        bt_object_put_ref(ds_file->stream);
        (void) ds_file_munmap(ds_file);
 
@@ -705,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_notification **notif)
+               struct bt_private_notification **notif)
 {
        enum bt_notif_iter_status notif_iter_status;
        enum bt_notification_iterator_status status;