[asterisk-commits] murf: trunk r59233 - in /trunk: ./ pbx/pbx_ael.c

[asterisk-commits at lists.digium.com]

Author: murf
Date: Mon Mar 26 16:47:37 2007
New Revision: 59233

URL: http://svn.digium.com/view/asterisk?view=rev&rev=59233
Log:
Merged revisions 59228 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59228 | murf | 2007-03-26 15:41:32 -0600 (Mon, 26 Mar 2007) | 1 line

fix for 9373 (duplicate context in AEL crashes asterisk). I turned a duplicate context from a WARNING to an ERROR. Now you get a module load failure, and asterisk just exits. That's better than a crash, right\?
........

Modified:
    trunk/   (props changed)
    trunk/pbx/pbx_ael.c

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

Modified: trunk/pbx/pbx_ael.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/pbx_ael.c?view=diff&rev=59233&r1=59232&r2=59233
==============================================================================
--- trunk/pbx/pbx_ael.c (original)
+++ trunk/pbx/pbx_ael.c Mon Mar 26 16:47:37 2007
@@ -2337,9 +2337,9 @@
 				if ( j->type == PV_CONTEXT || j->type == PV_MACRO ) {
 					if ( !strcmp(i->u1.str, j->u1.str) )
 					{
-						ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: The context name (%s) is also declared in file %s, line %d-%d!\n",
+						ast_log(LOG_ERROR,"Error: file %s, line %d-%d: The context name (%s) is also declared in file %s, line %d-%d!\n",
 								i->filename, i->startline, i->endline, i->u1.str,  j->filename, j->startline, j->endline);
-						warns++;
+						errs++;
 					}
 				}
 			}
@@ -2437,7 +2437,7 @@
 		macro_def = find_macro(item->u1.str);
 		if (!macro_def) {
 			/* here is a good place to check to see if the definition is in extensions.conf! */
-			ast_log(LOG_WARNING, "Error: file %s, line %d-%d: macro call to non-existent %s ! Hopefully it is present in extensions.conf! \n",
+			ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: macro call to non-existent %s ! Hopefully it is present in extensions.conf! \n",
 					item->filename, item->startline, item->endline, item->u1.str);
 			warns++;
 		} else if (macro_def->type != PV_MACRO) {