return &iter->parent;
}
-struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter)
+struct ctf_event_definition *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_event_definition *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 = g_ptr_array_index(stream->events_by_id,
+ stream->event_id);
if (ret->stream->stream_id > iter->callbacks->len)
goto end;