X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fdata-stream-file.c;h=1a95ae0964e848eff0f1abfc84ebc2800e59ec70;hb=398454ed067b95215c7affbe265fd36edab931ee;hp=d47e18b8d9384c043adfa6b5cfbe503e31b4604a;hpb=28e6ca8b6e08d1cdd1af81ae819aa39baa206eaf;p=babeltrace.git diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c index d47e18b8..1a95ae09 100644 --- a/plugins/ctf/fs-src/data-stream-file.c +++ b/plugins/ctf/fs-src/data-stream-file.c @@ -297,7 +297,7 @@ int convert_cycles_to_ns(struct bt_private_clock_class *clock_class, uint64_t cycles, int64_t *ns) { return bt_clock_class_cycles_to_ns_from_origin( - bt_clock_class_borrow_from_private(clock_class), cycles, ns); + bt_private_clock_class_as_clock_class(clock_class), cycles, ns); } static @@ -624,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_private_stream *stream, const char *path) { @@ -642,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");