diff options
-rw-r--r-- | addons/chan_mobile.c | 2 | ||||
-rw-r--r-- | apps/app_rpt.c | 22 | ||||
-rw-r--r-- | apps/app_voicemail.c | 2 | ||||
-rw-r--r-- | apps/app_while.c | 2 | ||||
-rw-r--r-- | channels/chan_dahdi.c | 20 | ||||
-rw-r--r-- | channels/chan_h323.c | 2 | ||||
-rw-r--r-- | channels/chan_iax2.c | 4 | ||||
-rw-r--r-- | channels/chan_mgcp.c | 4 | ||||
-rw-r--r-- | channels/chan_misdn.c | 6 | ||||
-rw-r--r-- | channels/chan_sip.c | 12 | ||||
-rw-r--r-- | main/fixedjitterbuf.c | 2 | ||||
-rw-r--r-- | main/say.c | 4 | ||||
-rw-r--r-- | main/utils.c | 2 | ||||
-rw-r--r-- | main/xmldoc.c | 2 | ||||
-rw-r--r-- | res/res_agi.c | 2 |
15 files changed, 44 insertions, 44 deletions
diff --git a/addons/chan_mobile.c b/addons/chan_mobile.c index ca3e62293..43973f460 100644 --- a/addons/chan_mobile.c +++ b/addons/chan_mobile.c @@ -1242,7 +1242,7 @@ static int mbl_devicestate(void *data) If the end result > 100, and it usually is if we have the problem, set a flag and compensate by shifting the bytes for each subsequent frame during the call. - If the result is <= 100 then clear the flag so we dont come back in here... + If the result is <= 100 then clear the flag so we don't come back in here... This seems to work OK.... diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 1b95eed02..a6be0e19f 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -1534,7 +1534,7 @@ struct rpt_link *l; l = l->next; continue; } - /* dont send to self */ + /* don't send to self */ if (mylink && (l == mylink)) { l = l->next; @@ -1895,7 +1895,7 @@ int i,spos; { /* if is not a real link, ignore it */ if (l->name[0] == '0') continue; - /* dont count our stuff */ + /* don't count our stuff */ if (l == mylink) continue; if (mylink && (!strcmp(l->name,mylink->name))) continue; /* figure out mode to report */ @@ -4375,7 +4375,7 @@ struct dahdi_params par; wait_interval(myrpt, DLY_TELEM, mychannel); l = myrpt->links.next; haslink = 0; - /* dont report if a link for this one still on system */ + /* don't report if a link for this one still on system */ if (l != &myrpt->links) { rpt_mutex_lock(&myrpt->lock); @@ -5223,7 +5223,7 @@ char *v1, *v2; { case UNKEY: /* if any of the following are defined, go ahead and do it, - otherwise, dont bother */ + otherwise, don't bother */ v1 = (char *) ast_variable_retrieve(myrpt->cfg, myrpt->name, "unlinkedct"); v2 = (char *) ast_variable_retrieve(myrpt->cfg, myrpt->name, @@ -6741,7 +6741,7 @@ struct ast_frame wf; l = l->next; continue; } - /* dont send back from where it came */ + /* don't send back from where it came */ if ((l == mylink) || (!strcmp(l->name,mylink->name))) { l = l->next; @@ -6772,7 +6772,7 @@ struct ast_frame wf; l = l->next; continue; } - /* dont send back from where it came */ + /* don't send back from where it came */ if ((l == mylink) || (!strcmp(l->name,mylink->name))) { l = l->next; @@ -6870,7 +6870,7 @@ struct ast_frame wf; l = l->next; continue; } - /* dont send back from where it came */ + /* don't send back from where it came */ if ((l == mylink) || (!strcmp(l->name,mylink->name))) { l = l->next; @@ -6897,7 +6897,7 @@ struct ast_frame wf; l = l->next; continue; } - /* dont send back from where it came */ + /* don't send back from where it came */ if ((l == mylink) || (!strcmp(l->name,mylink->name))) { l = l->next; @@ -10147,7 +10147,7 @@ int ret,res = 0,src; /* if decode not active */ if (myrpt->dtmfidx == -1) { - /* if not lead-in digit, dont worry */ + /* if not lead-in digit, don't worry */ if (c != myrpt->p.funcchar) { if (!myrpt->p.propagate_dtmf) @@ -12990,7 +12990,7 @@ char *this,*val; { load_rpt_vars(i,1); - /* if is a remote, dont start one for it */ + /* if is a remote, don't start one for it */ if (rpt_vars[i].remote) { if(retreive_memory(&rpt_vars[i],"init")){ /* Try to retreive initial memory channel */ @@ -14337,7 +14337,7 @@ static int rpt_exec(struct ast_channel *chan, const char *data) if (handle_remote_dtmf_digit(myrpt,c,&keyed,0) == -1) break; continue; } else rpt_mutex_unlock(&myrpt->lock); - if (who == chan) /* if it was a read from incomming */ + if (who == chan) /* if it was a read from incoming */ { f = ast_read(chan); if (!f) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 1fc20bf91..ae6cba171 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -4650,7 +4650,7 @@ static int add_email_attachment(FILE *p, struct ast_vm_user *vmu, char *format, attach = newtmp; ast_debug(3, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", attach, format, vmu->volgain, mailbox); } else { - ast_log(LOG_WARNING, "Sox failed to reencode %s.%s: %s (have you installed support for all sox file formats?)\n", attach, format, + ast_log(LOG_WARNING, "Sox failed to re-encode %s.%s: %s (have you installed support for all sox file formats?)\n", attach, format, soxstatus == 1 ? "Problem with command line options" : "An error occurred during file processing"); ast_log(LOG_WARNING, "Voicemail attachment will have no volume gain.\n"); } diff --git a/apps/app_while.c b/apps/app_while.c index f8144fc07..e9a503aad 100644 --- a/apps/app_while.c +++ b/apps/app_while.c @@ -204,7 +204,7 @@ static int _while_exec(struct ast_channel *chan, const char *data, int end) } #if 0 - /* dont want run away loops if the chan isn't even up + /* don't want run away loops if the chan isn't even up this is up for debate since it slows things down a tad ...... Debate is over... this prevents While/EndWhile from working diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 57f45d032..534d9a82a 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -1676,7 +1676,7 @@ static int my_distinctive_ring(struct ast_channel *chan, void *pvt, int idx, int /* We must have a ring by now, so, if configured, lets try to listen for * distinctive ringing */ if ((checkaftercid && distinctiveringaftercid) || !checkaftercid) { - /* Clear the current ring data array so we dont have old data in it. */ + /* Clear the current ring data array so we don't have old data in it. */ for (receivedRingT = 0; receivedRingT < ARRAY_LEN(ringdata); receivedRingT++) ringdata[receivedRingT] = 0; receivedRingT = 0; @@ -6408,7 +6408,7 @@ static int dahdi_setoption(struct ast_channel *chan, int option, void *data, int p->mate = 1; break; } - if (!p->tdd) { /* if we dont have one yet */ + if (!p->tdd) { /* if we don't have one yet */ p->tdd = tdd_new(); /* allocate one */ } break; @@ -6467,10 +6467,10 @@ static int dahdi_setoption(struct ast_channel *chan, int option, void *data, int case AST_OPTION_ECHOCAN: cp = (char *) data; if (*cp) { - ast_debug(1, "Enabling echo cancelation on %s\n", chan->name); + ast_debug(1, "Enabling echo cancellation on %s\n", chan->name); dahdi_enable_ec(p); } else { - ast_debug(1, "Disabling echo cancelation on %s\n", chan->name); + ast_debug(1, "Disabling echo cancellation on %s\n", chan->name); dahdi_disable_ec(p); } break; @@ -8364,7 +8364,7 @@ static struct ast_frame *dahdi_read(struct ast_channel *ast) /* Hang up if we don't really exist */ if (idx < 0) { - ast_log(LOG_WARNING, "We dont exist?\n"); + ast_log(LOG_WARNING, "We don't exist?\n"); ast_mutex_unlock(&p->lock); return NULL; } @@ -9962,7 +9962,7 @@ static void *analog_ss_thread(void *data) if (p->usedistinctiveringdetection) { len = 0; distMatches = 0; - /* Clear the current ring data array so we dont have old data in it. */ + /* Clear the current ring data array so we don't have old data in it. */ for (receivedRingT = 0; receivedRingT < ARRAY_LEN(curRingData); receivedRingT++) curRingData[receivedRingT] = 0; receivedRingT = 0; @@ -10112,7 +10112,7 @@ static void *analog_ss_thread(void *data) samples = 0; len = 0; distMatches = 0; - /* Clear the current ring data array so we dont have old data in it. */ + /* Clear the current ring data array so we don't have old data in it. */ for (receivedRingT = 0; receivedRingT < ARRAY_LEN(curRingData); receivedRingT++) curRingData[receivedRingT] = 0; receivedRingT = 0; @@ -10198,7 +10198,7 @@ static void *analog_ss_thread(void *data) ast_debug(1, "CallerID number: %s, name: %s, flags=%d\n", number, name, flags); } if (distinctiveringaftercid == 1) { - /* Clear the current ring data array so we dont have old data in it. */ + /* Clear the current ring data array so we don't have old data in it. */ for (receivedRingT = 0; receivedRingT < 3; receivedRingT++) { curRingData[receivedRingT] = 0; } @@ -12022,7 +12022,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, p.debouncetime = conf->timing.debouncetime; } - /* dont set parms on a pseudo-channel */ + /* don't set parms on a pseudo-channel */ if (tmp->subs[SUB_REAL].dfd >= 0) { res = ioctl(tmp->subs[SUB_REAL].dfd, DAHDI_SET_PARAMS, &p); @@ -17502,7 +17502,7 @@ static int dahdi_sendtext(struct ast_channel *c, const char *text) ast_log(LOG_WARNING, "Huh? I don't exist?\n"); return -1; } - if (!text[0]) return(0); /* if nothing to send, dont */ + if (!text[0]) return(0); /* if nothing to send, don't */ if ((!p->tdd) && (!p->mate)) return(0); /* if not in TDD mode, just return */ if (p->mate) buf = ast_malloc(((strlen(text) + 1) * ASCII_BYTES_PER_CHAR) + END_SILENCE_LEN + HEADER_LEN); diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 51d3cb1d2..3d07bceb4 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -137,7 +137,7 @@ static char gatekeeper[100]; static int gatekeeper_disable = 1; static int gatekeeper_discover = 0; static int gkroute = 0; -/* Find user by alias (h.323 id) is default, alternative is the incomming call's source IP address*/ +/* Find user by alias (h.323 id) is default, alternative is the incoming call's source IP address*/ static int userbyalias = 1; static int acceptAnonymous = 1; static unsigned int tos = 0; diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index b416779d4..d69194df4 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -5808,7 +5808,7 @@ static unsigned int calc_timestamp(struct chan_iax2_pvt *p, unsigned int ts, str ast_debug(1, "predicted timestamp skew (%u) > max (%u), using real ts instead.\n", abs(ms - p->nextpred), MAX_TIMESTAMP_SKEW); - if (f->samples >= rate) /* check to make sure we dont core dump */ + if (f->samples >= rate) /* check to make sure we don't core dump */ { int diff = ms % (f->samples / rate); if (diff) @@ -7699,7 +7699,7 @@ static int authenticate_verify(struct chan_iax2_pvt *p, struct iax_ies *ies) user = user_unref(user); } if (ast_test_flag64(p, IAX_FORCE_ENCRYPT) && !p->encmethods) { - ast_log(LOG_NOTICE, "Call Terminated, Incomming call is unencrypted while force encrypt is enabled."); + ast_log(LOG_NOTICE, "Call Terminated, Incoming call is unencrypted while force encrypt is enabled."); return res; } if (!ast_test_flag(&p->state, IAX_STATE_AUTHENTICATED)) diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index c153158d5..420bc51a8 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -2524,7 +2524,7 @@ static int transmit_modify_request(struct mgcp_subchannel *sub) snprintf(tmp, sizeof(tmp), ", dq-gi:%x", sub->gate->gateid); strncat(local, tmp, sizeof(local) - strlen(local) - 1); } else { - /* we still dont have gateid wait */ + /* we still don't have gateid wait */ return 0; } } @@ -3337,7 +3337,7 @@ static int handle_request(struct mgcp_subchannel *sub, struct mgcp_request *req, mgcp_queue_hangup(sub); } transmit_response(sub, "200", req, "OK"); - /* We dont send NTFY or AUEP to wildcard ep */ + /* We don't send NTFY or AUEP to wildcard ep */ if (strcmp(p->name, p->parent->wcardep) != 0) { transmit_notify_request(sub, ""); /* Audit endpoint. diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 082373d97..cddfd65cc 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -2363,7 +2363,7 @@ static void misdn_PartyNumber_fill(struct FacPartyNumber *party, const struct mi party->TypeOfNumber = misdn_to_PartyNumber_ton_private(id->number_type); break; default: - party->TypeOfNumber = 0;/* Dont't care */ + party->TypeOfNumber = 0;/* Don't care */ break; } } @@ -10903,9 +10903,9 @@ static int load_module(void) " a - Have Asterisk detect DTMF tones on called channel\n" " c - Make crypted outgoing call, optarg is keyindex\n" " d - Send display text to called phone, text is the optarg\n" - " e - Perform echo cancelation on this channel,\n" + " e - Perform echo cancellation on this channel,\n" " takes taps as optarg (32,64,128,256)\n" - " e! - Disable echo cancelation on this channel\n" + " e! - Disable echo cancellation on this channel\n" " f - Enable fax detection\n" " h - Make digital outgoing call\n" " h1 - Make HDLC mode digital outgoing call\n" diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 549c9d7c9..3f923858a 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7125,7 +7125,7 @@ static struct sip_pvt *find_call(struct sip_request *req, struct sockaddr_in *si /* We do not respond to responses for dialogs that we don't know about, we just drop the session quickly */ if (intended_method == SIP_RESPONSE) - ast_debug(2, "That's odd... Got a response on a call we dont know about. Callid %s\n", callid ? callid : "<unknown>"); + ast_debug(2, "That's odd... Got a response on a call we don't know about. Callid %s\n", callid ? callid : "<unknown>"); return NULL; } @@ -9709,7 +9709,7 @@ static void add_codec_to_sdp(const struct sip_pvt *p, format_t codec, if (p->rtp) { struct ast_codec_pref *pref = &ast_rtp_instance_get_codecs(p->rtp)->pref; fmt = ast_codec_pref_getsize(pref, codec); - } else /* I dont see how you couldn't have p->rtp, but good to check for and error out if not there like earlier code */ + } else /* I don't see how you couldn't have p->rtp, but good to check for and error out if not there like earlier code */ return; ast_str_append(m_buf, 0, " %d", rtp_code); ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%d\r\n", rtp_code, @@ -12882,7 +12882,7 @@ static enum check_auth_result check_auth(struct sip_pvt *p, struct sip_request * return AUTH_CHALLENGE_SENT; } if (good_response) { - append_history(p, "AuthOK", "Auth challenge succesful for %s", username); + append_history(p, "AuthOK", "Auth challenge successful for %s", username); return AUTH_SUCCESSFUL; } @@ -18689,7 +18689,7 @@ static int handle_response_register(struct sip_pvt *p, int resp, const char *res } r->regstate = REG_STATE_REGISTERED; - r->regtime = ast_tvnow(); /* Reset time of last succesful registration */ + r->regtime = ast_tvnow(); /* Reset time of last successful registration */ manager_event(EVENT_FLAG_SYSTEM, "Registry", "ChannelType: SIP\r\nDomain: %s\r\nStatus: %s\r\n", r->hostname, regstate2str(r->regstate)); r->regattempts = 0; ast_debug(1, "Registration successful\n"); @@ -19187,7 +19187,7 @@ static void handle_response(struct sip_pvt *p, int resp, const char *rest, struc } } } else - ast_log(LOG_NOTICE, "Dont know how to handle a %d %s response from %s\n", resp, rest, p->owner ? p->owner->name : ast_inet_ntoa(p->sa.sin_addr)); + ast_log(LOG_NOTICE, "Don't know how to handle a %d %s response from %s\n", resp, rest, p->owner ? p->owner->name : ast_inet_ntoa(p->sa.sin_addr)); } } else { /* Responses to OUTGOING SIP requests on INCOMING calls @@ -20742,7 +20742,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int } } - /* We have a succesful authentication, process the SDP portion if there is one */ + /* We have a successful authentication, process the SDP portion if there is one */ if (find_sdp(req)) { if (process_sdp(p, req, SDP_T38_INITIATE)) { /* Unacceptable codecs */ diff --git a/main/fixedjitterbuf.c b/main/fixedjitterbuf.c index 8a885b8e6..93c4cd205 100644 --- a/main/fixedjitterbuf.c +++ b/main/fixedjitterbuf.c @@ -105,7 +105,7 @@ struct fixed_jb *fixed_jb_new(struct fixed_jb_conf *conf) /* First copy our config */ memcpy(&jb->conf, conf, sizeof(struct fixed_jb_conf)); - /* we dont need the passed config anymore - continue working with the saved one */ + /* we don't need the passed config anymore - continue working with the saved one */ conf = &jb->conf; /* validate the configuration */ diff --git a/main/say.c b/main/say.c index 072d2aab2..ac2a8593d 100644 --- a/main/say.c +++ b/main/say.c @@ -668,7 +668,7 @@ static int ast_say_number_full_cs(struct ast_channel *chan, int num, const char default : options = "m"; /* others are male */ } } - if ( left > 1 ) { /* we dont say "one thousand" but only thousand */ + if ( left > 1 ) { /* we don't say "one thousand" but only thousand */ res = ast_say_number_full_cs(chan, left, ints, language, options, audiofd, ctrlfd); if (res) return res; @@ -3997,7 +3997,7 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t t, const char * } break; case 'H': - /* 24-Hour, single digit hours preceeded by "oh" (0) */ + /* 24-Hour, single digit hours preceded by "oh" (0) */ if (tm.tm_hour < 10 && tm.tm_hour > 0) { res = wait_file(chan, ints, "digits/0", lang); } diff --git a/main/utils.c b/main/utils.c index bd14f99ad..5961a7339 100644 --- a/main/utils.c +++ b/main/utils.c @@ -283,7 +283,7 @@ int ast_base64decode(unsigned char *dst, const char *src, int max) cnt++; } } - /* Dont worry about left over bits, they're extra anyway */ + /* Don't worry about left over bits, they're extra anyway */ return cnt; } diff --git a/main/xmldoc.c b/main/xmldoc.c index 46be1f0e8..af320db88 100644 --- a/main/xmldoc.c +++ b/main/xmldoc.c @@ -449,7 +449,7 @@ static void xmldoc_string_cleanup(const char *text, struct ast_str **output, int } } - /* remove last spaces (we dont want always to remove the trailing spaces). */ + /* remove last spaces (we don't want always to remove the trailing spaces). */ if (lastspaces) { ast_str_trim_blanks(*output); } diff --git a/res/res_agi.c b/res/res_agi.c index 4f0d17b80..0a4664015 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -371,7 +371,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") to the offset without exceeding the end of the file. <replaceable>silence</replaceable> is the number of seconds of silence allowed before the function returns despite the lack of dtmf digits or reaching <replaceable>timeout</replaceable>. <replaceable>silence</replaceable> - value must be preceeded by <literal>s=</literal> and is also optional.</para> + value must be preceded by <literal>s=</literal> and is also optional.</para> </description> </agi> <agi name="say alpha" language="en_US"> |