[Asterisk-code-review] spelling: context (asterisk[master])

[Josh Soref]

Josh Soref has uploaded this change for review. ( https://gerrit.asterisk.org/c/asterisk/+/16829 )


Change subject: spelling: context
......................................................................

spelling: context

Change-Id: Ied232451c42dbbb24ff9ed0b6b5eb27c5f119254
---
M main/features.c
M res/ael/pval.c
2 files changed, 10 insertions(+), 10 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/29/16829/1

diff --git a/main/features.c b/main/features.c
index 9810866..24a47b9 100644
--- a/main/features.c
+++ b/main/features.c
@@ -363,10 +363,10 @@
 void ast_channel_log(char *title, struct ast_channel *chan) /* for debug, this is handy enough to justify keeping it in the source */
 {
 	ast_log(LOG_NOTICE, "______ %s (%lx)______\n", title, (unsigned long) chan);
-	ast_log(LOG_NOTICE, "CHAN: name: %s;  appl: %s; data: %s; contxt: %s;  exten: %s; pri: %d;\n",
+	ast_log(LOG_NOTICE, "CHAN: name: %s;  appl: %s; data: %s; context: %s;  exten: %s; pri: %d;\n",
 		ast_channel_name(chan), ast_channel_appl(chan), ast_channel_data(chan),
 		ast_channel_context(chan), ast_channel_exten(chan), ast_channel_priority(chan));
-	ast_log(LOG_NOTICE, "CHAN: acctcode: %s;  dialcontext: %s; amaflags: %x; maccontxt: %s;  macexten: %s; macpri: %d;\n",
+	ast_log(LOG_NOTICE, "CHAN: acctcode: %s;  dialcontext: %s; amaflags: %x; maccontext: %s;  macexten: %s; macpri: %d;\n",
 		ast_channel_accountcode(chan), ast_channel_dialcontext(chan), ast_channel_amaflags(chan),
 		ast_channel_macrocontext(chan), ast_channel_macroexten(chan), ast_channel_macropriority(chan));
 	ast_log(LOG_NOTICE, "CHAN: masq: %p;  masqr: %p; uniqueID: %s; linkedID:%s\n",
diff --git a/res/ael/pval.c b/res/ael/pval.c
index b85e20e..b73ddc5 100644
--- a/res/ael/pval.c
+++ b/res/ael/pval.c
@@ -106,8 +106,8 @@
 static int label_inside_case(pval *label);
 static void attach_exten(struct ael_extension **list, struct ael_extension *newmem);
 static void fix_gotos_in_extensions(struct ael_extension *exten);
-static pval *get_extension_or_contxt(pval *p);
-static pval *get_contxt(pval *p);
+static pval *get_extension_or_context(pval *p);
+static pval *get_context(pval *p);
 static void remove_spaces_before_equals(char *str);
 
 /* PRETTY PRINTER FOR AEL:  ============================================================================= */
@@ -1153,7 +1153,7 @@
 static pval *get_goto_target(pval *item)
 {
 	/* just one item-- the label should be in the current extension */
-	pval *curr_ext = get_extension_or_contxt(item); /* containing exten, or macro */
+	pval *curr_ext = get_extension_or_context(item); /* containing exten, or macro */
 	pval *curr_cont;
 
 	if (!item->u1.list) {
@@ -1165,7 +1165,7 @@
 			return x;
 	}
 
-	curr_cont = get_contxt(item);
+	curr_cont = get_context(item);
 
 	/* TWO items */
 	if (item->u1.list->next && !item->u1.list->next->next) {
@@ -1237,7 +1237,7 @@
 
 	/* just one item-- the label should be in the current extension */
 	if (!item->u1.list->next && !strstr(item->u1.list->u1.str,"${")) {
-		struct pval *z = get_extension_or_contxt(item);
+		struct pval *z = get_extension_or_context(item);
 		struct pval *x = 0;
 		if (z)
 			x = find_label_in_current_extension((char*)((item->u1.list)->u1.str), z); /* if in macro, use current context instead */
@@ -1259,7 +1259,7 @@
 		   (char*)((item->u1.list)->u1.str), (char *)item->u1.list->next->u1.str); */
 		if (!strstr((item->u1.list)->u1.str,"${")
 			&& !strstr(item->u1.list->next->u1.str,"${") ) /* Don't try to match variables */ {
-			struct pval *z = get_contxt(item);
+			struct pval *z = get_context(item);
 			struct pval *x = 0;
 
 			if (z)
@@ -4332,7 +4332,7 @@
 	lptr->next_exten = newmem;
 }
 
-static pval *get_extension_or_contxt(pval *p)
+static pval *get_extension_or_context(pval *p)
 {
 	while( p && p->type != PV_EXTENSION && p->type != PV_CONTEXT && p->type != PV_MACRO ) {
 
@@ -4342,7 +4342,7 @@
 	return p;
 }
 
-static pval *get_contxt(pval *p)
+static pval *get_context(pval *p)
 {
 	while( p && p->type != PV_CONTEXT && p->type != PV_MACRO ) {
 

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/16829
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: Ied232451c42dbbb24ff9ed0b6b5eb27c5f119254
Gerrit-Change-Number: 16829
Gerrit-PatchSet: 1
Gerrit-Owner: Josh Soref <jsoref at gmail.com>
Gerrit-CC: Friendly Automation
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20211107/7966ece7/attachment.html>