From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 24 Aug 2012 01:00:23 +0000 (-0400)
Subject: Cleanup: shut up gcc uninitialized var warning
X-Git-Tag: v1.0.0-rc5~9
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=4b8de1531a2a5b5ef8ca87ad104567de4f74f469;ds=sidebyside

Cleanup: shut up gcc uninitialized var warning

Even though it should never be used unset (due to return value), let's
be extra careful and check if indeed not set, and return an error in
that case.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/lib/iterator.c b/lib/iterator.c
index 927444f4..a06d66bd 100644
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -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);