kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_ael: Create consistent label names across reloads" into 16

Browse Source
This commit is contained in:
George Joseph
2019-04-12 14:16:27 -05:00
committed by Gerrit Code Review
parent 62cf7eae92 116dc9c9b3
commit 03b6d18e99
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/ael/pval.c
View File

@@ -2924,7 +2924,7 @@ void ael2_semantic_check(pval *item, int *arg_errs, int *arg_warns, int *arg_not
/* "CODE" GENERATOR -- Convert the AEL representation to asterisk extension language */ /* "CODE" GENERATOR -- Convert the AEL representation to asterisk extension language */
/* =============================================================================================== */ /* =============================================================================================== */
static int control_statement_count = 0; static int control_statement_count;
struct ael_priority *new_prio(void) struct ael_priority *new_prio(void)
{ {
@@ -4427,6 +4427,9 @@ int ast_compile_ael2(struct ast_context **local_contexts, struct ast_hashtab *lo
struct ael_extension *exten; struct ael_extension *exten;
struct ael_extension *exten_list = 0; struct ael_extension *exten_list = 0;
/* Reset the counter so that we get consistent labels between reloads */
control_statement_count = 0;
for (p=root; p; p=p->next ) { /* do the globals first, so they'll be there for (p=root; p; p=p->next ) { /* do the globals first, so they'll be there
when we try to eval them */ when we try to eval them */
switch (p->type) { switch (p->type) {