X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fiterator.c;h=b4c5a697fa7023d9bf4aa35d7186e38fecb6b8f9;hp=6b1a6d2ad1668a42d7a6f1e268d71f0b3d8e1193;hb=3a25e036c64003c5778538d7cfef8beccc65d640;hpb=23a151f0f9301b6fee28c9b0e8301f1f50e4ef9b

diff --git a/lib/iterator.c b/lib/iterator.c
index 6b1a6d2a..b4c5a697 100644
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -223,11 +223,10 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
 			 */
 			stream->timestamp = saved_pos->current_timestamp;
 			stream_pos->offset = saved_pos->offset;
-			stream_pos->last_offset = saved_pos->offset;
+			stream_pos->last_offset = LAST_OFFSET_POISON;
 
 			stream->prev_timestamp = 0;
 			stream->prev_timestamp_end = 0;
-			stream->consumed = 0;
 
 			printf_debug("restored to cur_index = %zd and "
 				"offset = %zd, timestamp = %" PRIu64 "\n",
@@ -383,19 +382,7 @@ struct bt_iter_pos *bt_iter_get_pos(struct bt_iter *iter)
 
 				saved_pos.file_stream = cfs;
 				saved_pos.cur_index = cfs->pos.cur_index;
-
-				/*
-				 * It is possible that an event was read during
-				 * the last restore, never consumed and its
-				 * position saved again.  For this case, we
-				 * need to check if the event really was
-				 * consumed by the caller otherwise it is lost.
-				 */
-				if (stream->consumed)
-					saved_pos.offset = cfs->pos.offset;
-				else
-					saved_pos.offset = cfs->pos.last_offset;
-
+				saved_pos.offset = cfs->pos.last_offset;
 				saved_pos.current_timestamp = stream->timestamp;
 
 				g_array_append_val(