From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 2 Mar 2012 16:26:01 +0000 (+0000)
Subject: Remove bad usage of goto in ChanSpy next_channel().
X-Git-Tag: 11.0.0-beta1~572
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ce386d198f46933e4b6f89a36a32fbe86cad409;p=thirdparty%2Fasterisk.git

Remove bad usage of goto in ChanSpy next_channel().

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@357834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 9337299100..e773c47895 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -742,23 +742,18 @@ static struct ast_autochan *next_channel(struct ast_channel_iterator *iter,
 		return NULL;
 	}
 
-redo:
-	if (!(next = ast_channel_iterator_next(iter))) {
-		return NULL;
-	}
+	for (; (next = ast_channel_iterator_next(iter)); ast_channel_unref(next)) {
+		if (!strncmp(ast_channel_name(next), "DAHDI/pseudo", pseudo_len)
+			|| next == chan) {
+			continue;
+		}
 
-	if (!strncmp(ast_channel_name(next), "DAHDI/pseudo", pseudo_len)) {
+		autochan_store = ast_autochan_setup(next);
 		ast_channel_unref(next);
-		goto redo;
-	} else if (next == chan) {
-		ast_channel_unref(next);
-		goto redo;
-	}
 
-	autochan_store = ast_autochan_setup(next);
-	ast_channel_unref(next);
-
-	return autochan_store;
+		return autochan_store;
+	}
+	return NULL;
 }
 
 static int common_exec(struct ast_channel *chan, struct ast_flags *flags,