[asterisk-commits] tilghman: branch 1.6.1 r152173 - in /branches/1.6.1: ./ apps/app_stack.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Oct 27 11:42:07 2008
New Revision: 152173

URL: http://svn.digium.com/view/asterisk?view=rev&rev=152173
Log:
Merged revisions 152134 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r152134 | tilghman | 2008-10-27 11:24:11 -0500 (Mon, 27 Oct 2008) | 4 lines
  
  Oops, only delete the ARG variables once upon release.  The following section
  would have removed them again (removing variables from 2 stack frames, instead
  of just one).
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_stack.c

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

Modified: branches/1.6.1/apps/app_stack.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_stack.c?view=diff&rev=152173&r1=152172&r2=152173
==============================================================================
--- branches/1.6.1/apps/app_stack.c (original)
+++ branches/1.6.1/apps/app_stack.c Mon Oct 27 11:42:07 2008
@@ -118,8 +118,6 @@
 
 static void gosub_release_frame(struct ast_channel *chan, struct gosub_stack_frame *frame)
 {
-	unsigned char i;
-	char argname[15];
 	struct ast_var_t *vardata;
 
 	/* If chan is not defined, then we're calling it as part of gosub_free,
@@ -128,14 +126,6 @@
 	 * that frame, so that we re-expose the variables from the previous frame
 	 * that were hidden by this one.
 	 */
-	if (chan) {
-		for (i = 1; i <= frame->arguments && i != 0; i++) {
-			snprintf(argname, sizeof(argname), "ARG%hhd", i);
-			pbx_builtin_setvar_helper(chan, argname, NULL);
-		}
-	}
-
-	/* Delete local variables */
 	while ((vardata = AST_LIST_REMOVE_HEAD(&frame->varshead, entries))) {
 		if (chan)
 			pbx_builtin_setvar_helper(chan, ast_var_name(vardata), NULL);