Fix: assign the current clock for mmap traces

[babeltrace.git] / formats / ctf / iterator.c

diff --git a/formats/ctf/iterator.c b/formats/ctf/iterator.c
index 3413dbb02e07a2885e76aa2dc3f497bf1906953a..f7b25f158884827459d7de0b8286832c60b3a33e 100644 (file)
--- a/formats/ctf/iterator.c
+++ b/formats/ctf/iterator.c
@@ -32,8 +32,8 @@
 #include "events-private.h"
 
 struct bt_ctf_iter *bt_ctf_iter_create(struct bt_context *ctx,
-               struct bt_iter_pos *begin_pos,
-               struct bt_iter_pos *end_pos)
+               const struct bt_iter_pos *begin_pos,
+               const struct bt_iter_pos *end_pos)
 {
        struct bt_ctf_iter *iter;
        int ret;
@@ -90,20 +90,21 @@ struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter)
 {
        struct ctf_file_stream *file_stream;
        struct bt_ctf_event *ret = &iter->current_ctf_event;
+       struct ctf_stream_definition *stream;
 
        file_stream = heap_maximum(iter->parent.stream_heap);
        if (!file_stream) {
                /* end of file for all streams */
                goto stop;
        }
-       ret->stream = &file_stream->parent;
-       ret->event = g_ptr_array_index(ret->stream->events_by_id,
-                       ret->stream->event_id);
+       stream = &file_stream->parent;
+       ret->parent = g_ptr_array_index(stream->events_by_id,
+                       stream->event_id);
 
-       if (ret->stream->stream_id > iter->callbacks->len)
+       if (ret->parent->stream->stream_id > iter->callbacks->len)
                goto end;
 
-       process_callbacks(iter, ret->stream);
+       process_callbacks(iter, ret->parent->stream);
 
 end:
        return ret;