Fix: remove duplicate yydebug var

[babeltrace.git] / lib / iterator.c

diff --git a/lib/iterator.c b/lib/iterator.c
index 2527f89f96934050bc00ec3fd2acc6dffbbb9540..e3ae0689d80ce429da64748f0d7866536900f01b 100644 (file)
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -118,11 +118,10 @@ static int seek_file_stream_by_timestamp(struct ctf_file_stream *cfs,
                        continue;
 
                stream_pos->packet_seek(&stream_pos->parent, i, SEEK_SET);
-               while (cfs->parent.timestamp < timestamp) {
+               do {
                        ret = stream_read_event(cfs);
-                       if (ret < 0)
-                               break;
-               }
+               } while (cfs->parent.timestamp < timestamp && ret >= 0);
+
                return 0;
        }
        return EOF;
@@ -144,12 +143,12 @@ static int seek_ctf_trace_by_timestamp(struct ctf_trace *tin,
 
        /* for each stream_class */
        for (i = 0; i < tin->streams->len; i++) {
-               struct ctf_stream_class *stream_class;
+               struct ctf_stream_declaration *stream_class;
 
                stream_class = g_ptr_array_index(tin->streams, i);
                /* for each file_stream */
                for (j = 0; j < stream_class->streams->len; j++) {
-                       struct ctf_stream *stream;
+                       struct ctf_stream_definition *stream;
                        struct ctf_file_stream *cfs;
 
                        stream = g_ptr_array_index(stream_class->streams, j);
@@ -191,7 +190,7 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
                                i++) {
                        struct stream_saved_pos *saved_pos;
                        struct ctf_stream_pos *stream_pos;
-                       struct ctf_stream *stream;
+                       struct ctf_stream_definition *stream;
 
                        saved_pos = &g_array_index(
                                        iter_pos->u.restore->stream_saved_pos,
@@ -264,7 +263,7 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
                        /* Populate heap with each stream */
                        for (stream_id = 0; stream_id < tin->streams->len;
                                        stream_id++) {
-                               struct ctf_stream_class *stream;
+                               struct ctf_stream_declaration *stream;
                                int filenr;
 
                                stream = g_ptr_array_index(tin->streams,
@@ -325,14 +324,14 @@ struct bt_iter_pos *bt_iter_get_pos(struct bt_iter *iter)
 
                for (stream_class_id = 0; stream_class_id < tin->streams->len;
                                stream_class_id++) {
-                       struct ctf_stream_class *stream_class;
+                       struct ctf_stream_declaration *stream_class;
 
                        stream_class = g_ptr_array_index(tin->streams,
                                        stream_class_id);
                        for (stream_id = 0;
                                        stream_id < stream_class->streams->len;
                                        stream_id++) {
-                               struct ctf_stream *stream;
+                               struct ctf_stream_definition *stream;
                                struct ctf_file_stream *cfs;
                                struct stream_saved_pos saved_pos;
 
@@ -444,7 +443,7 @@ int bt_iter_seek(struct bt_iter *iter,
                /* Populate heap with each stream */
                for (stream_id = 0; stream_id < tin->streams->len;
                                stream_id++) {
-                       struct ctf_stream_class *stream;
+                       struct ctf_stream_declaration *stream;
                        int filenr;
 
                        stream = g_ptr_array_index(tin->streams, stream_id);
@@ -497,7 +496,7 @@ int bt_iter_init(struct bt_iter *iter,
                /* Populate heap with each stream */
                for (stream_id = 0; stream_id < tin->streams->len;
                                stream_id++) {
-                       struct ctf_stream_class *stream;
+                       struct ctf_stream_declaration *stream;
                        int filenr;
 
                        stream = g_ptr_array_index(tin->streams, stream_id);