<p>Josh Soref has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16829">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">spelling: context<br><br>Change-Id: Ied232451c42dbbb24ff9ed0b6b5eb27c5f119254<br>---<br>M main/features.c<br>M res/ael/pval.c<br>2 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/29/16829/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/features.c b/main/features.c</span><br><span>index 9810866..24a47b9 100644</span><br><span>--- a/main/features.c</span><br><span>+++ b/main/features.c</span><br><span>@@ -363,10 +363,10 @@</span><br><span> void ast_channel_log(char *title, struct ast_channel *chan) /* for debug, this is handy enough to justify keeping it in the source */</span><br><span> {</span><br><span>       ast_log(LOG_NOTICE, "______ %s (%lx)______\n", title, (unsigned long) chan);</span><br><span style="color: hsl(0, 100%, 40%);">-  ast_log(LOG_NOTICE, "CHAN: name: %s;  appl: %s; data: %s; contxt: %s;  exten: %s; pri: %d;\n",</span><br><span style="color: hsl(120, 100%, 40%);">+      ast_log(LOG_NOTICE, "CHAN: name: %s;  appl: %s; data: %s; context: %s;  exten: %s; pri: %d;\n",</span><br><span>            ast_channel_name(chan), ast_channel_appl(chan), ast_channel_data(chan),</span><br><span>              ast_channel_context(chan), ast_channel_exten(chan), ast_channel_priority(chan));</span><br><span style="color: hsl(0, 100%, 40%);">-        ast_log(LOG_NOTICE, "CHAN: acctcode: %s;  dialcontext: %s; amaflags: %x; maccontxt: %s;  macexten: %s; macpri: %d;\n",</span><br><span style="color: hsl(120, 100%, 40%);">+      ast_log(LOG_NOTICE, "CHAN: acctcode: %s;  dialcontext: %s; amaflags: %x; maccontext: %s;  macexten: %s; macpri: %d;\n",</span><br><span>            ast_channel_accountcode(chan), ast_channel_dialcontext(chan), ast_channel_amaflags(chan),</span><br><span>            ast_channel_macrocontext(chan), ast_channel_macroexten(chan), ast_channel_macropriority(chan));</span><br><span>      ast_log(LOG_NOTICE, "CHAN: masq: %p;  masqr: %p; uniqueID: %s; linkedID:%s\n",</span><br><span>diff --git a/res/ael/pval.c b/res/ael/pval.c</span><br><span>index b85e20e..b73ddc5 100644</span><br><span>--- a/res/ael/pval.c</span><br><span>+++ b/res/ael/pval.c</span><br><span>@@ -106,8 +106,8 @@</span><br><span> static int label_inside_case(pval *label);</span><br><span> static void attach_exten(struct ael_extension **list, struct ael_extension *newmem);</span><br><span> static void fix_gotos_in_extensions(struct ael_extension *exten);</span><br><span style="color: hsl(0, 100%, 40%);">-static pval *get_extension_or_contxt(pval *p);</span><br><span style="color: hsl(0, 100%, 40%);">-static pval *get_contxt(pval *p);</span><br><span style="color: hsl(120, 100%, 40%);">+static pval *get_extension_or_context(pval *p);</span><br><span style="color: hsl(120, 100%, 40%);">+static pval *get_context(pval *p);</span><br><span> static void remove_spaces_before_equals(char *str);</span><br><span> </span><br><span> /* PRETTY PRINTER FOR AEL:  ============================================================================= */</span><br><span>@@ -1153,7 +1153,7 @@</span><br><span> static pval *get_goto_target(pval *item)</span><br><span> {</span><br><span>       /* just one item-- the label should be in the current extension */</span><br><span style="color: hsl(0, 100%, 40%);">-      pval *curr_ext = get_extension_or_contxt(item); /* containing exten, or macro */</span><br><span style="color: hsl(120, 100%, 40%);">+      pval *curr_ext = get_extension_or_context(item); /* containing exten, or macro */</span><br><span>    pval *curr_cont;</span><br><span> </span><br><span>         if (!item->u1.list) {</span><br><span>@@ -1165,7 +1165,7 @@</span><br><span>                     return x;</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   curr_cont = get_contxt(item);</span><br><span style="color: hsl(120, 100%, 40%);">+ curr_cont = get_context(item);</span><br><span> </span><br><span>   /* TWO items */</span><br><span>      if (item->u1.list->next && !item->u1.list->next->next) {</span><br><span>@@ -1237,7 +1237,7 @@</span><br><span> </span><br><span>  /* just one item-- the label should be in the current extension */</span><br><span>   if (!item->u1.list->next && !strstr(item->u1.list->u1.str,"${")) {</span><br><span style="color: hsl(0, 100%, 40%);">-                struct pval *z = get_extension_or_contxt(item);</span><br><span style="color: hsl(120, 100%, 40%);">+               struct pval *z = get_extension_or_context(item);</span><br><span>             struct pval *x = 0;</span><br><span>          if (z)</span><br><span>                       x = find_label_in_current_extension((char*)((item->u1.list)->u1.str), z); /* if in macro, use current context instead */</span><br><span>@@ -1259,7 +1259,7 @@</span><br><span>                  (char*)((item->u1.list)->u1.str), (char *)item->u1.list->next->u1.str); */</span><br><span>                 if (!strstr((item->u1.list)->u1.str,"${")</span><br><span>                    && !strstr(item->u1.list->next->u1.str,"${") ) /* Don't try to match variables */ {</span><br><span style="color: hsl(0, 100%, 40%);">-                      struct pval *z = get_contxt(item);</span><br><span style="color: hsl(120, 100%, 40%);">+                    struct pval *z = get_context(item);</span><br><span>                  struct pval *x = 0;</span><br><span> </span><br><span>                      if (z)</span><br><span>@@ -4332,7 +4332,7 @@</span><br><span>       lptr->next_exten = newmem;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static pval *get_extension_or_contxt(pval *p)</span><br><span style="color: hsl(120, 100%, 40%);">+static pval *get_extension_or_context(pval *p)</span><br><span> {</span><br><span>     while( p && p->type != PV_EXTENSION && p->type != PV_CONTEXT && p->type != PV_MACRO ) {</span><br><span> </span><br><span>@@ -4342,7 +4342,7 @@</span><br><span>         return p;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static pval *get_contxt(pval *p)</span><br><span style="color: hsl(120, 100%, 40%);">+static pval *get_context(pval *p)</span><br><span> {</span><br><span>   while( p && p->type != PV_CONTEXT && p->type != PV_MACRO ) {</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16829">change 16829</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/+/16829"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ied232451c42dbbb24ff9ed0b6b5eb27c5f119254 </div>
<div style="display:none"> Gerrit-Change-Number: 16829 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Josh Soref <jsoref@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Friendly Automation </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>