<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/11271">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Friendly Automation: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_ael: Create consistent label names across reloads<br><br>Reset the internal counter that the AEL2 compiler uses for unique label<br>names before compiling. This keeps dialplan labels consistent across<br>reloads assuming the AEL2 has not changed.<br><br>ASTERISK-17799 #close<br>Reported by: Kirill Katsnelson<br><br>Change-Id: I30b3cc887d1ee0644d3f341e2fef16f525d7fae5<br>---<br>M res/ael/pval.c<br>1 file changed, 4 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/ael/pval.c b/res/ael/pval.c</span><br><span>index f927077..095cb88 100644</span><br><span>--- a/res/ael/pval.c</span><br><span>+++ b/res/ael/pval.c</span><br><span>@@ -2924,7 +2924,7 @@</span><br><span> /* "CODE" GENERATOR -- Convert the AEL representation to asterisk extension language */</span><br><span> /* =============================================================================================== */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int control_statement_count = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+static int control_statement_count;</span><br><span> </span><br><span> struct ael_priority *new_prio(void)</span><br><span> {</span><br><span>@@ -4427,6 +4427,9 @@</span><br><span>       struct ael_extension *exten;</span><br><span>         struct ael_extension *exten_list = 0;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+     /* Reset the counter so that we get consistent labels between reloads */</span><br><span style="color: hsl(120, 100%, 40%);">+      control_statement_count = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       for (p=root; p; p=p->next ) { /* do the globals first, so they'll be there</span><br><span>                                                                     when we try to eval them */</span><br><span>                 switch (p->type) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/11271">change 11271</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/11271"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: I30b3cc887d1ee0644d3f341e2fef16f525d7fae5 </div>
<div style="display:none"> Gerrit-Change-Number: 11271 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>