[svn-commits] lmadsen: branch 1.6.2 r262799 - in /branches/1.6.2: ./ res/ael/pval.c

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Wed May 12 14:53:36 2010
New Revision: 262799

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=262799
Log:
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)
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/res/ael/pval.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/res/ael/pval.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/res/ael/pval.c?view=diff&rev=262799&r1=262798&r2=262799
==============================================================================
--- branches/1.6.2/res/ael/pval.c (original)
+++ branches/1.6.2/res/ael/pval.c Wed May 12 14:53:36 2010
@@ -2506,7 +2506,6 @@
 			|| 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 @@
 			|| 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) {