mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-06 01:45:11 +00:00
add some newlines and fix some misspellings (bug #4027)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5475 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1299,7 +1299,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
|
||||
if (!found) {
|
||||
/* 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)) {
|
||||
/* 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 3: not empty_no_pin
|
||||
*/
|
||||
|
||||
@@ -317,7 +317,7 @@ static void *qcall_do(void *arg)
|
||||
extstr,context,channel->name);
|
||||
if (strlen(ident)) {
|
||||
strncat(ident,"-ok", sizeof(ident) - strlen(ident) - 1);
|
||||
/* if file existant, play it */
|
||||
/* if file existent, play it */
|
||||
if (!ast_streamfile(channel,ident,0))
|
||||
{
|
||||
ast_waitstream(channel,"");
|
||||
|
||||
@@ -96,7 +96,7 @@ static char *descrip =
|
||||
"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"
|
||||
"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"
|
||||
" 't' -- allow the called user transfer the calling user\n"
|
||||
" 'T' -- to allow the calling user to transfer the call.\n"
|
||||
|
||||
@@ -506,8 +506,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 */
|
||||
@@ -1604,8 +1604,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)
|
||||
@@ -4155,8 +4155,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 */
|
||||
@@ -4864,7 +4864,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;
|
||||
@@ -5182,7 +5182,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 */
|
||||
@@ -7379,7 +7379,7 @@ static int iax2_exec(struct ast_channel *chan, char *context, char *exten, int p
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2281,7 +2281,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);
|
||||
}
|
||||
|
||||
|
||||
@@ -6040,7 +6040,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) {
|
||||
|
||||
@@ -122,7 +122,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)
|
||||
|
||||
|
||||
@@ -248,7 +248,7 @@ static void destroy_session(struct mansession *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);
|
||||
|
||||
}
|
||||
@@ -468,7 +468,7 @@ static int authenticate(struct mansession *s, struct message *m)
|
||||
set_eventmask(s, events);
|
||||
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_destroy(cfg);
|
||||
return -1;
|
||||
}
|
||||
@@ -777,7 +777,7 @@ static int action_redirect(struct mansession *s, struct message *m)
|
||||
}
|
||||
chan = ast_get_channel_by_name_locked(name);
|
||||
if (!chan) {
|
||||
astman_send_error(s, m, "Channel not existant");
|
||||
astman_send_error(s, m, "Channel not existent");
|
||||
return 0;
|
||||
}
|
||||
if (!ast_strlen_zero(name2))
|
||||
|
||||
2
pbx.c
2
pbx.c
@@ -5076,7 +5076,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))
|
||||
if (!ast_context_find(inc->rname)) {
|
||||
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);
|
||||
}
|
||||
return res;
|
||||
|
||||
@@ -795,7 +795,7 @@ static int park_exec(struct ast_channel *chan, void *data)
|
||||
dres = 0;
|
||||
}
|
||||
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;
|
||||
}
|
||||
LOCAL_USER_REMOVE(u);
|
||||
|
||||
2
sched.c
2
sched.c
@@ -287,7 +287,7 @@ int ast_sched_del(struct sched_context *con, int id)
|
||||
}
|
||||
ast_mutex_unlock(&con->lock);
|
||||
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
|
||||
CRASH;
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user