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

diff --git a/formats/ctf/iterator.c b/formats/ctf/iterator.c
index 5cc7dbad..f7b25f15 100644
--- a/formats/ctf/iterator.c
+++ b/formats/ctf/iterator.c
@@ -86,10 +86,10 @@ struct bt_iter *bt_ctf_get_iter(struct bt_ctf_iter *iter)
 	return &iter->parent;
 }
 
-struct ctf_event_definition *bt_ctf_iter_read_event(struct bt_ctf_iter *iter)
+struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter)
 {
 	struct ctf_file_stream *file_stream;
-	struct ctf_event_definition *ret = &iter->current_ctf_event;
+	struct bt_ctf_event *ret = &iter->current_ctf_event;
 	struct ctf_stream_definition *stream;
 
 	file_stream = heap_maximum(iter->parent.stream_heap);
@@ -98,13 +98,13 @@ struct ctf_event_definition *bt_ctf_iter_read_event(struct bt_ctf_iter *iter)
 		goto stop;
 	}
 	stream = &file_stream->parent;
-	ret = g_ptr_array_index(stream->events_by_id,
+	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;