Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5467 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Russell Bryant 20 years ago
parent 8d1744dd29
commit 7bffc0459c
13 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

4
app.c
Unescape View File

@ -231,7 +231,7 @@ int ast_app_has_voicemail(const char *mailbox, const char *folder)
return ast_has_voicemail_func(mailbox, folder); return ast_has_voicemail_func(mailbox, folder);
if ((option_verbose > 2) && !warned) { if ((option_verbose > 2) && !warned) {
ast_verbose(VERBOSE_PREFIX_3 "Message check requested for mailbox %s/folder %s but voicemail not loaded.", mailbox, folder ? folder : "INBOX"); ast_verbose(VERBOSE_PREFIX_3 "Message check requested for mailbox %s/folder %s but voicemail not loaded.\n", mailbox, folder ? folder : "INBOX");
warned++; warned++;
} }
return 0; return 0;
@ -250,7 +250,7 @@ int ast_app_messagecount(const char *mailbox, int *newmsgs, int *oldmsgs)
if (!warned && (option_verbose > 2)) { if (!warned && (option_verbose > 2)) {
warned++; warned++;
ast_verbose(VERBOSE_PREFIX_3 "Message count requested for mailbox %s but voicemail not loaded.", mailbox); ast_verbose(VERBOSE_PREFIX_3 "Message count requested for mailbox %s but voicemail not loaded.\n", mailbox);
} }
return 0; return 0;

2
apps/app_meetme.c
Unescape View File

