X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fiterator.c;fp=formats%2Fctf%2Fiterator.c;h=5cc7dbad14de5d79ae66ba0fcffefba055983b1e;hp=3597010a5b0b6d36a5c5b98bfc1028f19552bb5d;hb=8a4722b0ccf5cf30ee76a85bdf6bea2fa0515153;hpb=d3ded99df05c7602749aa50530a1dc69db4cc066

diff --git a/formats/ctf/iterator.c b/formats/ctf/iterator.c
index 3597010a..5cc7dbad 100644
--- a/formats/ctf/iterator.c
+++ b/formats/ctf/iterator.c
@@ -86,19 +86,20 @@ struct bt_iter *bt_ctf_get_iter(struct bt_ctf_iter *iter)
 	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;