kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 299449 via svnmerge from

Browse Source 
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:
Tilghman Lesher
2010-12-22 20:10:34 +00:00
parent 17d2c0f787
commit 8cca4ed8d8
6 changed files with 1704 additions and 1705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/ael/pval.c
View File

@@ -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 */