<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7687">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Ivan Poddubny: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix Common Typo's.<br><br>Fix instances of:<br>* Retreive<br>* Recieve<br>* other then<br>* different then<br>* Repeated words ("the the", "an an", "and and", etc).<br>* othterwise, teh<br><br>ASTERISK-24198 #close<br><br>Change-Id: I3809a9c113b92fd9d0d9f9bac98e9c66dc8b2d31<br>---<br>M addons/ooh323c/src/ooLogChan.c<br>M addons/ooh323c/src/ooasn1.h<br>M addons/ooh323c/src/ooh323.h<br>M apps/app_adsiprog.c<br>M apps/app_minivm.c<br>M apps/app_saycounted.c<br>M apps/app_skel.c<br>M apps/app_voicemail.c<br>M channels/chan_dahdi.c<br>M channels/chan_mgcp.c<br>M channels/chan_sip.c<br>M channels/chan_unistim.c<br>M channels/sip/include/reqresp_parser.h<br>M include/asterisk/ast_version.h<br>M include/asterisk/astobj2.h<br>M include/asterisk/bridge_after.h<br>M include/asterisk/bridge_features.h<br>M include/asterisk/callerid.h<br>M include/asterisk/http.h<br>M include/asterisk/parking.h<br>M include/asterisk/pbx.h<br>M include/asterisk/strings.h<br>M main/astmm.c<br>M main/db.c<br>M main/editline/map.c<br>M main/editline/refresh.c<br>M main/jitterbuf.c<br>M main/named_acl.c<br>M main/netsock2.c<br>M main/security_events.c<br>M main/stdtime/localtime.c<br>M main/threadpool.c<br>M menuselect/menuselect_gtk.c<br>M res/ael/pval.c<br>M res/parking/res_parking.h<br>M res/res_config_sqlite3.c<br>M res/res_fax.c<br>M res/res_format_attr_opus.c<br>M res/res_pjsip/pjsip_configuration.c<br>M res/res_pjsip_pubsub.c<br>M res/res_pjsip_session.c<br>M tests/test_aoc.c<br>M tests/test_taskprocessor.c<br>43 files changed, 59 insertions(+), 59 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/addons/ooh323c/src/ooLogChan.c b/addons/ooh323c/src/ooLogChan.c<br>index bafb315..004861c 100644<br>--- a/addons/ooh323c/src/ooLogChan.c<br>+++ b/addons/ooh323c/src/ooLogChan.c<br>@@ -290,7 +290,7 @@<br> prev = temp;<br> temp = temp->next;<br> ooClearLogicalChannel(call, prev->channelNo);/* TODO: efficiency - This causes re-search <br>- of of logical channel in the list. Can be<br>+ of logical channel in the list. Can be<br> easily improved.*/<br> }<br> call->logicalChans = NULL;<br>diff --git a/addons/ooh323c/src/ooasn1.h b/addons/ooh323c/src/ooasn1.h<br>index e7b585e..e75ff6d 100644<br>--- a/addons/ooh323c/src/ooasn1.h<br>+++ b/addons/ooh323c/src/ooasn1.h<br>@@ -719,8 +719,8 @@<br> * associated with an error message. These parameters are maintained on an<br> * internal linked list maintained within the error information structure. The<br> * list memory must be freed when error processing is complete. This function<br>- * is called from within errPrint after teh error has been printed out. It is<br>- * also called in teh freeContext function.<br>+ * is called from within errPrint after the error has been printed out. It is<br>+ * also called in the freeContext function.<br> *<br> * @param pErrInfo A pointer to a structure containing information on the<br> * error to be printed. Typically, the error info<br>@@ -1737,7 +1737,7 @@<br> <br> /**<br> * This function will endcode a small, non-negative whole number as specified<br>- * in Section 10.6 of teh X.691 standard. This is a number that is expected to<br>+ * in Section 10.6 of the X.691 standard. This is a number that is expected to<br> * be small, but whose size is potentially unlimited due to the presence of an<br> * extension marker.<br> *<br>diff --git a/addons/ooh323c/src/ooh323.h b/addons/ooh323c/src/ooh323.h<br>index 6b7edc2..96b54f5 100644<br>--- a/addons/ooh323c/src/ooh323.h<br>+++ b/addons/ooh323c/src/ooh323.h<br>@@ -81,7 +81,7 @@<br> /**<br> * This function is used to process a received Facility message.<br> * @param call Handle to the call for which message has been received.<br>- * @param pQ931Msg Pointer the the received Facility message.<br>+ * @param pQ931Msg Pointer the received Facility message.<br> *<br> * @return OO_OK, on success. OO_FAILED, on failure.<br> */<br>diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c<br>index 640f553..918b5ee 100644<br>--- a/apps/app_adsiprog.c<br>+++ b/apps/app_adsiprog.c<br>@@ -321,7 +321,7 @@<br> else if (!strcasecmp(page, "COMM"))<br> cmd = 0x80;<br> else {<br>- ast_log(LOG_WARNING, "Expecting either 'INFO' or 'COMM' page, got got '%s' at line %d of %s\n", page, lineno, script);<br>+ ast_log(LOG_WARNING, "Expecting either 'INFO' or 'COMM' page, got '%s' at line %d of %s\n", page, lineno, script);<br> return 0;<br> }<br> <br>diff --git a/apps/app_minivm.c b/apps/app_minivm.c<br>index dcf0ee2..c863f63 100644<br>--- a/apps/app_minivm.c<br>+++ b/apps/app_minivm.c<br>@@ -1354,7 +1354,7 @@<br> prep_email_sub_vars(chan, vmu, cidnum, cidname, dur, date, counter);<br> <br> /* Find email address to use */<br>- /* If there's a server e-mail address in the account, use that, othterwise template */<br>+ /* If there's a server e-mail address in the account, use that, otherwise template */<br> fromemail = ast_strlen_zero(vmu->serveremail) ? template->serveremail : vmu->serveremail;<br> <br> /* Find name to user for server e-mail */<br>diff --git a/apps/app_saycounted.c b/apps/app_saycounted.c<br>index 4eddc08..f51fccb 100644<br>--- a/apps/app_saycounted.c<br>+++ b/apps/app_saycounted.c<br>@@ -39,7 +39,7 @@<br> <para>The number of things</para><br> </parameter><br> <parameter name="filename" required="true"><br>- <para>File name stem for the noun that is the the name of the things</para><br>+ <para>File name stem for the noun that is the name of the things</para><br> </parameter><br> </syntax><br> <description><br>diff --git a/apps/app_skel.c b/apps/app_skel.c<br>index 20e6abf..e21bcc5 100644<br>--- a/apps/app_skel.c<br>+++ b/apps/app_skel.c<br>@@ -173,7 +173,7 @@<br> };<br> <br> /*! \brief Object to hold level config information.<br>- * \note This object should hold a reference to an an object that holds state across reloads.<br>+ * \note This object should hold a reference to an object that holds state across reloads.<br> * The other fields are just examples of the kind of data that might be stored in an level.<br> */<br> struct skel_level {<br>@@ -193,7 +193,7 @@<br> * the running game.<br> */<br> struct skel_current_game {<br>- uint32_t total_games; /*! The total number of games for this call to to the app */<br>+ uint32_t total_games; /*! The total number of games for this call to the app */<br> uint32_t games_left; /*! How many games are left to play in this set */<br> uint32_t cheat; /*! Whether or not cheating was enabled for the game */<br> struct skel_level *level_info; /*! The level information for the running game */<br>diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c<br>index 4a0dacc..229c00d 100644<br>--- a/apps/app_voicemail.c<br>+++ b/apps/app_voicemail.c<br>@@ -1298,7 +1298,7 @@<br> }<br> <br> /*!<br>- * \brief Sets a a specific property value.<br>+ * \brief Sets a specific property value.<br> * \param vmu The voicemail user object to work with.<br> * \param var The name of the property to be set.<br> * \param value The value to be set to the property.<br>@@ -4729,7 +4729,7 @@<br> <br> /*! <br> * \brief Removes the voicemail sound and information file.<br>- * \param file The path to the sound file. This will be the the folder and message index, without the extension.<br>+ * \param file The path to the sound file. This will be the folder and message index, without the extension.<br> *<br> * This is used by the DELETE macro when voicemails are stored on the file system.<br> *<br>@@ -8151,7 +8151,7 @@<br> * <br> * When in the leave message mode (is_new_message == 1):<br> * - allow the leaving of a message for ourselves. (Will not allow us to forward a message to ourselves, when is_new_message == 0).<br>- * - attempt to determine the context and and mailbox, and then invoke leave_message() function to record and store the message.<br>+ * - attempt to determine the context and mailbox, and then invoke leave_message() function to record and store the message.<br> *<br> * When in the forward message mode (is_new_message == 0):<br> * - retrieves the current message to be forwarded<br>@@ -8252,7 +8252,7 @@<br> old_exten = ast_strdupa(ast_channel_exten(chan));<br> old_priority = ast_channel_priority(chan);<br> <br>- /* call the the Directory, changes the channel */<br>+ /* call the Directory, changes the channel */<br> snprintf(vmcontext, sizeof(vmcontext), "%s,,v", context ? context : "default");<br> res = pbx_exec(chan, directory_app, vmcontext);<br> <br>diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c<br>index ba7072b..d5e79ff 100644<br>--- a/channels/chan_dahdi.c<br>+++ b/channels/chan_dahdi.c<br>@@ -8077,7 +8077,7 @@<br> p->subs[otherindex].needunhold = 1;<br> p->owner = p->subs[SUB_REAL].owner;<br> } else {<br>- ast_verb(3, "Dumping incomplete call on on %s\n", ast_channel_name(p->subs[SUB_THREEWAY].owner));<br>+ ast_verb(3, "Dumping incomplete call on %s\n", ast_channel_name(p->subs[SUB_THREEWAY].owner));<br> swap_subs(p, SUB_THREEWAY, SUB_REAL);<br> ast_channel_softhangup_internal_flag_add(p->subs[SUB_THREEWAY].owner, AST_SOFTHANGUP_DEV);<br> p->owner = p->subs[SUB_REAL].owner;<br>diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c<br>index f3fe538..e8c2293 100644<br>--- a/channels/chan_mgcp.c<br>+++ b/channels/chan_mgcp.c<br>@@ -392,7 +392,7 @@<br> /* struct ast_channel *owner; */<br> /* struct ast_rtp *rtp; */<br> /* struct sockaddr_in tmpdest; */<br>- /* message go the the endpoint and not the channel so they stay here */<br>+ /* message go the endpoint and not the channel so they stay here */<br> struct ast_variable *chanvars; /*!< Variables to set for channel created by user */<br> struct mgcp_endpoint *next;<br> struct mgcp_gateway *parent;<br>diff --git a/channels/chan_sip.c b/channels/chan_sip.c<br>index e6e82db..3ff8415 100644<br>--- a/channels/chan_sip.c<br>+++ b/channels/chan_sip.c<br>@@ -9239,7 +9239,7 @@<br> }<br> <br> /*! \brief This function creates a dialog to handle a forked request. This dialog<br>- * exists only to properly terminiate the the forked request immediately.<br>+ * exists only to properly terminiate the forked request immediately.<br> */<br> static void forked_invite_init(struct sip_request *req, const char *new_theirtag, struct sip_pvt *original, struct ast_sockaddr *addr)<br> {<br>@@ -15710,7 +15710,7 @@<br> if (r->call && r->call->do_history) {<br> append_history(r->call, "RegistryRenew", "Account: %s@%s", r->username, r->hostname);<br> }<br>- /* Since registry's are only added/removed by the the monitor thread, this<br>+ /* Since registry's are only added/removed by the monitor thread, this<br> may be overkill to reference/dereference at all here */<br> if (sipdebug) {<br> ast_log(LOG_NOTICE, " -- Re-registration for %s@%s\n", r->username, r->hostname);<br>@@ -26098,7 +26098,7 @@<br> <br> if (p->owner) {<br> ast_debug(3, "INVITE w Replaces on existing call? Refusing action. [%s]\n", p->callid);<br>- transmit_response_reliable(p, "400 Bad request", req); /* The best way to not not accept the transfer */<br>+ transmit_response_reliable(p, "400 Bad request", req); /* The best way to not accept the transfer */<br> check_via(p, req);<br> copy_request(&p->initreq, req);<br> /* Do not destroy existing call */<br>@@ -26186,7 +26186,7 @@<br> <br> if (replaces_pvt == p) {<br> ast_log(LOG_NOTICE, "INVITE with replaces into it's own call id (%s == %s)!\n", replace_id, p->callid);<br>- transmit_response_reliable(p, "400 Bad request", req); /* The best way to not not accept the transfer */<br>+ transmit_response_reliable(p, "400 Bad request", req); /* The best way to not accept the transfer */<br> error = 1;<br> }<br> <br>@@ -34086,7 +34086,7 @@<br> }<br> <br> /*!<br>- * Hash function based on the the peer's ip address. For IPv6, we use the end<br>+ * Hash function based on the peer's ip address. For IPv6, we use the end<br> * of the address.<br> * \todo Find a better hashing function<br> */<br>diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c<br>index c3baa8a..574de92 100644<br>--- a/channels/chan_unistim.c<br>+++ b/channels/chan_unistim.c<br>@@ -4965,7 +4965,7 @@<br> continue;<br> }<br> if (d->ssub[i] != sub) {<br>- if (d->ssub[i] != NULL) { /* Found other subchannel active other then hangup'ed one */<br>+ if (d->ssub[i] != NULL) { /* Found other subchannel active other than hangup'ed one */<br> end_call = 0;<br> }<br> continue;<br>diff --git a/channels/sip/include/reqresp_parser.h b/channels/sip/include/reqresp_parser.h<br>index 2543329..eb2eb1e 100644<br>--- a/channels/sip/include/reqresp_parser.h<br>+++ b/channels/sip/include/reqresp_parser.h<br>@@ -59,7 +59,7 @@<br> * parts, user:secret.<br> * - If the URI contains a port number, hostport will return with both<br> * parts, host:port.<br>- * - This function overwrites the the URI string.<br>+ * - This function overwrites the URI string.<br> * <br> * \retval 0 on success<br> * \retval -1 on error.<br>diff --git a/include/asterisk/ast_version.h b/include/asterisk/ast_version.h<br>index 1ceac30..ff9c42f 100644<br>--- a/include/asterisk/ast_version.h<br>+++ b/include/asterisk/ast_version.h<br>@@ -41,7 +41,7 @@<br> */<br> const char *ast_get_version_num(void);<br> <br>-/*! Retreive the Asterisk build options */<br>+/*! Retrieve the Asterisk build options */<br> const char *ast_get_build_opts(void);<br> <br> #endif /* __AST_VERSION_H */<br>diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h<br>index 390e0ea..53f10cc 100644<br>--- a/include/asterisk/astobj2.h<br>+++ b/include/asterisk/astobj2.h<br>@@ -164,7 +164,7 @@<br> enough of an explanation, that you can pair operations that increment the<br> ref count, with operations that are meant to decrement the refcount.<br> <br>-Each of these calls will generate at least one line of output in in the refs<br>+Each of these calls will generate at least one line of output in the refs<br> log files. These lines look like this:<br> ...<br> 0x8756f00,+1,1234,chan_sip.c,22240,load_module,**constructor**,allocate users<br>@@ -977,7 +977,7 @@<br> OBJ_NODATA = (1 << 1),<br> /*!<br> * Don't stop at the first match in ao2_callback() unless the<br>- * result of of the callback function has the CMP_STOP bit set.<br>+ * result of the callback function has the CMP_STOP bit set.<br> */<br> OBJ_MULTIPLE = (1 << 2),<br> /*!<br>diff --git a/include/asterisk/bridge_after.h b/include/asterisk/bridge_after.h<br>index 0451685..d4fcbea 100644<br>--- a/include/asterisk/bridge_after.h<br>+++ b/include/asterisk/bridge_after.h<br>@@ -33,7 +33,7 @@<br> extern "C" {<br> #endif<br> <br>-/*! Reason the the after bridge callback will not be called. */<br>+/*! Reason the after bridge callback will not be called. */<br> enum ast_bridge_after_cb_reason {<br> /*! The datastore is being destroyed. Likely due to hangup. (Enum value must be zero.) */<br> AST_BRIDGE_AFTER_CB_REASON_DESTROY,<br>diff --git a/include/asterisk/bridge_features.h b/include/asterisk/bridge_features.h<br>index df01a0d..38b478e 100644<br>--- a/include/asterisk/bridge_features.h<br>+++ b/include/asterisk/bridge_features.h<br>@@ -719,7 +719,7 @@<br> * \param limits pointer to an ast_bridge_features_limits struct that needs to be destroyed<br> *<br> * This function does not free memory allocated to the ast_bridge_features_limits struct, it only frees elements within the struct.<br>- * You must still call ast_free on the the struct if you allocated it with malloc.<br>+ * You must still call ast_free on the struct if you allocated it with malloc.<br> */<br> void ast_bridge_features_limits_destroy(struct ast_bridge_features_limits *limits);<br> <br>diff --git a/include/asterisk/callerid.h b/include/asterisk/callerid.h<br>index f7d7719..143ffae 100644<br>--- a/include/asterisk/callerid.h<br>+++ b/include/asterisk/callerid.h<br>@@ -240,7 +240,7 @@<br> int ast_isphonenumber(const char *n);<br> <br> /*!<br>- * \brief Check if a string consists only of digits and and + \# ( ) - .<br>+ * \brief Check if a string consists only of digits and + \# ( ) - .<br> * (meaning it can be cleaned with ast_shrink_phone_number)<br> * \param exten The extension (or URI) to be checked.<br> * \retval 1 if string is valid AST shrinkable phone number<br>diff --git a/include/asterisk/http.h b/include/asterisk/http.h<br>index d5f54cc..63fb223 100644<br>--- a/include/asterisk/http.h<br>+++ b/include/asterisk/http.h<br>@@ -316,7 +316,7 @@<br> * \param name out parameter pointing to the header name<br> * \param value out parameter pointing to header value<br> * \return -1 if buf is empty<br>- * \return 0 if buf could be separated into into name and value<br>+ * \return 0 if buf could be separated into name and value<br> * \return 1 if name or value portion don't exist<br> * \since 13<br> */<br>diff --git a/include/asterisk/parking.h b/include/asterisk/parking.h<br>index 1cf750c..afe12c9 100644<br>--- a/include/asterisk/parking.h<br>+++ b/include/asterisk/parking.h<br>@@ -164,7 +164,7 @@<br> * \param parker The \ref bridge_channel object that is initiating the parking<br> * \param context The context to blind transfer to<br> * \param exten The extension to blind transfer to<br>- * \param parked_channel_cb Execute the following function on the the channel that gets parked<br>+ * \param parked_channel_cb Execute the following function on the channel that gets parked<br> * \param parked_channel_data Data for the parked_channel_cb<br> *<br> * \note If the bridge \ref parker is in has more than one other occupant, the entire<br>@@ -236,7 +236,7 @@<br> * \param context The context to blind transfer to<br> * \param exten The extension to blind transfer to<br> * \param exten The extension to blind transfer to<br>- * \param parked_channel_cb Execute the following function on the the channel that gets parked<br>+ * \param parked_channel_cb Execute the following function on the channel that gets parked<br> * \param parked_channel_data Data for the parked_channel_cb<br> *<br> * \note If the bridge \ref parker is in has more than one other occupant, the entire<br>diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h<br>index 770a1a9..b88a3f6 100644<br>--- a/include/asterisk/pbx.h<br>+++ b/include/asterisk/pbx.h<br>@@ -1094,7 +1094,7 @@<br> int ast_unlock_context(struct ast_context *con);<br> <br> /*!<br>- * \brief locks the macrolock in the given given context<br>+ * \brief locks the macrolock in the given context<br> *<br> * \param macrocontext name of the macro-context to lock<br> *<br>diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h<br>index 963519d..d93630a 100644<br>--- a/include/asterisk/strings.h<br>+++ b/include/asterisk/strings.h<br>@@ -256,7 +256,7 @@<br> <br> /*!<br> \brief Act like strsep but ignore separators inside quotes.<br>- \param s Pointer to address of the the string to be processed.<br>+ \param s Pointer to address of the string to be processed.<br> Will be modified and can't be constant.<br> \param sep A single character delimiter.<br> \param flags Controls post-processing of the result.<br>diff --git a/main/astmm.c b/main/astmm.c<br>index d53323a..59baa42 100644<br>--- a/main/astmm.c<br>+++ b/main/astmm.c<br>@@ -1466,7 +1466,7 @@<br> /*<br> * Put the alloced list back into regions[].<br> *<br>- * We have do do this because we can get called before all other<br>+ * We have do this because we can get called before all other<br> * threads have terminated.<br> */<br> mm_atexit_hash_restore(&alloced_atexit);<br>diff --git a/main/db.c b/main/db.c<br>index 1edbcac..da533a4 100644<br>--- a/main/db.c<br>+++ b/main/db.c<br>@@ -131,7 +131,7 @@<br> <br> /* This query begs an explanation:<br> *<br>- * First, the parameter binding syntax used here is slightly different then the other<br>+ * First, the parameter binding syntax used here is slightly different than the other<br> * queries in that we use a numbered parameter so that we can bind once and get the same<br> * value substituted multiple times within the executed query.<br> *<br>diff --git a/main/editline/map.c b/main/editline/map.c<br>index 4187cb5..448c3c0 100644<br>--- a/main/editline/map.c<br>+++ b/main/editline/map.c<br>@@ -369,7 +369,7 @@<br> * NOTE: These mappings do NOT Correspond well<br> * to the KSH VI editing assignments.<br> * On the other and they are convenient and<br>- * many people have have gotten used to them.<br>+ * many people have gotten used to them.<br> */<br> /* 0 */ ED_UNASSIGNED, /* ^@ */<br> /* 1 */ ED_MOVE_TO_BEG, /* ^A */<br>diff --git a/main/editline/refresh.c b/main/editline/refresh.c<br>index fcebe12..1acc261 100644<br>--- a/main/editline/refresh.c<br>+++ b/main/editline/refresh.c<br>@@ -1064,7 +1064,7 @@<br> <br> <br> /* re_clear_display():<br>- * clear the screen buffers so that new new prompt starts fresh.<br>+ * clear the screen buffers so that new prompt starts fresh.<br> */<br> protected void<br> re_clear_display(EditLine *el)<br>diff --git a/main/jitterbuf.c b/main/jitterbuf.c<br>index df3164f..21c1104 100644<br>--- a/main/jitterbuf.c<br>+++ b/main/jitterbuf.c<br>@@ -358,7 +358,7 @@<br> frame->type = type;<br> <br> /*<br>- * frames are a circular list, jb-frames points to to the lowest ts,<br>+ * frames are a circular list, jb-frames points to the lowest ts,<br> * jb->frames->prev points to the highest ts<br> */<br> <br>diff --git a/main/named_acl.c b/main/named_acl.c<br>index 47787e9..458d4d3 100644<br>--- a/main/named_acl.c<br>+++ b/main/named_acl.c<br>@@ -403,7 +403,7 @@<br> return 0;<br> <br> publish_failure:<br>- ast_log(LOG_ERROR, "Failed to to issue ACL change message for %s.\n",<br>+ ast_log(LOG_ERROR, "Failed to issue ACL change message for %s.\n",<br> ast_strlen_zero(name) ? "all named ACLs" : name);<br> return -1;<br> }<br>diff --git a/main/netsock2.c b/main/netsock2.c<br>index 73595fe..5f94a75 100644<br>--- a/main/netsock2.c<br>+++ b/main/netsock2.c<br>@@ -609,7 +609,7 @@<br> /* If the sock address is IPv6, the TCLASS field must be set. */<br> set_tclass = !ast_getsockname(sockfd, &addr) && ast_sockaddr_is_ipv6(&addr) ? 1 : 0;<br> <br>- /* If the the sock address is IPv4 or (IPv6 set to any address [::]) set TOS bits */<br>+ /* If the sock address is IPv4 or (IPv6 set to any address [::]) set TOS bits */<br> set_tos = (!set_tclass || (set_tclass && ast_sockaddr_is_any(&addr))) ? 1 : 0;<br> <br> if (set_tos) {<br>diff --git a/main/security_events.c b/main/security_events.c<br>index d549d62..24b2b6a 100644<br>--- a/main/security_events.c<br>+++ b/main/security_events.c<br>@@ -314,7 +314,7 @@<br> <parameter name="ReceivedChallenge" required="false"><br> <para>The challenge that was received.</para><br> </parameter><br>- <parameter name="RecievedHash" required="false"><br>+ <parameter name="ReceivedHash" required="false"><br> <para>The hash that was received.</para><br> </parameter><br> </syntax><br>diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c<br>index 64840e8..1b93454 100644<br>--- a/main/stdtime/localtime.c<br>+++ b/main/stdtime/localtime.c<br>@@ -1057,7 +1057,7 @@<br> int result;<br> <br> /* for temporary struct state --<br>- * macro flags the the struct as a stack temp.<br>+ * macro flags the struct as a stack temp.<br> * to prevent use within add_notify()<br> */<br> SP_STACK_INIT(ts);<br>@@ -1777,7 +1777,7 @@<br> return;<br> <br> /* If the desired time exceeds the bounds of the defined time transitions<br>- * then give give up on determining DST info and simply look for gmt offset<br>+ * then give up on determining DST info and simply look for gmt offset<br> * This requires that I adjust the given time using increments of Gregorian<br> * repeats to place the time within the defined time transitions in the<br> * timezone structure.<br>diff --git a/main/threadpool.c b/main/threadpool.c<br>index 6240b73..874b2d8 100644<br>--- a/main/threadpool.c<br>+++ b/main/threadpool.c<br>@@ -702,7 +702,7 @@<br> /*!<br> * \brief ao2 callback to zombify a set number of threads.<br> *<br>- * Threads will be zombified as long as as the counter has not reached<br>+ * Threads will be zombified as long as the counter has not reached<br> * zero. The counter is decremented with each thread that is zombified.<br> *<br> * Zombifying a thread involves removing it from its current container,<br>diff --git a/menuselect/menuselect_gtk.c b/menuselect/menuselect_gtk.c<br>index 9379d7d..fcf755e 100644<br>--- a/menuselect/menuselect_gtk.c<br>+++ b/menuselect/menuselect_gtk.c<br>@@ -208,7 +208,7 @@<br> <br> /* This function generates the menu items. Pass the item factory,<br> the number of items in the array, the array itself, and any<br>- callback data for the the menu items. */<br>+ callback data for the menu items. */<br> gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL);<br> <br> /* Attach the new accelerator group to the window. */<br>diff --git a/res/ael/pval.c b/res/ael/pval.c<br>index 07545f6..7c420d1 100644<br>--- a/res/ael/pval.c<br>+++ b/res/ael/pval.c<br>@@ -2878,7 +2878,7 @@<br> 3. Does the number of macro args match the definition?<br> 4. Is a macro call missing its & at the front?<br> 5. Application calls-- we could check syntax for existing applications,<br>- but I need some some sort of universal description bnf for a general<br>+ but I need some sort of universal description bnf for a general<br> sort of method for checking arguments, in number, maybe even type, at least. <br> Don't want to hand code checks for hundreds of applications.<br> */<br>diff --git a/res/parking/res_parking.h b/res/parking/res_parking.h<br>index b8be041..6fbde09 100644<br>--- a/res/parking/res_parking.h<br>+++ b/res/parking/res_parking.h<br>@@ -135,7 +135,7 @@<br> * \param dynamic non-zero if creating a dynamic parking lot with this. Don't replace existing parking lots. Ever.<br> *<br> * \retval A reference to the new parking lot<br>- * \retval NULL if it was not found and could not be be allocated<br>+ * \retval NULL if it was not found and could not be allocated<br> *<br> * \note The parking lot will need to be unreffed if it ever falls out of scope<br> * \note The parking lot will automatically be added to the parking lot container if needed as part of this process<br>diff --git a/res/res_config_sqlite3.c b/res/res_config_sqlite3.c<br>index 5655862..961d794 100644<br>--- a/res/res_config_sqlite3.c<br>+++ b/res/res_config_sqlite3.c<br>@@ -1171,7 +1171,7 @@<br> struct realtime_sqlite3_db *db;<br> <br> /* SQLite3 columns are dynamically typed, with type affinity. Built-in functions will<br>- * return the results as char * anyway. The only field that that cannot contain text<br>+ * return the results as char * anyway. The only field that cannot contain text<br> * data is an INTEGER PRIMARY KEY, which must be a 64-bit signed integer. So, for<br> * the purposes here we really only care whether the column exists and not what its<br> * type or length is. */<br>diff --git a/res/res_fax.c b/res/res_fax.c<br>index 6e4451b..823d560 100644<br>--- a/res/res_fax.c<br>+++ b/res/res_fax.c<br>@@ -365,7 +365,7 @@<br> 'gateway' and state is 'Uninitialized'.</para><br> </parameter><br> <parameter name="FileName" required="false"><br>- <para>Filename of the image being sent/recieved for this FAX session. This field is not<br>+ <para>Filename of the image being sent/received for this FAX session. This field is not<br> included if Operation isn't 'send' or 'receive'.</para><br> </parameter><br> <parameter name="PagesTransmitted" required="false"><br>@@ -377,7 +377,7 @@<br> Operation is not 'send' or 'receive'. Will be 0 for 'send'.</para><br> </parameter><br> <parameter name="TotalBadLines" required="false"><br>- <para>Total number of bad lines sent/recieved during this session. This field is not<br>+ <para>Total number of bad lines sent/received during this session. This field is not<br> included if Operation is not 'send' or 'received'.</para><br> </parameter><br> </syntax><br>diff --git a/res/res_format_attr_opus.c b/res/res_format_attr_opus.c<br>index 857b943..9e5fe66 100644<br>--- a/res/res_format_attr_opus.c<br>+++ b/res/res_format_attr_opus.c<br>@@ -116,7 +116,7 @@<br> /* Skip any preceeding blanks as some implementations separate attributes using spaces too */<br> kvp = ast_skip_blanks(kvp);<br> <br>- /* If we are at at the requested attribute get its value and return */<br>+ /* If we are at the requested attribute get its value and return */<br> if (!strncmp(kvp, name, strlen(name)) && kvp[strlen(name)] == '=') {<br> if (sscanf(kvp, "%*[^=]=%30d", &val) == 1) {<br> *attr = val;<br>diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c<br>index 54c6c49..9aab75b 100644<br>--- a/res/res_pjsip/pjsip_configuration.c<br>+++ b/res/res_pjsip/pjsip_configuration.c<br>@@ -1565,8 +1565,8 @@<br> return 0;<br> }<br> <br>- astman_send_listack(s, m, "Following are Events for each object "<br>- "associated with the the Endpoint", "start");<br>+ astman_send_listack(s, m, "Following are Events for each object associated with the Endpoint",<br>+ "start");<br> <br> /* the endpoint detail needs to always come first so apply as such */<br> if (format_ami_endpoint(endpoint, &ami) ||<br>diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c<br>index cb0be61..e9e8324 100644<br>--- a/res/res_pjsip_pubsub.c<br>+++ b/res/res_pjsip_pubsub.c<br>@@ -895,7 +895,7 @@<br> * This iterates through the items on a resource list and creates tree nodes for each one. The<br> * tree nodes created are children of the supplied parent node. If an item in the resource<br> * list is itself a list, then this function is called recursively to provide children for<br>- * the the new node.<br>+ * the new node.<br> *<br> * If an item in a resource list is not a list, then the supplied subscription handler is<br> * called into as if a new SUBSCRIBE for the list item were presented. The handler's response<br>diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c<br>index bb53dad..ae5f19a 100644<br>--- a/res/res_pjsip_session.c<br>+++ b/res/res_pjsip_session.c<br>@@ -473,7 +473,7 @@<br> <br> /*!<br> * \internal<br>- * \brief Convert delayed method enum value to to a string.<br>+ * \brief Convert delayed method enum value to a string.<br> * \since 13.3.0<br> *<br> * \param method Delayed method enum value to convert to a string.<br>@@ -1507,7 +1507,7 @@<br> suspender->suspended = 1;<br> ast_cond_signal(&suspender->cond_suspended);<br> <br>- /* Wait for the the serializer suspension to be completed. */<br>+ /* Wait for the serializer suspension to be completed. */<br> while (!suspender->complete) {<br> ast_cond_wait(&suspender->cond_complete, ao2_object_get_lockaddr(suspender));<br> }<br>diff --git a/tests/test_aoc.c b/tests/test_aoc.c<br>index 35387df..1197064 100644<br>--- a/tests/test_aoc.c<br>+++ b/tests/test_aoc.c<br>@@ -359,7 +359,7 @@<br> goto cleanup_aoc_test;<br> }<br> <br>- /* Set a currency name larger than 10 characters which is the the maximum<br>+ /* Set a currency name larger than 10 characters which is the maximum<br> * length allowed by the ETSI aoc standard. The name is expected to truncate<br> * to 10 characters. */<br> if ((ast_aoc_set_currency_info(decoded, 100, AST_AOC_MULT_ONE, "12345678901234567890")) ||<br>diff --git a/tests/test_taskprocessor.c b/tests/test_taskprocessor.c<br>index ad2074c..273e045 100644<br>--- a/tests/test_taskprocessor.c<br>+++ b/tests/test_taskprocessor.c<br>@@ -652,7 +652,7 @@<br> /* Wait for shutdown to complete */<br> pthread_join(shutdown_thread, NULL);<br> <br>- /* Should have also also completed task2 */<br>+ /* Should have also completed task2 */<br> wait_res = shutdown_has_completed(task2);<br> if (!wait_res) {<br> ast_test_status_update(test, "Task2 didn't finish\n");<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7687">change 7687</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/7687"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3809a9c113b92fd9d0d9f9bac98e9c66dc8b2d31 </div>
<div style="display:none"> Gerrit-Change-Number: 7687 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Ivan Poddubny <ivan.poddubny@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>