[asterisk-commits] jrose: trunk r412550 - in /trunk: ./ main/app.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Thu Apr 17 17:42:57 2014
New Revision: 412550

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=412550
Log:
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

Modified:
    trunk/   (props changed)
    trunk/main/app.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/main/app.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/app.c?view=diff&rev=412550&r1=412549&r2=412550
==============================================================================
--- trunk/main/app.c (original)
+++ trunk/main/app.c Thu Apr 17 17:42:57 2014
@@ -1140,7 +1140,7 @@
 	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 @@
 
 	for (;;) {
 		struct ast_frame *fr;
-		int res;
 
 		if (ast_waitfor(chan, -1) < 0) {
 			res = -1;