diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-26 21:47:37 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-26 21:47:37 +0000 |
| commit | 4e3fe3a8005b1fc8329c9d744b351b2ad7a40b65 (patch) | |
| tree | d96e6f67422d4f3ee11366ea8d87d37994a41fd5 /pbx/pbx_ael.c | |
| parent | cc40b40286f7d5098f8a66c91f7fc6281981073f (diff) | |
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\?
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@59233 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx/pbx_ael.c')
| -rw-r--r-- | pbx/pbx_ael.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c index 2a3e91e23..6ca9b3458 100644 --- a/pbx/pbx_ael.c +++ b/pbx/pbx_ael.c @@ -2337,9 +2337,9 @@ static void check_context_names(void) 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 @@ void check_pval_item(pval *item, struct argapp *apps, int in_globals) 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) { |