add missing newlines, fix misspelling of nonexistent (bug #4027)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5467 f38db490-d61c-443f-a65b-d21fe96a405b

4 files changed, 12 insertions, 12 deletions

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 6c0608bce..928ec8aa6 100755
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -573,8 +573,8 @@ static struct ast_firmware_list {
 
 /* Extension exists */
 #define CACHE_FLAG_EXISTS		(1 << 0)
-/* Extension is non-existant */
-#define CACHE_FLAG_NONEXISTANT	(1 << 1)
+/* Extension is nonexistent */
+#define CACHE_FLAG_NONEXISTENT	(1 << 1)
 /* Extension can exist */
 #define CACHE_FLAG_CANEXIST		(1 << 2)
 /* Waiting to hear back response */
@@ -1954,8 +1954,8 @@ static int iax2_show_cache(int fd, int argc, char *argv[])
 		tmp[0] = '\0';
 		if (dp->flags & CACHE_FLAG_EXISTS)
 			strncat(tmp, "EXISTS|", sizeof(tmp) - strlen(tmp) - 1);
-		if (dp->flags & CACHE_FLAG_NONEXISTANT)
-			strncat(tmp, "NONEXISTANT|", sizeof(tmp) - strlen(tmp) - 1);
+		if (dp->flags & CACHE_FLAG_NONEXISTENT)
+			strncat(tmp, "NONEXISTENT|", sizeof(tmp) - strlen(tmp) - 1);
 		if (dp->flags & CACHE_FLAG_CANEXIST)
 			strncat(tmp, "CANEXIST|", sizeof(tmp) - strlen(tmp) - 1);
 		if (dp->flags & CACHE_FLAG_PENDING)
@@ -5181,8 +5181,8 @@ static int complete_dpreply(struct chan_iax2_pvt *pvt, struct iax_ies *ies)
 		status = CACHE_FLAG_EXISTS;
 	else if (ies->dpstatus & IAX_DPSTATUS_CANEXIST)
 		status = CACHE_FLAG_CANEXIST;
-	else if (ies->dpstatus & IAX_DPSTATUS_NONEXISTANT)
-		status = CACHE_FLAG_NONEXISTANT;
+	else if (ies->dpstatus & IAX_DPSTATUS_NONEXISTENT)
+		status = CACHE_FLAG_NONEXISTENT;
 
 	if (ies->dpstatus & IAX_DPSTATUS_IGNOREPAT) {
 		/* Don't really do anything with this */
@@ -5907,7 +5907,7 @@ static void dp_lookup(int callno, char *context, char *callednum, char *callerid
 	} else if (ast_canmatch_extension(NULL, context, callednum, 1, callerid)) {
 		dpstatus = IAX_DPSTATUS_CANEXIST;
 	} else {
-		dpstatus = IAX_DPSTATUS_NONEXISTANT;
+		dpstatus = IAX_DPSTATUS_NONEXISTENT;
 	}
 	if (ast_ignore_pattern(context, callednum))
 		dpstatus |= IAX_DPSTATUS_IGNOREPAT;
@@ -6292,7 +6292,7 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
 		ast_mutex_lock(&iaxsl[fr.callno]);
 
 	if (!fr.callno || !iaxs[fr.callno]) {
-		/* A call arrived for a non-existant destination.  Unless it's an "inval"
+		/* A call arrived for a nonexistent destination.  Unless it's an "inval"
 		   frame, reply with an inval */
 		if (ntohs(mh->callno) & IAX_FLAG_FULL) {
 			/* We can only raw hangup control frames */
@@ -8833,7 +8833,7 @@ static int iax2_exec(struct ast_channel *chan, const char *context, const char *
 				ast_verbose(VERBOSE_PREFIX_3 "Executing Dial('%s')\n", req);
 		} else {
 			ast_mutex_unlock(&dpcache_lock);
-			ast_log(LOG_WARNING, "Can't execute non-existant extension '%s[@%s]' in data '%s'\n", exten, context, data);
+			ast_log(LOG_WARNING, "Can't execute nonexistent extension '%s[@%s]' in data '%s'\n", exten, context, data);
 			return -1;
 		}
 	}
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 601634f49..677157abf 100755
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -2598,7 +2598,7 @@ static void destroy_session(struct skinnysession *s)
 		ast_mutex_destroy(&s->lock);
 		free(s);
 	} else
-		ast_log(LOG_WARNING, "Trying to delete non-existant session %p?\n", s);
+		ast_log(LOG_WARNING, "Trying to delete nonexistent session %p?\n", s);
 	ast_mutex_unlock(&sessionlock);
 }
 
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 86f2cd026..2e18dcbd8 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6287,7 +6287,7 @@ static int pri_resolve_span(int *span, int channel, int offset, struct zt_spanin
 				return 0;
 			}
 		}
-		ast_log(LOG_WARNING, "Channel %d on span %d configured to use non-existant trunk group %d\n", channel, *span, trunkgroup);
+		ast_log(LOG_WARNING, "Channel %d on span %d configured to use nonexistent trunk group %d\n", channel, *span, trunkgroup);
 		*span = -1;
 	} else {
 		if (pris[*span].trunkgroup) {
diff --git a/channels/iax2.h b/channels/iax2.h
index c08d54994..c6b44628d 100755
--- a/channels/iax2.h
+++ b/channels/iax2.h
@@ -150,7 +150,7 @@
 
 #define IAX_DPSTATUS_EXISTS			(1 << 0)
 #define IAX_DPSTATUS_CANEXIST		(1 << 1)
-#define IAX_DPSTATUS_NONEXISTANT	(1 << 2)
+#define IAX_DPSTATUS_NONEXISTENT	(1 << 2)
 #define IAX_DPSTATUS_IGNOREPAT		(1 << 14)
 #define IAX_DPSTATUS_MATCHMORE		(1 << 15)