X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fiterator.c;h=d2464ab7c4f8274e2fadee6e70a6f8a51f76dcc4;hp=5e8a8ce8bee097059ff1c1d8d92e0f55ab611717;hb=2654fe9bab8f0eaeb17264ef7abadfd14e245b23;hpb=b587c608bc908920415bc1b1c7d21e809408cf36

diff --git a/lib/iterator.c b/lib/iterator.c
index 5e8a8ce8..d2464ab7 100644
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -399,10 +399,15 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
 			stream_pos->offset = saved_pos->offset;
 			stream_pos->last_offset = LAST_OFFSET_POISON;
 
-			stream->prev_real_timestamp = 0;
-			stream->prev_real_timestamp_end = 0;
-			stream->prev_cycles_timestamp = 0;
-			stream->prev_cycles_timestamp_end = 0;
+			stream->current.real.begin = 0;
+			stream->current.real.end = 0;
+			stream->current.cycles.begin = 0;
+			stream->current.cycles.end = 0;
+
+			stream->prev.real.begin = 0;
+			stream->prev.real.end = 0;
+			stream->prev.cycles.begin = 0;
+			stream->prev.cycles.end = 0;
 
 			printf_debug("restored to cur_index = %" PRId64 " and "
 				"offset = %" PRId64 ", timestamp = %" PRIu64 "\n",
@@ -663,7 +668,7 @@ int bt_iter_add_trace(struct bt_iter *iter,
 		struct bt_trace_descriptor *td_read)
 {
 	struct ctf_trace *tin;
-	int stream_id, ret;
+	int stream_id, ret = 0;
 
 	tin = container_of(td_read, struct ctf_trace, parent);