diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-26 21:41:32 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-26 21:41:32 +0000 |
| commit | 8e27c1a376c02c429d0aafef269e10453b02ed4b (patch) | |
| tree | 4f24b26fc0a274f53326e669b3f43785af6c4565 /pbx | |
| parent | b7ffaab8021f082d7141a32eb7f0d5ac57bc36af (diff) | |
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/branches/1.4@59228 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
| -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 85debdc99..5c36db343 100644 --- a/pbx/pbx_ael.c +++ b/pbx/pbx_ael.c @@ -2220,9 +2220,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++; } } } @@ -2317,7 +2317,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) { |