Merged revisions 299449 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r299449 | tilghman | 2010-12-22 14:05:02 -0600 (Wed, 22 Dec 2010) | 15 lines Merged revisions 299448 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r299448 | tilghman | 2010-12-22 14:03:30 -0600 (Wed, 22 Dec 2010) | 8 lines Resolve warnings by disambiguating the "s" extension as used by chan_dahdi from the "s" extension as used by the AEL macros. (closes issue #18480) Reported by: nivek Patches: 20101215__issue18480__2.diff.txt uploaded by tilghman (license 14) Tested by: nivek ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299450 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
17d2c0f787
commit
8cca4ed8d8
|
@ -15,4 +15,4 @@ LOG: lev:2 file:pbx_ael.c line:138 func: pbx_load_module AEL load process: che
|
|||
LOG: lev:2 file:pbx_ael.c line:145 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'.
|
||||
LOG: lev:2 file:pbx_ael.c line:150 func: pbx_load_module AEL load process: merged config file name './extensions.ael'.
|
||||
LOG: lev:2 file:pbx_ael.c line:153 func: pbx_load_module AEL load process: verified config file name './extensions.ael'.
|
||||
LOG: lev:4 file:ael2_parse line:516 func: main 13 contexts, 57 extensions, 191 priorities
|
||||
LOG: lev:4 file:ael2_parse line:516 func: main 13 contexts, 58 extensions, 191 priorities
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
(You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
|
||||
LOG: lev:2 file:pbx_ael.c line:122 func: pbx_load_module Starting AEL load process.
|
||||
LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././include1.ael2, 78 chars
|
||||
LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././include2.ael2, 98 chars
|
||||
LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././include3.ael2, 57 chars
|
||||
LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././include5.ael2, 56 chars
|
||||
LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././include4.ael2, 87 chars
|
||||
LOG: lev:2 file:ael.flex line:883 func: setup_filestack --Read in included file ././telemarket_torture.ael2, 28036 chars
|
||||
LOG: lev:2 file:ael.flex line:885 func: setup_filestack --Read in included file ././include1.ael2, 78 chars
|
||||
LOG: lev:2 file:ael.flex line:885 func: setup_filestack --Read in included file ././include2.ael2, 98 chars
|
||||
LOG: lev:2 file:ael.flex line:885 func: setup_filestack --Read in included file ././include3.ael2, 57 chars
|
||||
LOG: lev:2 file:ael.flex line:885 func: setup_filestack --Read in included file ././include5.ael2, 56 chars
|
||||
LOG: lev:2 file:ael.flex line:885 func: setup_filestack --Read in included file ././include4.ael2, 87 chars
|
||||
LOG: lev:2 file:ael.flex line:885 func: setup_filestack --Read in included file ././telemarket_torture.ael2, 28036 chars
|
||||
LOG: lev:2 file:pbx_ael.c line:135 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
|
||||
LOG: lev:3 file:pval.c line:673 func: check_macro_returns Warning: file ./extensions.ael, line 14-34: The macro std-exten does not end with a return; I will insert one.
|
||||
LOG: lev:3 file:pval.c line:1365 func: check_goto Warning: file ./extensions.ael, line 17-17: It's bad form to have a goto in a macro to a target outside the macro!
|
||||
|
@ -96,4 +96,4 @@ LOG: lev:2 file:pbx_ael.c line:138 func: pbx_load_module AEL load process: che
|
|||
LOG: lev:2 file:pbx_ael.c line:145 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'.
|
||||
LOG: lev:2 file:pbx_ael.c line:150 func: pbx_load_module AEL load process: merged config file name './extensions.ael'.
|
||||
LOG: lev:2 file:pbx_ael.c line:153 func: pbx_load_module AEL load process: verified config file name './extensions.ael'.
|
||||
LOG: lev:4 file:ael2_parse line:516 func: main 172 contexts, 934 extensions, 2634 priorities
|
||||
LOG: lev:4 file:ael2_parse line:516 func: main 172 contexts, 935 extensions, 2633 priorities
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -40,7 +40,7 @@ exten => 81,9,Set(time2=${EPOCH})
|
|||
exten => 81,10,Verbose(The time diff is $[${time2} - ${time1} ] seconds)
|
||||
exten => 81,11,Verbose(Which means that the priorities/sec = $[4* ${iterations} / (${time2} - ${time1}) ])
|
||||
exten => 81,12,SayNumber($[4 * ${iterations} / (${time2} - ${time1}) ])
|
||||
exten => 82,1,Gosub(ndeep,s,1(100000))
|
||||
exten => 82,1,Gosub(ndeep,~~s~~,1(100000))
|
||||
exten => 82,2,Verbose(Finished 100000 levels deep call!)
|
||||
exten => 83,1,Set(~~EXTEN~~=${EXTEN})
|
||||
exten => 83,2,Goto(sw_2_${~~EXTEN~~},10)
|
||||
|
@ -56,13 +56,13 @@ exten => _sw_2_8X,11,Goto(sw_2_99,10)
|
|||
|
||||
|
||||
[ndeep]
|
||||
exten => s,1,Set(LOCAL(level)=${ARG1})
|
||||
exten => s,2,GotoIf($[${level} == 0]?3:5)
|
||||
exten => s,3,Verbose(2|Got to Level 0)
|
||||
exten => s,4,Return()
|
||||
exten => s,5,NoOp(Finish if_ndeep_3)
|
||||
exten => s,6,Gosub(ndeep,s,1($[${level}-1]))
|
||||
exten => s,7,Return()
|
||||
exten => ~~s~~,1,Set(LOCAL(level)=${ARG1})
|
||||
exten => ~~s~~,2,GotoIf($[${level} == 0]?3:5)
|
||||
exten => ~~s~~,3,Verbose(2|Got to Level 0)
|
||||
exten => ~~s~~,4,Return()
|
||||
exten => ~~s~~,5,NoOp(Finish if_ndeep_3)
|
||||
exten => ~~s~~,6,Gosub(ndeep,~~s~~,1($[${level}-1]))
|
||||
exten => ~~s~~,7,Return()
|
||||
|
||||
|
||||
[t1extension]
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
|
||||
[test11]
|
||||
exten => 841,1,Gosub(test234,s,1("testing", ${CUT(EXTEN,,3)}))
|
||||
exten => 841,1,Gosub(test234,~~s~~,1("testing", ${CUT(EXTEN,,3)}))
|
||||
exten => 841,2,Goto(${DB(uri/${uri_string})},1)
|
||||
exten => 841,3,Set(line=${DB(uri/${uri_string})})
|
||||
exten => 841,4,Goto(${line},1)
|
||||
|
|
|
@ -3380,7 +3380,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
|
|||
switch_set->app = strdup("Set");
|
||||
}
|
||||
/* Are we likely inside a gosub subroutine? */
|
||||
if (!strcmp(mother_exten->name, "s") && first) {
|
||||
if (!strcmp(mother_exten->name, "~~s~~") && first) {
|
||||
/* If we're not actually within a gosub, this will fail, but the
|
||||
* second time through, it will get set. If we are within gosub,
|
||||
* the second time through is redundant, but acceptable. */
|
||||
|
@ -3409,7 +3409,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
|
|||
switch_set->app = strdup("Set");
|
||||
}
|
||||
/* Are we likely inside a gosub subroutine? */
|
||||
if (!strcmp(exten->name, "s")) {
|
||||
if (!strcmp(exten->name, "~~s~~")) {
|
||||
/* If we're not actually within a gosub, this will fail, but the
|
||||
* second time through, it will get set. If we are within gosub,
|
||||
* the second time through is redundant, but acceptable. */
|
||||
|
@ -3988,7 +3988,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
|
|||
case PV_MACRO_CALL:
|
||||
pr = new_prio();
|
||||
pr->type = AEL_APPCALL;
|
||||
snprintf(buf1, BUF_SIZE, "%s,s,1", p->u1.str);
|
||||
snprintf(buf1, BUF_SIZE, "%s,~~s~~,1", p->u1.str);
|
||||
first = 1;
|
||||
for (p2 = p->u2.arglist; p2; p2 = p2->next) {
|
||||
if (first)
|
||||
|
@ -4459,7 +4459,7 @@ int ast_compile_ael2(struct ast_context **local_contexts, struct ast_hashtab *lo
|
|||
|
||||
exten = new_exten();
|
||||
exten->context = context;
|
||||
exten->name = strdup("s");
|
||||
exten->name = strdup("~~s~~");
|
||||
argc = 1;
|
||||
for (lp=p->u2.arglist; lp; lp=lp->next) {
|
||||
/* for each arg, set up a "Set" command */
|
||||
|
|
Loading…
Reference in New Issue