From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 23 Feb 2011 04:22:44 +0000 (-0500)
Subject: Cleanup error handling in open_channel
X-Git-Tag: v1.9.1~449
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=b2ccc23151c949c88ab37929000ec0bb83d5456d;p=lttng-ust.git

Cleanup error handling in open_channel

Reported-by: Yannick Brosseau <yannick.brosseau@gmail.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/libust/buffers.c b/libust/buffers.c
index 4e8004c6..4011b643 100644
--- a/libust/buffers.c
+++ b/libust/buffers.c
@@ -319,13 +319,10 @@ static int open_channel(struct ust_channel *chan, size_t subbuf_size,
 
 	return 0;
 
-	/* Jump directly inside the loop to close the buffers that were already
-	 * opened. */
-	for(; i>=0; i--) {
-		close_buf(chan->buf[i]);
+	/* Error handling */
 error:
-		do {} while(0);
-	}
+	for(i--; i >= 0; i--)
+		close_buf(chan->buf[i]);
 
 	pthread_mutex_unlock(&ust_buffers_channels_mutex);
 	return -1;