Skip to content

Commit bcc18ca

Browse files
InterLinked1gtjoseph
authored andcommitted
general: Fix various typos.
ASTERISK-30089 #close Change-Id: I1f5db911fd05a3a211c522c13e990fa1d0e62275
1 parent 4cbe12d commit bcc18ca

File tree

16 files changed

+30
-30
lines changed

16 files changed

+30
-30
lines changed

apps/app_confbridge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1738,7 +1738,7 @@ static struct confbridge_conference *join_conference_bridge(const char *conferen
17381738
struct post_join_action *action;
17391739
int max_members_reached = 0;
17401740

1741-
/* We explicitly lock the conference bridges container ourselves so that other callers can not create duplicate conferences at the same */
1741+
/* We explicitly lock the conference bridges container ourselves so that other callers can not create duplicate conferences at the same time */
17421742
ao2_lock(conference_bridges);
17431743

17441744
ast_debug(1, "Trying to find conference bridge '%s'\n", conference_name);

apps/app_dial.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@
372372
</argument>
373373
<para>Enables <emphasis>operator services</emphasis> mode. This option only
374374
works when bridging a DAHDI channel to another DAHDI channel
375-
only. if specified on non-DAHDI interfaces, it will be ignored.
375+
only. If specified on non-DAHDI interfaces, it will be ignored.
376376
When the destination answers (presumably an operator services
377377
station), the originator no longer has control of their line.
378378
They may hang up, but the switch will not release their line
@@ -1325,7 +1325,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
13251325
if (is_cc_recall) {
13261326
ast_cc_failed(cc_recall_core_id, "Everyone is busy/congested for the recall. How sad");
13271327
}
1328-
SCOPE_EXIT_RTN_VALUE(NULL, "%s: No outging channels available\n", ast_channel_name(in));
1328+
SCOPE_EXIT_RTN_VALUE(NULL, "%s: No outgoing channels available\n", ast_channel_name(in));
13291329
}
13301330
winner = ast_waitfor_n(watchers, pos, to);
13311331
AST_LIST_TRAVERSE(out_chans, o, node) {

apps/app_playback.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
</syntax>
7474
<description>
7575
<para>Plays back given filenames (do not put extension of wav/alaw etc).
76-
The playback command answer the channel if no options are specified.
77-
If the file is non-existant it will fail</para>
76+
The Playback application answers the channel if no options are specified.
77+
If the file is non-existent it will fail.</para>
7878
<para>This application sets the following channel variable upon completion:</para>
7979
<variablelist>
8080
<variable name="PLAYBACKSTATUS">

channels/chan_dahdi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@
238238
<para>DAHDI allows several modifiers to be specified as part of the resource.</para>
239239
<para>The general syntax is :</para>
240240
<para><literal>Dial(DAHDI/pseudo[/extension])</literal></para>
241-
<para><literal>Dial(DAHDI/&lt;channel#&gt;[c|r&lt;cadance#&gt;|d][/extension])</literal></para>
242-
<para><literal>Dial(DAHDI/(g|G|r|R)&lt;group#(0-63)&gt;[c|r&lt;cadance#&gt;|d][/extension])</literal></para>
241+
<para><literal>Dial(DAHDI/&lt;channel#&gt;[c|r&lt;cadence#&gt;|d][/extension])</literal></para>
242+
<para><literal>Dial(DAHDI/(g|G|r|R)&lt;group#(0-63)&gt;[c|r&lt;cadence#&gt;|d][/extension])</literal></para>
243243
<para>The following modifiers may be used before the channel number:</para>
244244
<enumlist>
245245
<enum name="g">

channels/iax2/include/iax2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ enum iax_frame_subclass {
7575
IAX_COMMAND_VNAK = 18,
7676
/*! Request status of a dialplan entry */
7777
IAX_COMMAND_DPREQ = 19,
78-
/*! Request status of a dialplan entry */
78+
/*! Status reply of a dialplan entry status request */
7979
IAX_COMMAND_DPREP = 20,
8080
/*! Request a dial on channel brought up TBD */
8181
IAX_COMMAND_DIAL = 21,

channels/sig_analog.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2235,12 +2235,12 @@ static void *__analog_ss_thread(void *data)
22352235
} else if (!strcmp(exten, pickupexten)) {
22362236
/* Scan all channels and see if there are any
22372237
* ringing channels that have call groups
2238-
* that equal this channels pickup group
2238+
* that equal this channel's pickup group
22392239
*/
22402240
if (idx == ANALOG_SUB_REAL) {
22412241
/* Switch us from Third call to Call Wait */
22422242
if (p->subs[ANALOG_SUB_THREEWAY].owner) {
2243-
/* If you make a threeway call and the *8# a call, it should actually
2243+
/* If you make a threeway call and then *8# a call, it should actually
22442244
look like a callwait */
22452245
analog_alloc_sub(p, ANALOG_SUB_CALLWAIT);
22462246
analog_swap_subs(p, ANALOG_SUB_CALLWAIT, ANALOG_SUB_THREEWAY);
@@ -2808,7 +2808,7 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
28082808

28092809
switch (res) {
28102810
case ANALOG_EVENT_EC_DISABLED:
2811-
ast_verb(3, "Channel %d echo canceler disabled due to CED detection\n", p->channel);
2811+
ast_verb(3, "Channel %d echo canceller disabled due to CED detection\n", p->channel);
28122812
analog_set_echocanceller(p, 0);
28132813
break;
28142814
#ifdef HAVE_DAHDI_ECHOCANCEL_FAX_MODE
@@ -2819,10 +2819,10 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
28192819
ast_verb(3, "Channel %d detected a CED tone from the network.\n", p->channel);
28202820
break;
28212821
case ANALOG_EVENT_EC_NLP_DISABLED:
2822-
ast_verb(3, "Channel %d echo canceler disabled its NLP.\n", p->channel);
2822+
ast_verb(3, "Channel %d echo canceller disabled its NLP.\n", p->channel);
28232823
break;
28242824
case ANALOG_EVENT_EC_NLP_ENABLED:
2825-
ast_verb(3, "Channel %d echo canceler enabled its NLP.\n", p->channel);
2825+
ast_verb(3, "Channel %d echo canceller enabled its NLP.\n", p->channel);
28262826
break;
28272827
#endif
28282828
case ANALOG_EVENT_PULSE_START:
@@ -2907,14 +2907,14 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
29072907
analog_lock_sub_owner(p, ANALOG_SUB_CALLWAIT);
29082908
if (!p->subs[ANALOG_SUB_CALLWAIT].owner) {
29092909
/*
2910-
* The call waiting call dissappeared.
2910+
* The call waiting call disappeared.
29112911
* This is now a normal hangup.
29122912
*/
29132913
analog_set_echocanceller(p, 0);
29142914
return NULL;
29152915
}
29162916

2917-
/* There's a call waiting call, so ring the phone, but make it unowned in the mean time */
2917+
/* There's a call waiting call, so ring the phone, but make it unowned in the meantime */
29182918
analog_swap_subs(p, ANALOG_SUB_CALLWAIT, ANALOG_SUB_REAL);
29192919
ast_verb(3, "Channel %d still has (callwait) call, ringing phone\n", p->channel);
29202920
analog_unalloc_sub(p, ANALOG_SUB_CALLWAIT);

channels/sig_analog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ struct analog_pvt {
266266
enum analog_sigtype sig;
267267
/* To contain the private structure passed into the channel callbacks */
268268
void *chan_pvt;
269-
/* All members after this are giong to be transient, and most will probably change */
269+
/* All members after this are going to be transient, and most will probably change */
270270
struct ast_channel *owner; /*!< Our current active owner (if applicable) */
271271

272272
struct analog_subchannel subs[3]; /*!< Sub-channels */

configs/samples/iax.conf.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ autokill=yes
386386
; IAX2 clients which request it. This has only been used for the IAXy,
387387
; and it has been recently proven that this firmware distribution method
388388
; can be used as a source of traffic amplification attacks. Also, the
389-
; IAXy firmware has not been updated for at least 18 months, so unless
389+
; IAXy firmware has not been updated since at least 2012, so unless
390390
; you are provisioning IAXys in a secure network, we recommend that you
391391
; leave this option to the default, off.
392392
;

funcs/func_logic.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@
7272
</function>
7373
<function name="IF" language="en_US">
7474
<synopsis>
75-
Check for an expresion.
75+
Check for an expression.
7676
</synopsis>
7777
<syntax argsep="?">
78-
<parameter name="expresion" required="true" />
78+
<parameter name="expression" required="true" />
7979
<parameter name="retvalue" argsep=":" required="true">
8080
<argument name="true" />
8181
<argument name="false" />

include/asterisk/test.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
\code
109109
'test show registered all' will show every registered test.
110110
'test execute all' will execute every registered test.
111-
'test show results all' will show detailed results for ever executed test
111+
'test show results all' will show detailed results for every executed test
112112
'test generate results xml' will generate a test report in xml format
113113
'test generate results txt' will generate a test report in txt format
114114
\endcode

main/asterisk.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ int daemon(int, int); /* defined in libresolv of all places */
297297
#define NUM_MSGS 64
298298

299299
/*! Displayed copyright tag */
300-
#define COPYRIGHT_TAG "Copyright (C) 1999 - 2021, Sangoma Technologies Corporation and others."
300+
#define COPYRIGHT_TAG "Copyright (C) 1999 - 2022, Sangoma Technologies Corporation and others."
301301

302302
/*! \brief Welcome message when starting a CLI interface */
303303
#define WELCOME_MESSAGE \
@@ -3571,7 +3571,7 @@ int main(int argc, char *argv[])
35713571
}
35723572
ast_mainpid = getpid();
35733573

3574-
/* Process command-line options that effect asterisk.conf load. */
3574+
/* Process command-line options that affect asterisk.conf load. */
35753575
while ((c = getopt(argc, argv, getopt_settings)) != -1) {
35763576
switch (c) {
35773577
case 'X':
@@ -4082,7 +4082,7 @@ static void asterisk_daemon(int isroot, const char *runuser, const char *rungrou
40824082

40834083
load_astmm_phase_1();
40844084

4085-
/* Check whether high prio was succesfully set by us or some
4085+
/* Check whether high prio was successfully set by us or some
40864086
* other incantation. */
40874087
if (has_priority()) {
40884088
ast_set_flag(&ast_options, AST_OPT_FLAG_HIGH_PRIORITY);

main/bridge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2525,7 +2525,7 @@ int ast_bridge_add_channel(struct ast_bridge *bridge, struct ast_channel *chan,
25252525
if (ast_bridge_impart(bridge, yanked_chan, NULL, features,
25262526
AST_BRIDGE_IMPART_CHAN_INDEPENDENT)) {
25272527
/* It is possible for us to yank a channel and have some other
2528-
* thread start a PBX on the channl after we yanked it. In particular,
2528+
* thread start a PBX on the channel after we yanked it. In particular,
25292529
* this can theoretically happen on the ;2 of a Local channel if we
25302530
* yank it prior to the ;1 being answered. Make sure that it isn't
25312531
* executing a PBX before hanging it up.

main/channel.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6106,7 +6106,7 @@ struct ast_channel *__ast_request_and_dial(const char *type, struct ast_format_c
61066106
}
61076107

61086108
/*
6109-
* I seems strange to set the CallerID on an outgoing call leg
6109+
* It seems strange to set the CallerID on an outgoing call leg
61106110
* to whom we are calling, but this function's callers are doing
61116111
* various Originate methods. This call leg goes to the local
61126112
* user. Once the local user answers, the dialplan needs to be

main/db.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ int ast_db_deltree(const char *family, const char *keytree)
507507

508508
ast_mutex_lock(&dblock);
509509
if (!ast_strlen_zero(prefix) && (sqlite3_bind_text(stmt, 1, prefix, -1, SQLITE_STATIC) != SQLITE_OK)) {
510-
ast_log(LOG_WARNING, "Could bind %s to stmt: %s\n", prefix, sqlite3_errmsg(astdb));
510+
ast_log(LOG_WARNING, "Couldn't bind %s to stmt: %s\n", prefix, sqlite3_errmsg(astdb));
511511
res = -1;
512512
} else if (sqlite3_step(stmt) != SQLITE_DONE) {
513513
ast_log(LOG_WARNING, "Couldn't execute stmt: %s\n", sqlite3_errmsg(astdb));
@@ -791,7 +791,7 @@ static char *handle_cli_database_show(struct ast_cli_entry *e, int cmd, struct a
791791

792792
ast_mutex_lock(&dblock);
793793
if (!ast_strlen_zero(prefix) && (sqlite3_bind_text(stmt, 1, prefix, -1, SQLITE_STATIC) != SQLITE_OK)) {
794-
ast_log(LOG_WARNING, "Could bind %s to stmt: %s\n", prefix, sqlite3_errmsg(astdb));
794+
ast_log(LOG_WARNING, "Couldn't bind %s to stmt: %s\n", prefix, sqlite3_errmsg(astdb));
795795
sqlite3_reset(stmt);
796796
ast_mutex_unlock(&dblock);
797797
return NULL;
@@ -839,7 +839,7 @@ static char *handle_cli_database_showkey(struct ast_cli_entry *e, int cmd, struc
839839

840840
ast_mutex_lock(&dblock);
841841
if (!ast_strlen_zero(a->argv[2]) && (sqlite3_bind_text(showkey_stmt, 1, a->argv[2], -1, SQLITE_STATIC) != SQLITE_OK)) {
842-
ast_log(LOG_WARNING, "Could bind %s to stmt: %s\n", a->argv[2], sqlite3_errmsg(astdb));
842+
ast_log(LOG_WARNING, "Couldn't bind %s to stmt: %s\n", a->argv[2], sqlite3_errmsg(astdb));
843843
sqlite3_reset(showkey_stmt);
844844
ast_mutex_unlock(&dblock);
845845
return NULL;

res/res_mutestream.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
* \note This module only handles audio streams today, but can easily be appended to also
2828
* zero out text streams if there's an application for it.
29-
* When we know and understands what happens if we zero out video, we can do that too.
29+
* When we know and understand what happens if we zero out video, we can do that too.
3030
*/
3131

3232
/*** MODULEINFO

res/res_tonedetect.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@ static int scan_exec(struct ast_channel *chan, const char *data)
902902
}
903903
ast_dsp_set_features(dsp, features);
904904
/* all modems begin negotiating with Bell 103. An answering modem just sends mark tone, or 2225 Hz */
905-
ast_dsp_set_freqmode(dsp, 2225, 400, 16, 0); /* this needs to be pretty short, or the progress tones code will thing this is voice */
905+
ast_dsp_set_freqmode(dsp, 2225, 400, 16, 0); /* this needs to be pretty short, or the progress tones code will think this is voice */
906906

907907
if (fax) { /* fax detect uses same tone detect internals as modem and causes things to not work as intended, so use a separate DSP if needed. */
908908
ast_dsp_set_features(dsp2, DSP_FEATURE_FAX_DETECT); /* fax tone */

0 commit comments

Comments
 (0)