X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fiterator.c;h=411b377ecf8cda2e6a1ec2ada151e0ed3d944eae;hp=927444f47931885ea166be040b5133a8261827fe;hb=refs%2Ftags%2Fv1.0.0-rc6;hpb=f7ed656326285831256061407c2c533c16c50f36

diff --git a/lib/iterator.c b/lib/iterator.c
index 927444f4..411b377e 100644
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -381,8 +381,8 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
 			stream->prev_cycles_timestamp = 0;
 			stream->prev_cycles_timestamp_end = 0;
 
-			printf_debug("restored to cur_index = %zd and "
-				"offset = %zd, timestamp = %" PRIu64 "\n",
+			printf_debug("restored to cur_index = %" PRId64 " and "
+				"offset = %" PRId64 ", timestamp = %" PRIu64 "\n",
 				stream_pos->cur_index,
 				stream_pos->offset, stream->real_timestamp);
 
@@ -480,11 +480,11 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
 		break;
 	case BT_SEEK_LAST:
 	{
-		struct ctf_file_stream *cfs;
+		struct ctf_file_stream *cfs = NULL;
 
 		tc = iter->ctx->tc;
 		ret = seek_last_ctf_trace_collection(tc, &cfs);
-		if (ret != 0)
+		if (ret != 0 || !cfs)
 			goto error;
 		/* remove all streams from the heap */
 		heap_free(iter->stream_heap);
@@ -625,7 +625,6 @@ static int babeltrace_filestream_seek(struct ctf_file_stream *file_stream,
 		break;
 	case BT_SEEK_TIME:
 	case BT_SEEK_RESTORE:
-	case BT_SEEK_END:
 	default:
 		assert(0); /* Not yet defined */
 	}