[asterisk-commits] murf: branch murf/AEL2-1.2 r59237 -
/team/murf/AEL2-1.2/pbx/pbx_ael2.c
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Mar 26 15:33:27 MST 2007
Author: murf
Date: Mon Mar 26 17:33:26 2007
New Revision: 59237
URL: http://svn.digium.com/view/asterisk?view=rev&rev=59237
Log:
the 9373 patch made here also (AEL crash on doubly-defined contexts)
Modified:
team/murf/AEL2-1.2/pbx/pbx_ael2.c
Modified: team/murf/AEL2-1.2/pbx/pbx_ael2.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2-1.2/pbx/pbx_ael2.c?view=diff&rev=59237&r1=59236&r2=59237
==============================================================================
--- team/murf/AEL2-1.2/pbx/pbx_ael2.c (original)
+++ team/murf/AEL2-1.2/pbx/pbx_ael2.c Mon Mar 26 17:33:26 2007
@@ -2221,9 +2221,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++;
}
}
}
@@ -2318,7 +2318,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) {
More information about the asterisk-commits
mailing list