[Asterisk-code-review] Revert "pbx_ael: Global variables are not expanded." (asterisk[master])

[Friendly Automation]

Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/20007 )

Change subject: Revert "pbx_ael: Global variables are not expanded."
......................................................................

Revert "pbx_ael: Global variables are not expanded."

This reverts commit c448dcd2f0e67acf527662574193994559ae853a.

Reason for revert: Behavior change that breaks existing dialplan.

ASTERISK-30472 #close

Change-Id: I20e44b4081d6ee0fe54cde44ac71dcf2d146f909
---
M res/ael/pval.c
1 file changed, 18 insertions(+), 11 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  N A: Looks good to me, but someone else must approve
  Friendly Automation: Approved for Submit




diff --git a/res/ael/pval.c b/res/ael/pval.c
index 8596d66..10af159 100644
--- a/res/ael/pval.c
+++ b/res/ael/pval.c
@@ -4414,11 +4414,7 @@
 {
 	pval *p,*p2;
 	struct ast_context *context;
-#ifdef LOW_MEMORY
 	char buf[2000];
-#else
-	char buf[8192];
-#endif
 	struct ael_extension *exten;
 	struct ael_extension *exten_list = 0;
 
@@ -4431,13 +4427,9 @@
 		case PV_GLOBALS:
 			/* just VARDEC elements */
 			for (p2=p->u1.list; p2; p2=p2->next) {
-#ifdef STANDALONE
-				snprintf(buf, sizeof(buf), "%s=%s", p2->u1.str, p2->u2.val);
-				pbx_builtin_setvar(NULL, buf);
-#else
-				pbx_substitute_variables_helper(NULL, p2->u2.val, buf, sizeof(buf) - 1);
-				pbx_builtin_setvar_helper(NULL, p2->u1.str, buf);
-#endif
+				char buf2[2000];
+				snprintf(buf2,sizeof(buf2),"%s=%s", p2->u1.str, p2->u2.val);
+				pbx_builtin_setvar(NULL, buf2);
 			}
 			break;
 		default:

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/20007
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: I20e44b4081d6ee0fe54cde44ac71dcf2d146f909
Gerrit-Change-Number: 20007
Gerrit-PatchSet: 2
Gerrit-Owner: Sean Bright <sean at seanbright.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: N A <asterisk at phreaknet.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20230324/eff03085/attachment-0001.html>