<p>Josh Soref has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17060">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">spelling: occurred<br><br>Change-Id: I2db6eddea6d11322e1e2c94db1045557be79f87e<br>---<br>M apps/app_meetme.c<br>M channels/chan_dahdi.c<br>M channels/chan_unistim.c<br>M channels/sig_analog.c<br>M funcs/func_strings.c<br>M include/asterisk/config.h<br>M include/asterisk/fskmodem_float.h<br>M include/asterisk/fskmodem_int.h<br>M include/asterisk/json.h<br>M include/asterisk/test.h<br>M res/res_config_ldap.c<br>M res/res_fax.c<br>M res/res_phoneprov.c<br>13 files changed, 15 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/60/17060/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_meetme.c b/apps/app_meetme.c</span><br><span>index ebf69e0..0a78e4e 100644</span><br><span>--- a/apps/app_meetme.c</span><br><span>+++ b/apps/app_meetme.c</span><br><span>@@ -5722,7 +5722,7 @@</span><br><span> if (f->frametype == AST_FRAME_VOICE) {</span><br><span> ast_mutex_lock(&cnf->listenlock);</span><br><span> for (x = 0; x < AST_FRAME_BITS; x++) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Free any translations that have occured */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Free any translations that have occurred */</span><br><span> if (cnf->transframe[x]) {</span><br><span> ast_frfree(cnf->transframe[x]);</span><br><span> cnf->transframe[x] = NULL;</span><br><span>diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c</span><br><span>index b12beeb..75f53ad 100644</span><br><span>--- a/channels/chan_dahdi.c</span><br><span>+++ b/channels/chan_dahdi.c</span><br><span>@@ -8260,7 +8260,7 @@</span><br><span> (p->polarity == POLARITY_REV) &&</span><br><span> ((ast_channel_state(ast) == AST_STATE_UP) || (ast_channel_state(ast) == AST_STATE_RING)) ) {</span><br><span> /* Added log_debug information below to provide a better indication of what is going on */</span><br><span style="color: hsl(0, 100%, 40%);">- ast_debug(1, "Polarity Reversal event occured - DEBUG 1: channel %d, state %u, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %" PRIi64 "\n", p->channel, ast_channel_state(ast), p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) );</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_debug(1, "Polarity Reversal event occurred - DEBUG 1: channel %d, state %u, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %" PRIi64 "\n", p->channel, ast_channel_state(ast), p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) );</span><br><span> </span><br><span> if (ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) > p->polarityonanswerdelay) {</span><br><span> ast_debug(1, "Polarity Reversal detected and now Hanging up on channel %d\n", p->channel);</span><br><span>@@ -8274,7 +8274,7 @@</span><br><span> ast_debug(1, "Ignoring Polarity switch to IDLE on channel %d, state %u\n", p->channel, ast_channel_state(ast));</span><br><span> }</span><br><span> /* Added more log_debug information below to provide a better indication of what is going on */</span><br><span style="color: hsl(0, 100%, 40%);">- ast_debug(1, "Polarity Reversal event occured - DEBUG 2: channel %d, state %u, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %" PRIi64 "\n", p->channel, ast_channel_state(ast), p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) );</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_debug(1, "Polarity Reversal event occurred - DEBUG 2: channel %d, state %u, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %" PRIi64 "\n", p->channel, ast_channel_state(ast), p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) );</span><br><span> break;</span><br><span> default:</span><br><span> ast_debug(1, "Dunno what to do with event %d on channel %d\n", res, p->channel);</span><br><span>@@ -8439,7 +8439,7 @@</span><br><span> /*</span><br><span> * Check to see if the channel is still associated with the same</span><br><span> * private structure. While the Asterisk channel was unlocked</span><br><span style="color: hsl(0, 100%, 40%);">- * the following events may have occured:</span><br><span style="color: hsl(120, 100%, 40%);">+ * the following events may have occurred:</span><br><span> *</span><br><span> * 1) A masquerade may have associated the channel with another</span><br><span> * technology or private structure.</span><br><span>diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c</span><br><span>index 321cb63..ef672fe 100644</span><br><span>--- a/channels/chan_unistim.c</span><br><span>+++ b/channels/chan_unistim.c</span><br><span>@@ -459,7 +459,7 @@</span><br><span> ast_mutex_t lock;</span><br><span> struct sockaddr_in sin; /*!< IP address of the phone */</span><br><span> struct sockaddr_in sout; /*!< IP address of server */</span><br><span style="color: hsl(0, 100%, 40%);">- int timeout; /*!< time-out in ticks : resend packet if no ack was received before the timeout occured */</span><br><span style="color: hsl(120, 100%, 40%);">+ int timeout; /*!< time-out in ticks : resend packet if no ack was received before the timeout occurred */</span><br><span> unsigned short seq_phone; /*!< sequence number for the next packet (when we receive a request) */</span><br><span> unsigned short seq_server; /*!< sequence number for the next packet (when we send a request) */</span><br><span> unsigned short last_seq_ack; /*!< sequence number of the last ACK received */</span><br><span>diff --git a/channels/sig_analog.c b/channels/sig_analog.c</span><br><span>index cc09760..2a19be4 100644</span><br><span>--- a/channels/sig_analog.c</span><br><span>+++ b/channels/sig_analog.c</span><br><span>@@ -3586,7 +3586,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Added more log_debug information below to provide a better indication of what is going on */</span><br><span style="color: hsl(0, 100%, 40%);">- ast_debug(1, "Polarity Reversal event occured - DEBUG 2: channel %d, state %u, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %" PRIi64 "\n", p->channel, ast_channel_state(ast), p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) );</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_debug(1, "Polarity Reversal event occurred - DEBUG 2: channel %d, state %u, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %" PRIi64 "\n", p->channel, ast_channel_state(ast), p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) );</span><br><span> break;</span><br><span> default:</span><br><span> ast_debug(1, "Dunno what to do with event %d on channel %d\n", res, p->channel);</span><br><span>diff --git a/funcs/func_strings.c b/funcs/func_strings.c</span><br><span>index 28fe6e0..10e4300 100644</span><br><span>--- a/funcs/func_strings.c</span><br><span>+++ b/funcs/func_strings.c</span><br><span>@@ -77,7 +77,7 @@</span><br><span> <description></span><br><span> <para>Search the variable named <replaceable>varname</replaceable> for the string <replaceable>value</replaceable></span><br><span> delimited by <replaceable>delim</replaceable> and return a 1-based offset as to its location. If not found</span><br><span style="color: hsl(0, 100%, 40%);">- or an error occured, return <literal>0</literal>.</para></span><br><span style="color: hsl(120, 100%, 40%);">+ or an error occurred, return <literal>0</literal>.</para></span><br><span> <para>The delimiter may be specified as a special or extended ASCII character, by encoding it. The characters</span><br><span> <literal>\n</literal>, <literal>\r</literal>, and <literal>\t</literal> are all recognized as the newline,</span><br><span> carriage return, and tab characters, respectively. Also, octal and hexadecimal specifications are recognized</span><br><span>diff --git a/include/asterisk/config.h b/include/asterisk/config.h</span><br><span>index f53116d..d6047a3 100644</span><br><span>--- a/include/asterisk/config.h</span><br><span>+++ b/include/asterisk/config.h</span><br><span>@@ -959,7 +959,7 @@</span><br><span> * same name.</span><br><span> *</span><br><span> * \retval 0 if a variable was replaced in the list</span><br><span style="color: hsl(0, 100%, 40%);">- * \retval -1 if no replacement occured</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval -1 if no replacement occurred</span><br><span> *</span><br><span> * \note The variable name comparison is performed case-sensitively</span><br><span> * \note If a variable is replaced, its memory is freed.</span><br><span>diff --git a/include/asterisk/fskmodem_float.h b/include/asterisk/fskmodem_float.h</span><br><span>index 3b350fb..614e7ed 100644</span><br><span>--- a/include/asterisk/fskmodem_float.h</span><br><span>+++ b/include/asterisk/fskmodem_float.h</span><br><span>@@ -64,7 +64,7 @@</span><br><span> \return return value is as follows:</span><br><span> \arg 0: Still looking for something...</span><br><span> \arg 1: An output byte was received and stored in outbyte</span><br><span style="color: hsl(0, 100%, 40%);">- \arg -1: An error occured in the transmission</span><br><span style="color: hsl(120, 100%, 40%);">+ \arg -1: An error occurred in the transmission</span><br><span> He must be called with at least 80 bytes of buffer. */</span><br><span> int fsk_serial(fsk_data *fskd, short *buffer, int *len, int *outbyte);</span><br><span> </span><br><span>diff --git a/include/asterisk/fskmodem_int.h b/include/asterisk/fskmodem_int.h</span><br><span>index 6a4db8b..72402ed 100644</span><br><span>--- a/include/asterisk/fskmodem_int.h</span><br><span>+++ b/include/asterisk/fskmodem_int.h</span><br><span>@@ -73,7 +73,7 @@</span><br><span> \return return value is as follows:</span><br><span> \arg 0: Still looking for something...</span><br><span> \arg 1: An output byte was received and stored in outbyte</span><br><span style="color: hsl(0, 100%, 40%);">- \arg -1: An error occured in the transmission</span><br><span style="color: hsl(120, 100%, 40%);">+ \arg -1: An error occurred in the transmission</span><br><span> This must be called with at least 80 bytes of buffer. */</span><br><span> int fsk_serial(fsk_data *fskd, short *buffer, int *len, int *outbyte);</span><br><span> int fskmodem_init(fsk_data *fskd);</span><br><span>diff --git a/include/asterisk/json.h b/include/asterisk/json.h</span><br><span>index 3f485d1..db33a6f 100644</span><br><span>--- a/include/asterisk/json.h</span><br><span>+++ b/include/asterisk/json.h</span><br><span>@@ -844,7 +844,7 @@</span><br><span> * \since 12.0.0</span><br><span> */</span><br><span> struct ast_json_error {</span><br><span style="color: hsl(0, 100%, 40%);">- /*! Line number error occured on */</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Line number error occurred on */</span><br><span> int line;</span><br><span> /*! Character (not byte, can be different for UTF-8) column on which the error occurred. */</span><br><span> int column;</span><br><span>diff --git a/include/asterisk/test.h b/include/asterisk/test.h</span><br><span>index 90e772c..9bd1a28 100644</span><br><span>--- a/include/asterisk/test.h</span><br><span>+++ b/include/asterisk/test.h</span><br><span>@@ -74,7 +74,7 @@</span><br><span> .</span><br><span> .</span><br><span> if (fail) { \\ the following is just some example logic</span><br><span style="color: hsl(0, 100%, 40%);">- ast_test_status_update(test, "an error occured because...");</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_status_update(test, "an error occurred because...");</span><br><span> res = AST_RESULT_FAIL;</span><br><span> } else {</span><br><span> res = AST_RESULT_PASS</span><br><span>diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c</span><br><span>index 135bb05..5465c59 100644</span><br><span>--- a/res/res_config_ldap.c</span><br><span>+++ b/res/res_config_ldap.c</span><br><span>@@ -800,7 +800,7 @@</span><br><span> }</span><br><span> </span><br><span> /*! \brief LDAP base function</span><br><span style="color: hsl(0, 100%, 40%);">- * \return a null terminated array of ast_variable (one per entry) or NULL if no entry is found or if an error occured</span><br><span style="color: hsl(120, 100%, 40%);">+ * \return a null terminated array of ast_variable (one per entry) or NULL if no entry is found or if an error occurred</span><br><span> * caller should free the returned array and ast_variables</span><br><span> * \param entries_count_ptr is a pointer to found entries count (can be NULL)</span><br><span> * \param basedn is the base DN</span><br><span>diff --git a/res/res_fax.c b/res/res_fax.c</span><br><span>index 7d69fc2..2a08325 100644</span><br><span>--- a/res/res_fax.c</span><br><span>+++ b/res/res_fax.c</span><br><span>@@ -1158,7 +1158,7 @@</span><br><span> </span><br><span> /* locate a FAX technology module that can handle said requirements</span><br><span> * Note: the requirements have not yet been finalized as T.38</span><br><span style="color: hsl(0, 100%, 40%);">- * negotiation has not yet occured. */</span><br><span style="color: hsl(120, 100%, 40%);">+ * negotiation has not yet occurred. */</span><br><span> AST_RWLIST_RDLOCK(&faxmodules);</span><br><span> AST_RWLIST_TRAVERSE(&faxmodules, faxmod, list) {</span><br><span> if ((faxmod->tech->caps & details->caps) != details->caps) {</span><br><span>diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c</span><br><span>index ad74ae0..c56da4a 100644</span><br><span>--- a/res/res_phoneprov.c</span><br><span>+++ b/res/res_phoneprov.c</span><br><span>@@ -996,7 +996,7 @@</span><br><span> </span><br><span> out500:</span><br><span> route = unref_route(route);</span><br><span style="color: hsl(0, 100%, 40%);">- ast_http_error(ser, 500, "Internal Error", "An internal error has occured.");</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_http_error(ser, 500, "Internal Error", "An internal error has occurred.");</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17060">change 17060</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/+/17060"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2db6eddea6d11322e1e2c94db1045557be79f87e </div>
<div style="display:none"> Gerrit-Change-Number: 17060 </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-CC: Friendly Automation </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>