aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-12 19:53:36 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-12 19:53:36 +0000
commit7ada7a8ee299ad6c93f161d0f5c4807cfee25fb1 (patch)
tree10ebb115780710dfe81fc561485c37ae267ff580
parent6abf4eedf4440753f1b55848d7ecb20d3146d130 (diff)
Merged revisions 262798 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r262798 | lmadsen | 2010-05-12 14:53:10 -0500 (Wed, 12 May 2010) | 7 lines Revert previous WARNING message removal. Marquis42 suggested a better method of doing what I wanted because I ended up removing the WARNING message for all instances when really I just wanted to remove it for the 'return' keyword, not everything. (issue #17145) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@262799 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--res/ael/pval.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/res/ael/pval.c b/res/ael/pval.c
index 94d71b5f4..5414e7971 100644
--- a/res/ael/pval.c
+++ b/res/ael/pval.c
@@ -2506,7 +2506,6 @@ void check_pval_item(pval *item, struct argapp *apps, int in_globals)
|| strcasecmp(item->u1.str,"endwhile") == 0
|| strcasecmp(item->u1.str,"random") == 0
|| strcasecmp(item->u1.str,"gosub") == 0
- || strcasecmp(item->u1.str,"return") == 0
|| strcasecmp(item->u1.str,"gosubif") == 0
|| strcasecmp(item->u1.str,"continuewhile") == 0
|| strcasecmp(item->u1.str,"endwhile") == 0
@@ -2519,6 +2518,8 @@ void check_pval_item(pval *item, struct argapp *apps, int in_globals)
|| strcasecmp(item->u1.str,"macroif") == 0
|| strcasecmp(item->u1.str,"stackpop") == 0
|| strcasecmp(item->u1.str,"execIf") == 0 ) {
+ ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: application call to %s affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!\n",
+ item->filename, item->startline, item->endline, item->u1.str);
warns++;
}
if (strcasecmp(item->u1.str,"macroexit") == 0) {