From: Leif Madsen <leif@leifmadsen.com>
Date: Wed, 12 May 2010 19:53:36 +0000 (+0000)
Subject: Merged revisions 262798 via svnmerge from
X-Git-Tag: 1.6.2.9-rc1~2^2~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55e4f2c570f17a9078c9a7282c23434aea054976;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@262799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/ael/pval.c b/res/ael/pval.c
index 94d71b5f4a..5414e7971b 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) {