From: Jonathan Rose <jrose@digium.com>
Date: Thu, 17 Apr 2014 22:42:57 +0000 (+0000)
Subject: Fix a silly shadowed variable mistake that was missed from play tones patch
X-Git-Tag: 13.0.0-beta1~341
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c76608f24b1561ae9faff484381433df06631713;p=thirdparty%2Fasterisk.git

Fix a silly shadowed variable mistake that was missed from play tones patch
........

Merged revisions 412549 from http://svn.asterisk.org/svn/asterisk/branches/12


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

diff --git a/main/app.c b/main/app.c
index f7bb0048ca..a02c6d671b 100644
--- a/main/app.c
+++ b/main/app.c
@@ -1140,7 +1140,7 @@ int ast_control_tone(struct ast_channel *chan, const char *tone)
 	struct ast_tone_zone *zone = NULL;
 	struct ast_tone_zone_sound *ts;
 	int paused = 0;
-	int res;
+	int res = 0;
 
 	const char *tone_indication = NULL;
 	const char *tone_zone = NULL;
@@ -1168,7 +1168,6 @@ int ast_control_tone(struct ast_channel *chan, const char *tone)
 
 	for (;;) {
 		struct ast_frame *fr;
-		int res;
 
 		if (ast_waitfor(chan, -1) < 0) {
 			res = -1;