[asterisk-commits] jpeeler: branch 1.6.1 r156291 - in /branches/1.6.1: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Nov 12 13:11:41 2008
New Revision: 156291

URL: http://svn.digium.com/view/asterisk?view=rev&rev=156291
Log:
Merged revisions 156290 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r156290 | jpeeler | 2008-11-12 13:11:15 -0600 (Wed, 12 Nov 2008) | 11 lines

Merged revisions 156289 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r156289 | jpeeler | 2008-11-12 13:10:12 -0600 (Wed, 12 Nov 2008) | 3 lines

For whatever reason, gcc only warned me about the possible use of an uninitialized variable when compiling 1.6.1. 


........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_meetme.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_meetme.c?view=diff&rev=156291&r1=156290&r2=156291
==============================================================================
--- branches/1.6.1/apps/app_meetme.c (original)
+++ branches/1.6.1/apps/app_meetme.c Wed Nov 12 13:11:41 2008
@@ -1584,7 +1584,7 @@
 			break;
 		}
 
-		for (; !conf->announcethread_stop && (current = AST_LIST_REMOVE_HEAD(&local_list, entry)); ao2_ref(current, -1)) {
+		for (res = 1; !conf->announcethread_stop && (current = AST_LIST_REMOVE_HEAD(&local_list, entry)); ao2_ref(current, -1)) {
 			ast_log(LOG_DEBUG, "About to play %s\n", current->namerecloc);
 			if (!ast_fileexists(current->namerecloc, NULL, NULL))
 				continue;