@ -1571,7 +1571,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
if (!found) { if (!found) {
/* At this point, we have a confno_tmp (static conference) that is empty */ /* At this point, we have a confno_tmp (static conference) that is empty */
if ((empty_no_pin && ((!stringp) || (stringp && (stringp[0] == '\0')))) || (!empty_no_pin)) { if ((empty_no_pin && ((!stringp) || (stringp && (stringp[0] == '\0')))) || (!empty_no_pin)) {
/* Case 1: empty_no_pin and pin is nonexistant (NULL) /* Case 1: empty_no_pin and pin is nonexistent (NULL)
* Case 2: empty_no_pin and pin is blank (but not NULL) * Case 2: empty_no_pin and pin is blank (but not NULL)
* Case 3: not empty_no_pin * Case 3: not empty_no_pin
*/ */

2
apps/app_queue.c
Unescape View File

@ -108,7 +108,7 @@ static char *descrip =
"Queues an incoming call in a particular call queue as defined in queues.conf.\n" "Queues an incoming call in a particular call queue as defined in queues.conf.\n"
" This application returns -1 if the originating channel hangs up, or if the\n" " This application returns -1 if the originating channel hangs up, or if the\n"
"call is bridged and either of the parties in the bridge terminate the call.\n" "call is bridged and either of the parties in the bridge terminate the call.\n"
"Returns 0 if the queue is full, nonexistant, or has no members.\n" "Returns 0 if the queue is full, nonexistent, or has no members.\n"
"The option string may contain zero or more of the following characters:\n" "The option string may contain zero or more of the following characters:\n"
" 't' -- allow the called user transfer the calling user\n" " 't' -- allow the called user transfer the calling user\n"
" 'T' -- to allow the calling user to transfer the call.\n" " 'T' -- to allow the calling user to transfer the call.\n"

2
cdr.c
Unescape View File

@ -210,7 +210,7 @@ int ast_cdr_setvar(struct ast_cdr *cdr, const char *name, const char *value, int
struct varshead *headp; struct varshead *headp;
if (!cdr) { if (!cdr) {
ast_log(LOG_ERROR, "Attempt to set a variable on a nonexistant CDR record.\n"); ast_log(LOG_ERROR, "Attempt to set a variable on a nonexistent CDR record.\n");
return -1; return -1;
} }
while (cdr) { while (cdr) {

18
channels/chan_iax2.c
Unescape View File

@ -573,8 +573,8 @@ static struct ast_firmware_list {
/* Extension exists */ /* Extension exists */
#define CACHE_FLAG_EXISTS (1 << 0) #define CACHE_FLAG_EXISTS (1 << 0)
/* Extension is non-existant */ /* Extension is nonexistent */
#define CACHE_FLAG_NONEXISTANT (1 << 1) #define CACHE_FLAG_NONEXISTENT (1 << 1)
/* Extension can exist */ /* Extension can exist */
#define CACHE_FLAG_CANEXIST (1 << 2) #define CACHE_FLAG_CANEXIST (1 << 2)
/* Waiting to hear back response */ /* Waiting to hear back response */
@ -1954,8 +1954,8 @@ static int iax2_show_cache(int fd, int argc, char *argv[])
tmp[0] = '\0'; tmp[0] = '\0';
if (dp->flags & CACHE_FLAG_EXISTS) if (dp->flags & CACHE_FLAG_EXISTS)
strncat(tmp, "EXISTS|", sizeof(tmp) - strlen(tmp) - 1); strncat(tmp, "EXISTS|", sizeof(tmp) - strlen(tmp) - 1);
if (dp->flags & CACHE_FLAG_NONEXISTANT) if (dp->flags & CACHE_FLAG_NONEXISTENT)
strncat(tmp, "NONEXISTANT|", sizeof(tmp) - strlen(tmp) - 1); strncat(tmp, "NONEXISTENT|", sizeof(tmp) - strlen(tmp) - 1);
if (dp->flags & CACHE_FLAG_CANEXIST) if (dp->flags & CACHE_FLAG_CANEXIST)
strncat(tmp, "CANEXIST|", sizeof(tmp) - strlen(tmp) - 1); strncat(tmp, "CANEXIST|", sizeof(tmp) - strlen(tmp) - 1);
if (dp->flags & CACHE_FLAG_PENDING) 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; status = CACHE_FLAG_EXISTS;
else if (ies->dpstatus & IAX_DPSTATUS_CANEXIST) else if (ies->dpstatus & IAX_DPSTATUS_CANEXIST)
status = CACHE_FLAG_CANEXIST; status = CACHE_FLAG_CANEXIST;
else if (ies->dpstatus & IAX_DPSTATUS_NONEXISTANT) else if (ies->dpstatus & IAX_DPSTATUS_NONEXISTENT)
status = CACHE_FLAG_NONEXISTANT; status = CACHE_FLAG_NONEXISTENT;
if (ies->dpstatus & IAX_DPSTATUS_IGNOREPAT) { if (ies->dpstatus & IAX_DPSTATUS_IGNOREPAT) {
/* Don't really do anything with this */ /* 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)) { } else if (ast_canmatch_extension(NULL, context, callednum, 1, callerid)) {
dpstatus = IAX_DPSTATUS_CANEXIST; dpstatus = IAX_DPSTATUS_CANEXIST;
} else { } else {
dpstatus = IAX_DPSTATUS_NONEXISTANT; dpstatus = IAX_DPSTATUS_NONEXISTENT;
} }
if (ast_ignore_pattern(context, callednum)) if (ast_ignore_pattern(context, callednum))
dpstatus |= IAX_DPSTATUS_IGNOREPAT; 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]); ast_mutex_lock(&iaxsl[fr.callno]);
if (!fr.callno || !iaxs[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 */ frame, reply with an inval */
if (ntohs(mh->callno) & IAX_FLAG_FULL) { if (ntohs(mh->callno) & IAX_FLAG_FULL) {
/* We can only raw hangup control frames */ /* 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); ast_verbose(VERBOSE_PREFIX_3 "Executing Dial('%s')\n", req);
} else { } else {
ast_mutex_unlock(&dpcache_lock); 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; return -1;
} }
} }

2
channels/chan_skinny.c
Unescape View File

@ -2598,7 +2598,7 @@ static void destroy_session(struct skinnysession *s)
ast_mutex_destroy(&s->lock); ast_mutex_destroy(&s->lock);
free(s); free(s);
} else } 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); ast_mutex_unlock(&sessionlock);
} }

2
channels/chan_zap.c
Unescape View File

@ -6287,7 +6287,7 @@ static int pri_resolve_span(int *span, int channel, int offset, struct zt_spanin
return 0; 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; *span = -1;
} else { } else {
if (pris[*span].trunkgroup) { if (pris[*span].trunkgroup) {

2
channels/iax2.h
Unescape View File

@ -150,7 +150,7 @@
#define IAX_DPSTATUS_EXISTS (1 << 0) #define IAX_DPSTATUS_EXISTS (1 << 0)
#define IAX_DPSTATUS_CANEXIST (1 << 1) #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_IGNOREPAT (1 << 14)
#define IAX_DPSTATUS_MATCHMORE (1 << 15) #define IAX_DPSTATUS_MATCHMORE (1 << 15)

2
include/asterisk/dundi.h
Unescape View File

@ -46,7 +46,7 @@ struct dundi_ie_hdr {
#define DUNDI_PROTO_SIP 2 /* Session Initiation Protocol */ #define DUNDI_PROTO_SIP 2 /* Session Initiation Protocol */
#define DUNDI_PROTO_H323 3 /* ITU H.323 */ #define DUNDI_PROTO_H323 3 /* ITU H.323 */
#define DUNDI_FLAG_NONEXISTANT (0) /* Isn't and can't be a valid number */ #define DUNDI_FLAG_NONEXISTENT (0) /* Isn't and can't be a valid number */
#define DUNDI_FLAG_EXISTS (1 << 0) /* Is a valid number */ #define DUNDI_FLAG_EXISTS (1 << 0) /* Is a valid number */
#define DUNDI_FLAG_MATCHMORE (1 << 1) /* Might be valid if you add more digits */ #define DUNDI_FLAG_MATCHMORE (1 << 1) /* Might be valid if you add more digits */
#define DUNDI_FLAG_CANMATCH (1 << 2) /* Might be a match */ #define DUNDI_FLAG_CANMATCH (1 << 2) /* Might be a match */

4
manager.c
Unescape View File

@ -258,7 +258,7 @@ static void destroy_session(struct mansession *s)
ast_mutex_destroy(&s->lock); ast_mutex_destroy(&s->lock);
free(s); free(s);
} else } 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); ast_mutex_unlock(&sessionlock);
} }
@ -479,7 +479,7 @@ static int authenticate(struct mansession *s, struct message *m)
set_eventmask(s, events); set_eventmask(s, events);
return 0; return 0;
} }
ast_log(LOG_NOTICE, "%s tried to authenticate with non-existant user '%s'\n", ast_inet_ntoa(iabuf, sizeof(iabuf), s->sin.sin_addr), user); ast_log(LOG_NOTICE, "%s tried to authenticate with nonexistent user '%s'\n", ast_inet_ntoa(iabuf, sizeof(iabuf), s->sin.sin_addr), user);
ast_config_destroy(cfg); ast_config_destroy(cfg);
return -1; return -1;
} }

2
pbx.c
Unescape View File

@ -6108,7 +6108,7 @@ int ast_context_verify_includes(struct ast_context *con)
for (inc = ast_walk_context_includes(con, NULL); inc; inc = ast_walk_context_includes(con, inc)) for (inc = ast_walk_context_includes(con, NULL); inc; inc = ast_walk_context_includes(con, inc))
if (!ast_context_find(inc->rname)) { if (!ast_context_find(inc->rname)) {
res = -1; res = -1;
ast_log(LOG_WARNING, "Context '%s' tries includes non-existant context '%s'\n", ast_log(LOG_WARNING, "Context '%s' tries includes nonexistent context '%s'\n",
ast_get_context_name(con), inc->rname); ast_get_context_name(con), inc->rname);
} }
return res; return res;

2
res/res_features.c
Unescape View File

@ -1385,7 +1385,7 @@ static int park_exec(struct ast_channel *chan, void *data)
dres = 0; dres = 0;
} }
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Channel %s tried to talk to non-existant parked call %d\n", chan->name, park); ast_verbose(VERBOSE_PREFIX_3 "Channel %s tried to talk to nonexistent parked call %d\n", chan->name, park);
res = -1; res = -1;
} }
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);

2
sched.c
Unescape View File

@ -287,7 +287,7 @@ int ast_sched_del(struct sched_context *con, int id)
} }
ast_mutex_unlock(&con->lock); ast_mutex_unlock(&con->lock);
if (!s) { if (!s) {
ast_log(LOG_NOTICE, "Attempted to delete non-existant schedule entry %d!\n", id); ast_log(LOG_NOTICE, "Attempted to delete nonexistent schedule entry %d!\n", id);
#ifdef DO_CRASH #ifdef DO_CRASH
CRASH; CRASH;
#endif #endif

Write Preview
Loading…
Cancel
Save