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

[asterisk/asterisk.git] / channels / chan_iax2.c

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 6c0608b..928ec8a 100755 (executable)
--- 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;
                }
        }