<p>Josh Soref has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17466">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">main: Spelling fixes<br><br>Correct typos of the following word families:<br><br>analysis<br>nuisance<br>converting<br>although<br>transaction<br>desctitle<br>acquire<br>update<br>evaluate<br>thousand<br>this<br>dissolved<br>management<br>integrity<br>reconstructed<br>decrement<br>further on<br>irrelevant<br>currently<br>constancy<br>anyway<br>unconstrained<br>featuregroups<br>right<br>larger<br>evaluated<br>encumbered<br>languages<br>digits<br>authoritative<br>framing<br>blindxfer<br>tolerate<br>traverser<br>exclamation<br>perform<br>permissions<br>rearrangement<br>performing<br>processing<br>declension<br>happily<br>duplicate<br>compound<br>hundred<br>returns<br>elicit<br>allocate<br>actually<br>paths<br>inheritance<br>atxferdropcall<br>earlier<br>synchronization<br>multiplier<br>acknowledge<br>across<br>against<br>thousands<br>joyous<br>manipulators<br>guaranteed<br>emulating<br>soundfile<br><br>ASTERISK-29714<br><br>Change-Id: I926ba4b11e9f6dd3fdd93170ab1f9b997910be70<br>---<br>M main/abstract_jb.c<br>M main/aoc.c<br>M main/asterisk.c<br>M main/astfd.c<br>M main/astmm.c<br>M main/astobj2_container.c<br>M main/astobj2_container_private.h<br>M main/astobj2_rbtree.c<br>M main/audiohook.c<br>M main/bridge.c<br>M main/bridge_basic.c<br>M main/bridge_channel.c<br>M main/bucket.c<br>M main/callerid.c<br>M main/ccss.c<br>M main/channel.c<br>M main/config.c<br>M main/dns.c<br>M main/dnsmgr.c<br>M main/dsp.c<br>M main/enum.c<br>M main/features_config.c<br>M main/file.c<br>M main/fskmodem_float.c<br>M main/fskmodem_int.c<br>M main/io.c<br>M main/manager.c<br>M main/pbx.c<br>M main/pbx_functions.c<br>M main/say.c<br>M main/smoother.c<br>M main/stasis_cache.c<br>M main/stdtime/localtime.c<br>M main/stun.c<br>M main/threadpool.c<br>M main/time.c<br>M main/translate.c<br>M main/udptl.c<br>M main/utils.c<br>39 files changed, 91 insertions(+), 91 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/66/17466/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/abstract_jb.c b/main/abstract_jb.c</span><br><span>index 083ff9e..03dd022 100644</span><br><span>--- a/main/abstract_jb.c</span><br><span>+++ b/main/abstract_jb.c</span><br><span>@@ -934,7 +934,7 @@</span><br><span> timestamp_diff = (frame->ts * (rate / 1000)) - stream_sync->timestamp;</span><br><span> } else {</span><br><span> /* Video is special - internally we reference it as 1000 to preserve the RTP timestamp but</span><br><span style="color: hsl(0, 100%, 40%);">- * it is actualy 90000, this is why we can just directly subtract the timestamp.</span><br><span style="color: hsl(120, 100%, 40%);">+ * it is actually 90000, this is why we can just directly subtract the timestamp.</span><br><span> */</span><br><span> rate = 90000;</span><br><span> timestamp_diff = frame->ts - stream_sync->timestamp;</span><br><span>diff --git a/main/aoc.c b/main/aoc.c</span><br><span>index 45ecd3e..e04ccea 100644</span><br><span>--- a/main/aoc.c</span><br><span>+++ b/main/aoc.c</span><br><span>@@ -1407,7 +1407,7 @@</span><br><span> * \param msg Event message string being built.</span><br><span> * \param prefix Prefix to add to the amount lines.</span><br><span> * \param amount Data to convert.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param multipler to convert</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param multiplier to convert</span><br><span> *</span><br><span> * \return Nothing</span><br><span> */</span><br><span>diff --git a/main/asterisk.c b/main/asterisk.c</span><br><span>index b17ffcf..1e37783 100644</span><br><span>--- a/main/asterisk.c</span><br><span>+++ b/main/asterisk.c</span><br><span>@@ -4163,7 +4163,7 @@</span><br><span> */</span><br><span> check_init(ast_media_cache_init(), "Media Cache");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* loads the cli_permissoins.conf file needed to implement cli restrictions. */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* loads the cli_permissions.conf file needed to implement cli restrictions. */</span><br><span> ast_cli_perms_init(0);</span><br><span> </span><br><span> ast_stun_init();</span><br><span>diff --git a/main/astfd.c b/main/astfd.c</span><br><span>index 8322803..78efe11 100644</span><br><span>--- a/main/astfd.c</span><br><span>+++ b/main/astfd.c</span><br><span>@@ -300,7 +300,7 @@</span><br><span> }</span><br><span> /* On success, newfd will be closed automatically if it was already</span><br><span> * open. We don't need to mention anything about that, we're updating</span><br><span style="color: hsl(0, 100%, 40%);">- * the value anway. */</span><br><span style="color: hsl(120, 100%, 40%);">+ * the value anyway. */</span><br><span> STORE_COMMON(res, "dup2", "%d,%d", oldfd, newfd); /* res == newfd */</span><br><span> return res;</span><br><span> }</span><br><span>diff --git a/main/astmm.c b/main/astmm.c</span><br><span>index cb45a03..7cb50e3 100644</span><br><span>--- a/main/astmm.c</span><br><span>+++ b/main/astmm.c</span><br><span>@@ -119,7 +119,7 @@</span><br><span> *</span><br><span> * \note Must be right before data[].</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \note Padding between fence and data[] is irrelevent because</span><br><span style="color: hsl(120, 100%, 40%);">+ * \note Padding between fence and data[] is irrelevant because</span><br><span> * data[] is used to fill in the lower fence check value and not</span><br><span> * the fence member. The fence member is to ensure that there</span><br><span> * is space reserved for the fence check value.</span><br><span>@@ -1502,7 +1502,7 @@</span><br><span> freed_regions_flush(&whales);</span><br><span> freed_regions_flush(&minnows);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Peform atexit allocation dumps. */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Perform atexit allocation dumps. */</span><br><span> if (atexit_list || atexit_summary) {</span><br><span> ast_mutex_lock(®lock);</span><br><span> mm_atexit_dump();</span><br><span>diff --git a/main/astobj2_container.c b/main/astobj2_container.c</span><br><span>index 0b580e6..6437844 100644</span><br><span>--- a/main/astobj2_container.c</span><br><span>+++ b/main/astobj2_container.c</span><br><span>@@ -864,7 +864,7 @@</span><br><span> }</span><br><span> #if defined(AO2_DEBUG)</span><br><span> if (!self->v_table->integrity) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* No ingetrigy check available. Assume container is ok. */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* No integrity check available. Assume container is ok. */</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/main/astobj2_container_private.h b/main/astobj2_container_private.h</span><br><span>index 3651ca4..daa808b 100644</span><br><span>--- a/main/astobj2_container_private.h</span><br><span>+++ b/main/astobj2_container_private.h</span><br><span>@@ -254,7 +254,7 @@</span><br><span> #if defined(AO2_DEBUG)</span><br><span> /*! Increment the container linked object statistic. */</span><br><span> ao2_link_node_stat_fn link_stat;</span><br><span style="color: hsl(0, 100%, 40%);">- /*! Deccrement the container linked object statistic. */</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Decrement the container linked object statistic. */</span><br><span> ao2_unlink_node_stat_fn unlink_stat;</span><br><span> /*! Display container contents. (Method for debug purposes) */</span><br><span> ao2_container_display dump;</span><br><span>diff --git a/main/astobj2_rbtree.c b/main/astobj2_rbtree.c</span><br><span>index d7c76e6..855f675 100644</span><br><span>--- a/main/astobj2_rbtree.c</span><br><span>+++ b/main/astobj2_rbtree.c</span><br><span>@@ -1143,7 +1143,7 @@</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Node is a dupliate */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Node is a duplicate */</span><br><span> switch (options & AO2_CONTAINER_ALLOC_OPT_DUPS_MASK) {</span><br><span> default:</span><br><span> case AO2_CONTAINER_ALLOC_OPT_DUPS_ALLOW:</span><br><span>diff --git a/main/audiohook.c b/main/audiohook.c</span><br><span>index ed16897..fc901aa 100644</span><br><span>--- a/main/audiohook.c</span><br><span>+++ b/main/audiohook.c</span><br><span>@@ -610,7 +610,7 @@</span><br><span> ast_audiohook_update_status(audiohook, AST_AUDIOHOOK_STATUS_DONE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Drop any manipulaters */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Drop any manipulators */</span><br><span> while ((audiohook = AST_LIST_REMOVE_HEAD(&audiohook_list->manipulate_list, list))) {</span><br><span> ast_audiohook_update_status(audiohook, AST_AUDIOHOOK_STATUS_DONE);</span><br><span> audiohook->manipulate_callback(audiohook, NULL, NULL, 0);</span><br><span>diff --git a/main/bridge.c b/main/bridge.c</span><br><span>index 9afb5a4..9e72a8f 100644</span><br><span>--- a/main/bridge.c</span><br><span>+++ b/main/bridge.c</span><br><span>@@ -3087,7 +3087,7 @@</span><br><span> int ast_bridge_suspend(struct ast_bridge *bridge, struct ast_channel *chan)</span><br><span> {</span><br><span> struct ast_bridge_channel *bridge_channel;</span><br><span style="color: hsl(0, 100%, 40%);">-/* XXX ASTERISK-21271 the case of a disolved bridge while channel is suspended is not handled. */</span><br><span style="color: hsl(120, 100%, 40%);">+/* XXX ASTERISK-21271 the case of a dissolved bridge while channel is suspended is not handled. */</span><br><span> /* XXX ASTERISK-21271 suspend/unsuspend needs to be rethought. The caller must block until it has successfully suspended the channel for temporary control. */</span><br><span> /* XXX ASTERISK-21271 external suspend/unsuspend needs to be eliminated. The channel may be playing a file at the time and stealing it then is not good. */</span><br><span> </span><br><span>@@ -3108,7 +3108,7 @@</span><br><span> int ast_bridge_unsuspend(struct ast_bridge *bridge, struct ast_channel *chan)</span><br><span> {</span><br><span> struct ast_bridge_channel *bridge_channel;</span><br><span style="color: hsl(0, 100%, 40%);">-/* XXX ASTERISK-21271 the case of a disolved bridge while channel is suspended is not handled. */</span><br><span style="color: hsl(120, 100%, 40%);">+/* XXX ASTERISK-21271 the case of a dissolved bridge while channel is suspended is not handled. */</span><br><span> </span><br><span> ast_bridge_lock(bridge);</span><br><span> </span><br><span>diff --git a/main/bridge_basic.c b/main/bridge_basic.c</span><br><span>index 72ea714..4a691b7 100644</span><br><span>--- a/main/bridge_basic.c</span><br><span>+++ b/main/bridge_basic.c</span><br><span>@@ -798,7 +798,7 @@</span><br><span> * 2) TRANSFER_BLOND: Transferer hangs up or presses DTMF swap sequence</span><br><span> * and configured atxferdropcall setting is yes.</span><br><span> * 3) TRANSFER_BLOND_NONFINAL: Transferer hangs up or presses DTMF swap</span><br><span style="color: hsl(0, 100%, 40%);">- * sequence and configured atxferdroppcall setting is no.</span><br><span style="color: hsl(120, 100%, 40%);">+ * sequence and configured atxferdropcall setting is no.</span><br><span> * 4) TRANSFER_CONSULTING: Transfer target answers the call.</span><br><span> * 5) TRANSFER_REBRIDGE: Transfer target hangs up, call to transfer target</span><br><span> * times out, or transferer presses DTMF abort sequence.</span><br><span>@@ -832,7 +832,7 @@</span><br><span> * 2) TRANSFER_BLOND: Transferer hangs up or presses DTMF swap sequence</span><br><span> * and configured atxferdropcall setting is yes.</span><br><span> * 3) TRANSFER_BLOND_NONFINAL: Transferer hangs up or presses DTMF swap</span><br><span style="color: hsl(0, 100%, 40%);">- * sequence and configured atxferdroppcall setting is no.</span><br><span style="color: hsl(120, 100%, 40%);">+ * sequence and configured atxferdropcall setting is no.</span><br><span> * 4) TRANSFER_DOUBLECHECKING: Transfer target answers the call</span><br><span> * 5) TRANSFER_RESUME: Transfer target hangs up, call to transfer target</span><br><span> * times out, or transferer presses DTMF abort sequence.</span><br><span>@@ -2444,7 +2444,7 @@</span><br><span> </span><br><span> /*</span><br><span> * Stage a snapshot to ensure that a snapshot is always done</span><br><span style="color: hsl(0, 100%, 40%);">- * on the recall channel so earler COLP and CLID setup will</span><br><span style="color: hsl(120, 100%, 40%);">+ * on the recall channel so earlier COLP and CLID setup will</span><br><span> * get published.</span><br><span> */</span><br><span> ast_channel_stage_snapshot(recall);</span><br><span>@@ -3473,7 +3473,7 @@</span><br><span> char xfer_exten[AST_MAX_EXTENSION] = "";</span><br><span> struct ast_bridge_features_blind_transfer *blind_transfer = hook_pvt;</span><br><span> const char *xfer_context;</span><br><span style="color: hsl(0, 100%, 40%);">- char *goto_on_blindxfr;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *goto_on_blindxfer;</span><br><span> </span><br><span> ast_verb(3, "Channel %s: Started DTMF blind transfer.\n",</span><br><span> ast_channel_name(bridge_channel->chan));</span><br><span>@@ -3483,7 +3483,7 @@</span><br><span> ast_channel_lock(bridge_channel->chan);</span><br><span> xfer_context = ast_strdupa(get_transfer_context(bridge_channel->chan,</span><br><span> blind_transfer ? blind_transfer->context : NULL));</span><br><span style="color: hsl(0, 100%, 40%);">- goto_on_blindxfr = ast_strdupa(S_OR(pbx_builtin_getvar_helper(bridge_channel->chan,</span><br><span style="color: hsl(120, 100%, 40%);">+ goto_on_blindxfer = ast_strdupa(S_OR(pbx_builtin_getvar_helper(bridge_channel->chan,</span><br><span> "GOTO_ON_BLINDXFR"), ""));</span><br><span> ast_channel_unlock(bridge_channel->chan);</span><br><span> </span><br><span>@@ -3496,13 +3496,13 @@</span><br><span> ast_debug(1, "Channel %s: Blind transfer target '%s@%s'\n",</span><br><span> ast_channel_name(bridge_channel->chan), xfer_exten, xfer_context);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!ast_strlen_zero(goto_on_blindxfr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ast_strlen_zero(goto_on_blindxfer)) {</span><br><span> const char *chan_context;</span><br><span> const char *chan_exten;</span><br><span> int chan_priority;</span><br><span> </span><br><span> ast_debug(1, "Channel %s: After transfer, transferrer goes to %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ast_channel_name(bridge_channel->chan), goto_on_blindxfr);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_channel_name(bridge_channel->chan), goto_on_blindxfer);</span><br><span> </span><br><span> ast_channel_lock(bridge_channel->chan);</span><br><span> chan_context = ast_strdupa(ast_channel_context(bridge_channel->chan));</span><br><span>@@ -3510,12 +3510,12 @@</span><br><span> chan_priority = ast_channel_priority(bridge_channel->chan);</span><br><span> ast_channel_unlock(bridge_channel->chan);</span><br><span> ast_bridge_set_after_go_on(bridge_channel->chan,</span><br><span style="color: hsl(0, 100%, 40%);">- chan_context, chan_exten, chan_priority, goto_on_blindxfr);</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_context, chan_exten, chan_priority, goto_on_blindxfer);</span><br><span> }</span><br><span> </span><br><span> if (ast_bridge_transfer_blind(0, bridge_channel->chan, xfer_exten, xfer_context,</span><br><span> blind_transfer_cb, bridge_channel->chan) != AST_BRIDGE_TRANSFER_SUCCESS</span><br><span style="color: hsl(0, 100%, 40%);">- && !ast_strlen_zero(goto_on_blindxfr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ && !ast_strlen_zero(goto_on_blindxfer)) {</span><br><span> ast_bridge_discard_after_goto(bridge_channel->chan);</span><br><span> }</span><br><span> </span><br><span>diff --git a/main/bridge_channel.c b/main/bridge_channel.c</span><br><span>index 7e058af..608db61 100644</span><br><span>--- a/main/bridge_channel.c</span><br><span>+++ b/main/bridge_channel.c</span><br><span>@@ -133,7 +133,7 @@</span><br><span> }</span><br><span> </span><br><span> /*!</span><br><span style="color: hsl(0, 100%, 40%);">- * \brief Clean up a syncrhonization bridge object.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Clean up a synchronization bridge object.</span><br><span> *</span><br><span> * This frees fields within the synchronization object and removes</span><br><span> * it from the list of active synchronization objects.</span><br><span>diff --git a/main/bucket.c b/main/bucket.c</span><br><span>index 3e86996..01934f3 100644</span><br><span>--- a/main/bucket.c</span><br><span>+++ b/main/bucket.c</span><br><span>@@ -731,7 +731,7 @@</span><br><span> static int bucket_copy(const char *infile, const char *outfile)</span><br><span> {</span><br><span> int ifd, ofd, len;</span><br><span style="color: hsl(0, 100%, 40%);">- char buf[4096]; /* XXX make it lerger. */</span><br><span style="color: hsl(120, 100%, 40%);">+ char buf[4096]; /* XXX make it larger. */</span><br><span> </span><br><span> if ((ifd = open(infile, O_RDONLY)) < 0) {</span><br><span> ast_log(LOG_WARNING, "Unable to open %s in read-only mode, error: %s\n", infile, strerror(errno));</span><br><span>diff --git a/main/callerid.c b/main/callerid.c</span><br><span>index 6c4e5cf..4d6186b 100644</span><br><span>--- a/main/callerid.c</span><br><span>+++ b/main/callerid.c</span><br><span>@@ -577,7 +577,7 @@</span><br><span> continue;</span><br><span> }</span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * We can tollerate an error on the checksum character since the</span><br><span style="color: hsl(120, 100%, 40%);">+ * We can tolerate an error on the checksum character since the</span><br><span> * checksum character is the last character in the message and</span><br><span> * it validates the message.</span><br><span> *</span><br><span>diff --git a/main/ccss.c b/main/ccss.c</span><br><span>index 553897b..222e8cb 100644</span><br><span>--- a/main/ccss.c</span><br><span>+++ b/main/ccss.c</span><br><span>@@ -229,7 +229,7 @@</span><br><span> * and "SIP"</span><br><span> *</span><br><span> * \note This really should be an array of characters in case this payload</span><br><span style="color: hsl(0, 100%, 40%);">- * is sent accross an IAX2 link. However, this would not make too much sense</span><br><span style="color: hsl(120, 100%, 40%);">+ * is sent across an IAX2 link. However, this would not make too much sense</span><br><span> * given this type may not be recognized by the other end.</span><br><span> * Protection may be necessary to prevent it from being transmitted.</span><br><span> *</span><br><span>@@ -1354,7 +1354,7 @@</span><br><span> * for recall. If a CCNR request comes in, then we will</span><br><span> * have to mark the list as unfit for recall since this</span><br><span> * is a clear indicator that the person at the monitored</span><br><span style="color: hsl(0, 100%, 40%);">- * device has gone away and is actuall not fit to be</span><br><span style="color: hsl(120, 100%, 40%);">+ * device has gone away and is actually not fit to be</span><br><span> * recalled</span><br><span> */</span><br><span> int fit_for_recall;</span><br><span>@@ -2660,7 +2660,7 @@</span><br><span> * Context dialed</span><br><span> *</span><br><span> * The original context dialed. This is used</span><br><span style="color: hsl(0, 100%, 40%);">- * so that when performaing a recall, we can</span><br><span style="color: hsl(120, 100%, 40%);">+ * so that when performing a recall, we can</span><br><span> * call into the proper context</span><br><span> */</span><br><span> char context[AST_CHANNEL_NAME];</span><br><span>diff --git a/main/channel.c b/main/channel.c</span><br><span>index 419acb9..c239504 100644</span><br><span>--- a/main/channel.c</span><br><span>+++ b/main/channel.c</span><br><span>@@ -2881,7 +2881,7 @@</span><br><span> ast_tvdiff_ms(ast_tvnow(), *ast_channel_dtmf_tv(chan)) < 2*AST_MIN_DTMF_GAP) {</span><br><span> /*</span><br><span> * We're not in the middle of a digit, but it hasn't been long enough</span><br><span style="color: hsl(0, 100%, 40%);">- * since the last digit, so we'll have to trigger DTMF furtheron.</span><br><span style="color: hsl(120, 100%, 40%);">+ * since the last digit, so we'll have to trigger DTMF further on.</span><br><span> * Using 2 times AST_MIN_DTMF_GAP to trigger readq reading for possible</span><br><span> * buffered next dtmf event</span><br><span> */</span><br><span>@@ -3599,7 +3599,7 @@</span><br><span> switch (res) {</span><br><span> case AST_TIMING_EVENT_EXPIRED:</span><br><span> if (ast_timer_ack(ast_channel_timer(chan), 1) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(LOG_ERROR, "Failed to acknoweldge timer in ast_read\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_ERROR, "Failed to acknowledge timer in ast_read\n");</span><br><span> goto done;</span><br><span> }</span><br><span> </span><br><span>@@ -3630,7 +3630,7 @@</span><br><span> break;</span><br><span> }</span><br><span> } else if (trigger_dtmf_emulating) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* generate null frame to trigger dtmf emualating */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* generate null frame to trigger dtmf emulating */</span><br><span> f = &ast_null_frame;</span><br><span> break;</span><br><span> } else {</span><br><span>@@ -6954,7 +6954,7 @@</span><br><span> ast_channel_unlock(original);</span><br><span> ast_indicate(original, -1);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Start the masquerade channel contents rearangement. */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Start the masquerade channel contents rearrangement. */</span><br><span> ast_channel_lock_both(original, clonechan);</span><br><span> </span><br><span> ast_debug(1, "Actually Masquerading %s(%u) into the structure of %s(%u)\n",</span><br><span>diff --git a/main/config.c b/main/config.c</span><br><span>index d5dd93c..46f05aa 100644</span><br><span>--- a/main/config.c</span><br><span>+++ b/main/config.c</span><br><span>@@ -1836,7 +1836,7 @@</span><br><span> if (newcat) {</span><br><span> ast_category_destroy(newcat);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(LOG_ERROR, "Inheritence requested, but allocation failed\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_ERROR, "Inheritance requested, but allocation failed\n");</span><br><span> return -1;</span><br><span> }</span><br><span> }</span><br><span>@@ -3730,7 +3730,7 @@</span><br><span> error = 1;</span><br><span> goto uint32_done;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- /* strtoul will happilly and silently negate negative numbers */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* strtoul will happily and silently negate negative numbers */</span><br><span> arg = ast_skip_blanks(arg);</span><br><span> if (*arg == '-') {</span><br><span> error = 1;</span><br><span>diff --git a/main/dns.c b/main/dns.c</span><br><span>index 9cf0cf4..c69a9b1 100644</span><br><span>--- a/main/dns.c</span><br><span>+++ b/main/dns.c</span><br><span>@@ -127,7 +127,7 @@</span><br><span> /* fields in third byte */</span><br><span> unsigned qr:1; /*!< response flag */</span><br><span> unsigned opcode:4; /*!< purpose of message */</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned aa:1; /*!< authoritive answer */</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned aa:1; /*!< authoritative answer */</span><br><span> unsigned tc:1; /*!< truncated message */</span><br><span> unsigned rd:1; /*!< recursion desired */</span><br><span> /* fields in fourth byte */</span><br><span>@@ -141,7 +141,7 @@</span><br><span> /* fields in third byte */</span><br><span> unsigned rd:1; /*!< recursion desired */</span><br><span> unsigned tc:1; /*!< truncated message */</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned aa:1; /*!< authoritive answer */</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned aa:1; /*!< authoritative answer */</span><br><span> unsigned opcode:4; /*!< purpose of message */</span><br><span> unsigned qr:1; /*!< response flag */</span><br><span> /* fields in fourth byte */</span><br><span>diff --git a/main/dnsmgr.c b/main/dnsmgr.c</span><br><span>index db13b1d..bcde082 100644</span><br><span>--- a/main/dnsmgr.c</span><br><span>+++ b/main/dnsmgr.c</span><br><span>@@ -340,7 +340,7 @@</span><br><span> e->command = "dnsmgr refresh";</span><br><span> e->usage =</span><br><span> "Usage: dnsmgr refresh [pattern]\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " Peforms an immediate refresh of the managed DNS entries.\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " Performs an immediate refresh of the managed DNS entries.\n"</span><br><span> " Optional regular expression pattern is used to filter the entries to refresh.\n";</span><br><span> return NULL;</span><br><span> case CLI_GENERATE:</span><br><span>diff --git a/main/dsp.c b/main/dsp.c</span><br><span>index 106ee9b..33f3b68 100644</span><br><span>--- a/main/dsp.c</span><br><span>+++ b/main/dsp.c</span><br><span>@@ -467,7 +467,7 @@</span><br><span> </span><br><span> periods_in_block = s->block_size * freq / sample_rate;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Make sure we will have at least 5 periods at target frequency for analisys.</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure we will have at least 5 periods at target frequency for analysis.</span><br><span> This may make block larger than expected packet and will make squelching impossible</span><br><span> but at least we will be detecting the tone */</span><br><span> if (periods_in_block < 5) {</span><br><span>diff --git a/main/enum.c b/main/enum.c</span><br><span>index 45917ff..15451c2 100644</span><br><span>--- a/main/enum.c</span><br><span>+++ b/main/enum.c</span><br><span>@@ -507,7 +507,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Make the regex case-insensitive if the 'i' flag is present. This assumes you</span><br><span style="color: hsl(0, 100%, 40%);">- * aren't using 'i' as a delimiter which, altough dubious, does not appear to be</span><br><span style="color: hsl(120, 100%, 40%);">+ * aren't using 'i' as a delimiter which, although dubious, does not appear to be</span><br><span> * explicitly non-compliant */</span><br><span> if (regexp[regexp_len - 1] == 'i') {</span><br><span> re_flags |= REG_ICASE;</span><br><span>@@ -557,7 +557,7 @@</span><br><span> ast_log(LOG_WARNING, "Error during regex substitution. Invalid pmatch index.\n");</span><br><span> return -1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- /* pmatch len is 10. we are garanteed a single char 0-9 is a valid index */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* pmatch len is 10. we are guaranteed a single char 0-9 is a valid index */</span><br><span> size = pmatch[matchindex].rm_eo - pmatch[matchindex].rm_so;</span><br><span> if (size > d_len) {</span><br><span> ast_log(LOG_WARNING, "Not enough space during NAPTR regex substitution.\n");</span><br><span>@@ -682,7 +682,7 @@</span><br><span> * The "number" parameter includes a leading '+' if it's a full E.164 number (and not ISN)</span><br><span> * We need to preserve that as the regex inside NAPTRs expect the +.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * But for the domain generation, the '+' is a nuissance, so we get rid of it.</span><br><span style="color: hsl(120, 100%, 40%);">+ * But for the domain generation, the '+' is a nuisance, so we get rid of it.</span><br><span> */</span><br><span> ast_copy_string(naptrinput, number[0] == 'n' ? number + 1 : number, sizeof(naptrinput));</span><br><span> if (number[0] == '+') {</span><br><span>diff --git a/main/features_config.c b/main/features_config.c</span><br><span>index c74d849..50ca69b 100644</span><br><span>--- a/main/features_config.c</span><br><span>+++ b/main/features_config.c</span><br><span>@@ -726,7 +726,7 @@</span><br><span> * need to allocate these structures because they are not used.</span><br><span> *</span><br><span> * \param allocate_applicationmap See previous explanation</span><br><span style="color: hsl(0, 100%, 40%);">- * \retval NULL Failed to alloate configuration</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval NULL Failed to allocate configuration</span><br><span> * \retval non-NULL Allocated configuration</span><br><span> */</span><br><span> static struct features_config *__features_config_alloc(int allocate_applicationmap)</span><br><span>@@ -817,7 +817,7 @@</span><br><span> </span><br><span> /* applicationmap and featuregroups are purposely not copied. A channel's applicationmap</span><br><span> * is produced on the fly when ast_get_chan_applicationmap() is called</span><br><span style="color: hsl(0, 100%, 40%);">- * NOTE: This does not apply to the global cfg->applicationmap and cfg->featuresgroups</span><br><span style="color: hsl(120, 100%, 40%);">+ * NOTE: This does not apply to the global cfg->applicationmap and cfg->featuregroups</span><br><span> */</span><br><span> }</span><br><span> </span><br><span>diff --git a/main/file.c b/main/file.c</span><br><span>index 61f64d2..a16b6dd 100644</span><br><span>--- a/main/file.c</span><br><span>+++ b/main/file.c</span><br><span>@@ -271,7 +271,7 @@</span><br><span> static int copy(const char *infile, const char *outfile)</span><br><span> {</span><br><span> int ifd, ofd, len;</span><br><span style="color: hsl(0, 100%, 40%);">- char buf[4096]; /* XXX make it lerger. */</span><br><span style="color: hsl(120, 100%, 40%);">+ char buf[4096]; /* XXX make it larger. */</span><br><span> </span><br><span> if ((ifd = open(infile, O_RDONLY)) < 0) {</span><br><span> ast_log(LOG_WARNING, "Unable to open %s in read-only mode\n", infile);</span><br><span>diff --git a/main/fskmodem_float.c b/main/fskmodem_float.c</span><br><span>index 5891191..d0f54c0 100644</span><br><span>--- a/main/fskmodem_float.c</span><br><span>+++ b/main/fskmodem_float.c</span><br><span>@@ -351,7 +351,7 @@</span><br><span> </span><br><span> /* And finally we return */</span><br><span> /* Bit 8 : Parity error */</span><br><span style="color: hsl(0, 100%, 40%);">- /* Bit 9 : Framming error*/</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Bit 9 : Framing error*/</span><br><span> </span><br><span> *outbyte = a;</span><br><span> fskd->state = STATE_SEARCH_STARTBIT;</span><br><span>diff --git a/main/fskmodem_int.c b/main/fskmodem_int.c</span><br><span>index 5c7f8ec..e0a46c8 100644</span><br><span>--- a/main/fskmodem_int.c</span><br><span>+++ b/main/fskmodem_int.c</span><br><span>@@ -356,7 +356,7 @@</span><br><span> </span><br><span> /* And finally we return</span><br><span> * Bit 8 : Parity error</span><br><span style="color: hsl(0, 100%, 40%);">- * Bit 9 : Framming error</span><br><span style="color: hsl(120, 100%, 40%);">+ * Bit 9 : Framing error</span><br><span> */</span><br><span> </span><br><span> *outbyte = a;</span><br><span>diff --git a/main/io.c b/main/io.c</span><br><span>index ed455df..0ff49cc 100644</span><br><span>--- a/main/io.c</span><br><span>+++ b/main/io.c</span><br><span>@@ -18,7 +18,7 @@</span><br><span> </span><br><span> /*! \file</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \brief I/O Managment (Derived from Cheops-NG)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief I/O Management (Derived from Cheops-NG)</span><br><span> *</span><br><span> * \author Mark Spencer <markster@digium.com></span><br><span> */</span><br><span>diff --git a/main/manager.c b/main/manager.c</span><br><span>index f938b4e..f180b88 100644</span><br><span>--- a/main/manager.c</span><br><span>+++ b/main/manager.c</span><br><span>@@ -111,7 +111,7 @@</span><br><span> <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" /></span><br><span> </syntax></span><br><span> <description></span><br><span style="color: hsl(0, 100%, 40%);">- <para>A 'Ping' action will ellicit a 'Pong' response. Used to keep the</span><br><span style="color: hsl(120, 100%, 40%);">+ <para>A 'Ping' action will elicit a 'Pong' response. Used to keep the</span><br><span> manager connection open.</para></span><br><span> </description></span><br><span> </manager></span><br><span>@@ -931,7 +931,7 @@</span><br><span> </parameter></span><br><span> </syntax></span><br><span> <description></span><br><span style="color: hsl(0, 100%, 40%);">- <para>This action will ellicit a <literal>Success</literal> response. Whenever</span><br><span style="color: hsl(120, 100%, 40%);">+ <para>This action will elicit a <literal>Success</literal> response. Whenever</span><br><span> a manager event is queued. Once WaitEvent has been called on an HTTP manager</span><br><span> session, events will be generated and queued.</para></span><br><span> </description></span><br><span>@@ -7951,7 +7951,7 @@</span><br><span> /*!</span><br><span> * \note There is approximately a 1 in 1.8E19 chance that the following</span><br><span> * calculation will produce 0, which is an invalid ID, but due to the</span><br><span style="color: hsl(0, 100%, 40%);">- * properties of the rand() function (and the constantcy of s), that</span><br><span style="color: hsl(120, 100%, 40%);">+ * properties of the rand() function (and the constancy of s), that</span><br><span> * won't happen twice in a row.</span><br><span> */</span><br><span> while ((session->managerid = ast_random() ^ (unsigned long) session) == 0) {</span><br><span>diff --git a/main/pbx.c b/main/pbx.c</span><br><span>index 0cae9b8..224f847 100644</span><br><span>--- a/main/pbx.c</span><br><span>+++ b/main/pbx.c</span><br><span>@@ -1045,7 +1045,7 @@</span><br><span> * Hope the limit on stack depth won't be a problem... this routine should</span><br><span> * be pretty lean as far a stack usage goes. Any non-match terminates the recursion down a branch.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * In the above example, with the number "3077549999" as the pattern, the traversor could match extensions a, b and d. All are</span><br><span style="color: hsl(120, 100%, 40%);">+ * In the above example, with the number "3077549999" as the pattern, the traverser could match extensions a, b and d. All are</span><br><span> * of length 10; they have total specificities of 24580, 10246, and 25090, respectively, not that this matters</span><br><span> * at all. (b) wins purely because the first character "3" is much more specific (lower specificity) than "N". I have</span><br><span> * left the specificity totals in the code as an artifact; at some point, I will strip it out.</span><br><span>@@ -1914,7 +1914,7 @@</span><br><span> * and MATCHMORE. Only allowed at the end of a pattern.</span><br><span> * In the core routine, ! causes a match with a return code of 2.</span><br><span> * In turn, depending on the search mode: (XXX check if it is implemented)</span><br><span style="color: hsl(0, 100%, 40%);">- * - E_MATCH retuns 1 (does match)</span><br><span style="color: hsl(120, 100%, 40%);">+ * - E_MATCH returns 1 (does match)</span><br><span> * - E_MATCHMORE returns 0 (no match)</span><br><span> * - E_CANMATCH returns 1 (does match)</span><br><span> *</span><br><span>@@ -4010,7 +4010,7 @@</span><br><span> }</span><br><span> hint_new->exten = e;</span><br><span> if (strstr(e->app, "${") && e->exten[0] == '_') {</span><br><span style="color: hsl(0, 100%, 40%);">- /* The hint is dynamic and hasn't been evaluted yet */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The hint is dynamic and hasn't been evaluated yet */</span><br><span> hint_new->laststate = AST_DEVICE_INVALID;</span><br><span> hint_new->last_presence_state = AST_PRESENCE_INVALID;</span><br><span> } else {</span><br><span>@@ -4691,7 +4691,7 @@</span><br><span> </span><br><span> static void *pbx_thread(void *data)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Oh joyeous kernel, we're a new thread, with nothing to do but</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Oh joyous kernel, we're a new thread, with nothing to do but</span><br><span> answer this channel and get it going.</span><br><span> */</span><br><span> /* NOTE:</span><br><span>@@ -4891,7 +4891,7 @@</span><br><span> }</span><br><span> </span><br><span> /*!</span><br><span style="color: hsl(0, 100%, 40%);">- * \note This function locks contexts list by &conlist, search for the rigt context</span><br><span style="color: hsl(120, 100%, 40%);">+ * \note This function locks contexts list by &conlist, search for the right context</span><br><span> * structure, leave context list locked and call ast_context_remove_switch2</span><br><span> * which removes switch, unlock contexts list and return ...</span><br><span> */</span><br><span>@@ -6608,7 +6608,7 @@</span><br><span> if (!hint) {</span><br><span> /*</span><br><span> * Notify watchers of this removed hint later when we aren't</span><br><span style="color: hsl(0, 100%, 40%);">- * encumberd by so many locks.</span><br><span style="color: hsl(120, 100%, 40%);">+ * encumbered by so many locks.</span><br><span> */</span><br><span> AST_LIST_INSERT_HEAD(&hints_removed, saved_hint, list);</span><br><span> } else {</span><br><span>@@ -7353,7 +7353,7 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* If we are adding a hint evalulate in variables and global variables */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If we are adding a hint evaluate in variables and global variables */</span><br><span> if (priority == PRIORITY_HINT && strstr(application, "${") && extension[0] != '_') {</span><br><span> int inhibited;</span><br><span> struct ast_channel *c = ast_dummy_channel_alloc();</span><br><span>diff --git a/main/pbx_functions.c b/main/pbx_functions.c</span><br><span>index bb3c663..08cc191 100644</span><br><span>--- a/main/pbx_functions.c</span><br><span>+++ b/main/pbx_functions.c</span><br><span>@@ -144,7 +144,7 @@</span><br><span> {</span><br><span> struct ast_custom_function *acf;</span><br><span> /* Maximum number of characters added by terminal coloring is 22 */</span><br><span style="color: hsl(0, 100%, 40%);">- char infotitle[64 + AST_MAX_APP + 22], syntitle[40], destitle[40], argtitle[40], seealsotitle[40];</span><br><span style="color: hsl(120, 100%, 40%);">+ char infotitle[64 + AST_MAX_APP + 22], syntitle[40], desctitle[40], argtitle[40], seealsotitle[40];</span><br><span> char info[64 + AST_MAX_APP], *synopsis = NULL, *description = NULL, *seealso = NULL;</span><br><span> char stxtitle[40], *syntax = NULL, *arguments = NULL;</span><br><span> int syntax_size, description_size, synopsis_size, arguments_size, seealso_size;</span><br><span>@@ -181,7 +181,7 @@</span><br><span> snprintf(info, sizeof(info), "\n -= Info about function '%s' =- \n\n", acf->name);</span><br><span> term_color(infotitle, info, COLOR_MAGENTA, 0, sizeof(infotitle));</span><br><span> term_color(syntitle, "[Synopsis]\n", COLOR_MAGENTA, 0, 40);</span><br><span style="color: hsl(0, 100%, 40%);">- term_color(destitle, "[Description]\n", COLOR_MAGENTA, 0, 40);</span><br><span style="color: hsl(120, 100%, 40%);">+ term_color(desctitle, "[Description]\n", COLOR_MAGENTA, 0, 40);</span><br><span> term_color(stxtitle, "[Syntax]\n", COLOR_MAGENTA, 0, 40);</span><br><span> term_color(argtitle, "[Arguments]\n", COLOR_MAGENTA, 0, 40);</span><br><span> term_color(seealsotitle, "[See Also]\n", COLOR_MAGENTA, 0, 40);</span><br><span>@@ -225,7 +225,7 @@</span><br><span> }</span><br><span> </span><br><span> ast_cli(a->fd, "%s%s%s\n\n%s%s\n\n%s%s\n\n%s%s\n\n%s%s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- infotitle, syntitle, synopsis, destitle, description,</span><br><span style="color: hsl(120, 100%, 40%);">+ infotitle, syntitle, synopsis, desctitle, description,</span><br><span> stxtitle, syntax, argtitle, arguments, seealsotitle, seealso);</span><br><span> </span><br><span> ast_free(arguments);</span><br><span>diff --git a/main/say.c b/main/say.c</span><br><span>index 875d4e2..bb0c0a6 100644</span><br><span>--- a/main/say.c</span><br><span>+++ b/main/say.c</span><br><span>@@ -953,18 +953,18 @@</span><br><span> * - 3,4,...,20</span><br><span> * - 30,40,...,90</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * - hundereds - 100 - sto, 200 - 2ste, 300,400 3,4sta, 500,600,...,900 5,6,...9set</span><br><span style="color: hsl(120, 100%, 40%);">+ * - hundreds - 100 - sto, 200 - 2ste, 300,400 3,4sta, 500,600,...,900 5,6,...9set</span><br><span> *</span><br><span> * for each number 10^(3n + 3) exist 3 files represented as:</span><br><span style="color: hsl(0, 100%, 40%);">- * 1 tousand = jeden tisic = 1_E3</span><br><span style="color: hsl(0, 100%, 40%);">- * 2,3,4 tousands = dva,tri,ctyri tisice = 2-3_E3</span><br><span style="color: hsl(0, 100%, 40%);">- * 5,6,... tousands = pet,sest,... tisic = 5_E3</span><br><span style="color: hsl(120, 100%, 40%);">+ * 1 thousand = jeden tisic = 1_E3</span><br><span style="color: hsl(120, 100%, 40%);">+ * 2,3,4 thousands = dva,tri,ctyri tisice = 2-3_E3</span><br><span style="color: hsl(120, 100%, 40%);">+ * 5,6,... thousands = pet,sest,... tisic = 5_E3</span><br><span> *</span><br><span> * million = _E6</span><br><span> * miliard = _E9</span><br><span> * etc...</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * tousand, milion are gender male, so 1 and 2 is 1m 2m</span><br><span style="color: hsl(120, 100%, 40%);">+ * thousand, milion are gender male, so 1 and 2 is 1m 2m</span><br><span> * miliard is gender female, so 1 and 2 is 1w 2w</span><br><span> */</span><br><span> static int ast_say_number_full_cs(struct ast_channel *chan, int num, const char *ints, const char *language, const char *options, int audiofd, int ctrlfd)</span><br><span>@@ -973,7 +973,7 @@</span><br><span> int playh = 0;</span><br><span> char fn[256] = "";</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int hundered = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ int hundred = 0;</span><br><span> int left = 0;</span><br><span> int length = 0;</span><br><span> </span><br><span>@@ -1004,22 +1004,22 @@</span><br><span> snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);</span><br><span> num %= 10;</span><br><span> } else if (num < 1000) {</span><br><span style="color: hsl(0, 100%, 40%);">- hundered = num / 100;</span><br><span style="color: hsl(0, 100%, 40%);">- if ( hundered == 1 ) {</span><br><span style="color: hsl(120, 100%, 40%);">+ hundred = num / 100;</span><br><span style="color: hsl(120, 100%, 40%);">+ if ( hundred == 1 ) {</span><br><span> ast_copy_string(fn, "digits/1sto", sizeof(fn));</span><br><span style="color: hsl(0, 100%, 40%);">- } else if ( hundered == 2 ) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if ( hundred == 2 ) {</span><br><span> ast_copy_string(fn, "digits/2ste", sizeof(fn));</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- res = ast_say_number_full_cs(chan, hundered, ints, language, options, audiofd, ctrlfd);</span><br><span style="color: hsl(120, 100%, 40%);">+ res = ast_say_number_full_cs(chan, hundred, ints, language, options, audiofd, ctrlfd);</span><br><span> if (res)</span><br><span> return res;</span><br><span style="color: hsl(0, 100%, 40%);">- if (hundered == 3 || hundered == 4) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (hundred == 3 || hundred == 4) {</span><br><span> ast_copy_string(fn, "digits/sta", sizeof(fn));</span><br><span style="color: hsl(0, 100%, 40%);">- } else if ( hundered > 4 ) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if ( hundred > 4 ) {</span><br><span> ast_copy_string(fn, "digits/set", sizeof(fn));</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- num -= (hundered * 100);</span><br><span style="color: hsl(120, 100%, 40%);">+ num -= (hundred * 100);</span><br><span> } else { /* num > 1000 */</span><br><span> length = (int)log10(num)+1;</span><br><span> while ( (length % 3 ) != 1 ) {</span><br><span>@@ -1038,7 +1038,7 @@</span><br><span> if (res)</span><br><span> return res;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if ( left >= 5 ) { /* >= 5 have the same declesion */</span><br><span style="color: hsl(120, 100%, 40%);">+ if ( left >= 5 ) { /* >= 5 have the same declension */</span><br><span> snprintf(fn, sizeof(fn), "digits/5_E%d", length - 1);</span><br><span> } else if ( left >= 2 && left <= 4 ) {</span><br><span> snprintf(fn, sizeof(fn), "digits/2-4_E%d", length - 1);</span><br><span>@@ -1976,7 +1976,7 @@</span><br><span> Like english, numbers up to 20 are a single 'word', and others</span><br><span> compound, but with exceptions.</span><br><span> For example 21 is not twenty-one, but there is a single word in 'it'.</span><br><span style="color: hsl(0, 100%, 40%);">- Idem for 28 (ie when a the 2nd part of a compund number</span><br><span style="color: hsl(120, 100%, 40%);">+ Idem for 28 (ie when a the 2nd part of a compound number</span><br><span> starts with a vowel)</span><br><span> </span><br><span> There are exceptions also for hundred, thousand and million.</span><br><span>@@ -5536,7 +5536,7 @@</span><br><span> * ast_say_number_full_he mean, but it seems</span><br><span> * safe to pass -1 there.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * At least in one of the pathes :-(</span><br><span style="color: hsl(120, 100%, 40%);">+ * At least in one of the paths :-(</span><br><span> */</span><br><span> res = ast_say_number_full_he(chan, tm.tm_mday, ints, lang, "m", -1, -1);</span><br><span> break;</span><br><span>@@ -5544,7 +5544,7 @@</span><br><span> res = ast_say_number_full_he(chan, tm.tm_year + 1900, ints, lang, "f", -1, -1);</span><br><span> break;</span><br><span> case 'I':</span><br><span style="color: hsl(0, 100%, 40%);">- case 'l': /* 12-Hour -> we do not support 12 hour based langauges in Hebrew */</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'l': /* 12-Hour -> we do not support 12 hour based languages in Hebrew */</span><br><span> case 'H':</span><br><span> case 'k': /* 24-Hour */</span><br><span> res = ast_say_number_full_he(chan, tm.tm_hour, ints, lang, "f", -1, -1);</span><br><span>@@ -8254,7 +8254,7 @@</span><br><span> and digits/hundred-100 to utter "ekaton"</span><br><span> -> digits/hundred-[100...1000] :: A pronunciation of hundreds from 100 to 1000 e.g 400 =</span><br><span> "terakosia". Here again we use hundreds/1000 for "xilia"</span><br><span style="color: hsl(0, 100%, 40%);">- and digits/thousnds for "xiliades"</span><br><span style="color: hsl(120, 100%, 40%);">+ and digits/thousands for "xiliades"</span><br><span> */</span><br><span> static int ast_say_number_full_gr(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd)</span><br><span> {</span><br><span>@@ -8476,7 +8476,7 @@</span><br><span> * A list of the files that you need to create</span><br><span> * - digits/female/1..4 : "Mia, dyo , treis, tesseris "</span><br><span> * - digits/kai : "KAI"</span><br><span style="color: hsl(0, 100%, 40%);">- * - didgits : "h wra"</span><br><span style="color: hsl(120, 100%, 40%);">+ * - digits : "h wra"</span><br><span> * - digits/p-m : "meta meshmbrias"</span><br><span> * - digits/a-m : "pro meshmbrias"</span><br><span> */</span><br><span>@@ -9732,7 +9732,7 @@</span><br><span> * They are the genative singular which we represent with the suffix "x1" and</span><br><span> * the genative plural which we represent with the suffix "x2". The base names</span><br><span> * of the soundfiles remain in English. For example:</span><br><span style="color: hsl(0, 100%, 40%);">- * - 1 degree (soudfile says "gradus")</span><br><span style="color: hsl(120, 100%, 40%);">+ * - 1 degree (soundfile says "gradus")</span><br><span> * - 2 degreex1 (soundfile says "gradusa")</span><br><span> * - 5 degreex2 (soundfile says "gradusov")</span><br><span> */</span><br><span>diff --git a/main/smoother.c b/main/smoother.c</span><br><span>index 5c58f83..ba45af4 100644</span><br><span>--- a/main/smoother.c</span><br><span>+++ b/main/smoother.c</span><br><span>@@ -205,7 +205,7 @@</span><br><span> /* Move remaining data to the front if applicable */</span><br><span> if (s->len) {</span><br><span> /* In principle this should all be fine because if we are sending</span><br><span style="color: hsl(0, 100%, 40%);">- G.729 VAD, the next timestamp will take over anyawy */</span><br><span style="color: hsl(120, 100%, 40%);">+ G.729 VAD, the next timestamp will take over anyway */</span><br><span> memmove(s->data, s->data + len, s->len);</span><br><span> if (!ast_tvzero(s->delivery)) {</span><br><span> /* If we have delivery time, increment it, otherwise, leave it at 0 */</span><br><span>diff --git a/main/stasis_cache.c b/main/stasis_cache.c</span><br><span>index 51b2c5a..9c8f8e7 100644</span><br><span>--- a/main/stasis_cache.c</span><br><span>+++ b/main/stasis_cache.c</span><br><span>@@ -463,7 +463,7 @@</span><br><span> *</span><br><span> * \return Previous stasis entry snapshot.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct stasis_message *cache_udpate(struct stasis_cache_entry *cached_entry, const struct ast_eid *eid, struct stasis_message *new_snapshot)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct stasis_message *cache_update(struct stasis_cache_entry *cached_entry, const struct ast_eid *eid, struct stasis_message *new_snapshot)</span><br><span> {</span><br><span> struct stasis_message *old_snapshot;</span><br><span> int is_remote;</span><br><span>@@ -528,7 +528,7 @@</span><br><span> }</span><br><span> } else if (cached_entry) {</span><br><span> /* Update snapshot in cache */</span><br><span style="color: hsl(0, 100%, 40%);">- snapshots.old = cache_udpate(cached_entry, eid, new_snapshot);</span><br><span style="color: hsl(120, 100%, 40%);">+ snapshots.old = cache_update(cached_entry, eid, new_snapshot);</span><br><span> } else {</span><br><span> /* Insert into the cache */</span><br><span> cached_entry = cache_entry_create(type, id, new_snapshot);</span><br><span>diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c</span><br><span>index 5134ec2..b1fddee 100644</span><br><span>--- a/main/stdtime/localtime.c</span><br><span>+++ b/main/stdtime/localtime.c</span><br><span>@@ -452,7 +452,7 @@</span><br><span> static int queue_fd = -1;</span><br><span> </span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * static struct state *psx_sp and associated code will guard againt</span><br><span style="color: hsl(120, 100%, 40%);">+ * static struct state *psx_sp and associated code will guard against</span><br><span> * add_notify() called repeatedly for /usr/share/zoneinfo/posixrules</span><br><span> * without zonelist check as a result of some errors</span><br><span> * (any code where tzparse() is called if tzload() fails --</span><br><span>diff --git a/main/stun.c b/main/stun.c</span><br><span>index 7a8e0e5..8007f3a 100644</span><br><span>--- a/main/stun.c</span><br><span>+++ b/main/stun.c</span><br><span>@@ -269,7 +269,7 @@</span><br><span> </span><br><span> /*!</span><br><span> * \internal</span><br><span style="color: hsl(0, 100%, 40%);">- * \brief Compare the STUN tranaction IDs.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Compare the STUN transaction IDs.</span><br><span> *</span><br><span> * \param left Transaction ID.</span><br><span> * \param right Transaction ID.</span><br><span>diff --git a/main/threadpool.c b/main/threadpool.c</span><br><span>index 56fbb2c..c40cb9a 100644</span><br><span>--- a/main/threadpool.c</span><br><span>+++ b/main/threadpool.c</span><br><span>@@ -43,7 +43,7 @@</span><br><span> struct ao2_container *active_threads;</span><br><span> /*!</span><br><span> * \brief The container of idle threads.</span><br><span style="color: hsl(0, 100%, 40%);">- * Idle threads are those that are currenly waiting to run tasks</span><br><span style="color: hsl(120, 100%, 40%);">+ * Idle threads are those that are currently waiting to run tasks</span><br><span> */</span><br><span> struct ao2_container *idle_threads;</span><br><span> /*!</span><br><span>diff --git a/main/time.c b/main/time.c</span><br><span>index b2a7868..266c5cf 100644</span><br><span>--- a/main/time.c</span><br><span>+++ b/main/time.c</span><br><span>@@ -97,7 +97,7 @@</span><br><span> }</span><br><span> </span><br><span> /*!</span><br><span style="color: hsl(0, 100%, 40%);">- * \brief Create a timeval first onverting the given microsecond value</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Create a timeval first converting the given microsecond value</span><br><span> * into seconds and microseconds</span><br><span> *</span><br><span> * \param usec microsecond value</span><br><span>diff --git a/main/translate.c b/main/translate.c</span><br><span>index 27e73f6..ecde434 100644</span><br><span>--- a/main/translate.c</span><br><span>+++ b/main/translate.c</span><br><span>@@ -65,7 +65,7 @@</span><br><span> /*!</span><br><span> * \brief a matrix that, for any pair of supported formats,</span><br><span> * indicates the total cost of translation and the first step.</span><br><span style="color: hsl(0, 100%, 40%);">- * The full path can be reconstricted iterating on the matrix</span><br><span style="color: hsl(120, 100%, 40%);">+ * The full path can be reconstructed iterating on the matrix</span><br><span> * until step->dstfmt == desired_format.</span><br><span> *</span><br><span> * Array indexes are 'src' and 'dest', in that order.</span><br><span>diff --git a/main/udptl.c b/main/udptl.c</span><br><span>index 555ae69..7a0aa84 100644</span><br><span>--- a/main/udptl.c</span><br><span>+++ b/main/udptl.c</span><br><span>@@ -694,7 +694,7 @@</span><br><span> }</span><br><span> /* Encode the error recovery type */</span><br><span> buf[len++] = 0x80;</span><br><span style="color: hsl(0, 100%, 40%);">- /* Span is defined as an inconstrained integer, which it dumb. It will only</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Span is defined as an unconstrained integer, which it dumb. It will only</span><br><span> ever be a small value. Treat it as such. */</span><br><span> buf[len++] = 1;</span><br><span> buf[len++] = span;</span><br><span>diff --git a/main/utils.c b/main/utils.c</span><br><span>index c6e71d9..f4a026d 100644</span><br><span>--- a/main/utils.c</span><br><span>+++ b/main/utils.c</span><br><span>@@ -1215,11 +1215,11 @@</span><br><span> with for this lock?</span><br><span> </span><br><span> To answer such questions, just call this routine before you would normally try</span><br><span style="color: hsl(0, 100%, 40%);">- to aquire a lock. It doesn't do anything if the lock is not acquired. If the</span><br><span style="color: hsl(120, 100%, 40%);">+ to acquire a lock. It doesn't do anything if the lock is not acquired. If the</span><br><span> lock is taken, it will publish a line or two to the console via ast_log().</span><br><span> </span><br><span> Sometimes, the lock message is pretty uninformative. For instance, you might</span><br><span style="color: hsl(0, 100%, 40%);">- find that the lock is being aquired deep within the astobj2 code; this tells</span><br><span style="color: hsl(120, 100%, 40%);">+ find that the lock is being acquired deep within the astobj2 code; this tells</span><br><span> you little about higher level routines that call the astobj2 routines.</span><br><span> But, using gdb, you can set a break at the ast_log below, and for that</span><br><span> breakpoint, you can set the commands:</span><br><span>@@ -2454,7 +2454,7 @@</span><br><span> if (i->field) {</span><br><span> ast_string_field_ptr_set(d, i->field, src);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Special cases that require additional procesing */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Special cases that require additional processing */</span><br><span> if (!strcasecmp(i->key, "algorithm=")) {</span><br><span> if (strcasecmp(src, "MD5")) {</span><br><span> ast_log(LOG_WARNING, "Digest algorithm: \"%s\" not supported.\n", src);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17466">change 17466</a>. To unsubscribe, or for help writing mail filters, 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/c/asterisk/+/17466"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: I926ba4b11e9f6dd3fdd93170ab1f9b997910be70 </div>
<div style="display:none"> Gerrit-Change-Number: 17466 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Josh Soref <jsoref@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>