<p>Josh Soref has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17061">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">spelling: occurrence<br><br>Change-Id: If132dbf6fb373423cdc4c982be1c3fde7a18a93d<br>---<br>M apps/app_minivm.c<br>M apps/app_voicemail.c<br>M contrib/scripts/sip_to_pjsip/astconfigparser.py<br>M include/asterisk/adsi.h<br>M res/res_config_ldap.c<br>M tests/test_dns_srv.c<br>6 files changed, 13 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/61/17061/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_minivm.c b/apps/app_minivm.c</span><br><span>index d83a6e7..b4f1245 100644</span><br><span>--- a/apps/app_minivm.c</span><br><span>+++ b/apps/app_minivm.c</span><br><span>@@ -1204,7 +1204,7 @@</span><br><span> }</span><br><span> </span><br><span> /*!\internal</span><br><span style="color: hsl(0, 100%, 40%);">- * \brief Wraps a character sequence in double quotes, escaping occurences of quotes within the string.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Wraps a character sequence in double quotes, escaping occurrences of quotes within the string.</span><br><span> * \param from The string to work with.</span><br><span> * \param buf The destination buffer to write the modified quoted string.</span><br><span> * \param maxlen Always zero. \see ast_str</span><br><span>diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c</span><br><span>index 77cf0b7..9f7771c 100644</span><br><span>--- a/apps/app_voicemail.c</span><br><span>+++ b/apps/app_voicemail.c</span><br><span>@@ -4954,7 +4954,7 @@</span><br><span> }</span><br><span> </span><br><span> /*!</span><br><span style="color: hsl(0, 100%, 40%);">- * \brief Wraps a character sequence in double quotes, escaping occurences of quotes within the string.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Wraps a character sequence in double quotes, escaping occurrences of quotes within the string.</span><br><span> * \param from The string to work with.</span><br><span> * \param buf The buffer into which to write the modified quoted string.</span><br><span> * \param maxlen Always zero, but see \see ast_str</span><br><span>diff --git a/contrib/scripts/sip_to_pjsip/astconfigparser.py b/contrib/scripts/sip_to_pjsip/astconfigparser.py</span><br><span>index eb48b70..4852d30 100644</span><br><span>--- a/contrib/scripts/sip_to_pjsip/astconfigparser.py</span><br><span>+++ b/contrib/scripts/sip_to_pjsip/astconfigparser.py</span><br><span>@@ -222,7 +222,7 @@</span><br><span> # otherwise it was an embedded comment so combine</span><br><span> return ''.join([part[0].strip(), ' ', line]).rstrip(), False</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # find the first occurence of a comment that is not escaped</span><br><span style="color: hsl(120, 100%, 40%);">+ # find the first occurrence of a comment that is not escaped</span><br><span> match = re.match(r'.*?([^\\];)', line)</span><br><span> </span><br><span> if match:</span><br><span>diff --git a/include/asterisk/adsi.h b/include/asterisk/adsi.h</span><br><span>index 9834b91..a13a359 100644</span><br><span>--- a/include/asterisk/adsi.h</span><br><span>+++ b/include/asterisk/adsi.h</span><br><span>@@ -97,8 +97,8 @@</span><br><span> #define ADSI_START_CLEAR_TIMER 0x9B /* Start / Clear timer */</span><br><span> #define ADSI_SET_SCRIPT_FLAG 0x9C /* Set / clear a script flag */</span><br><span> #define ADSI_JUMP_TO_SUBSCRIPT 0x9D /* Jump to specified subscript */</span><br><span style="color: hsl(0, 100%, 40%);">-#define ADSI_EVENT_22_TRIGGER 0x9E /* Trigger an occurance of event 22 */</span><br><span style="color: hsl(0, 100%, 40%);">-#define ADSI_EVENT_23_TRIGGER 0x9f /* Trigger an occurance of event 23 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define ADSI_EVENT_22_TRIGGER 0x9E /* Trigger an occurrence of event 22 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define ADSI_EVENT_23_TRIGGER 0x9f /* Trigger an occurrence of event 23 */</span><br><span> #define ADSI_EXIT 0xA0 /* Exit the service script interpreter */</span><br><span> #endif</span><br><span> </span><br><span>diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c</span><br><span>index 5465c59..ef618fe 100644</span><br><span>--- a/res/res_config_ldap.c</span><br><span>+++ b/res/res_config_ldap.c</span><br><span>@@ -163,7 +163,7 @@</span><br><span> /*! \brief Count semicolons in string</span><br><span> * \param somestr - pointer to a string</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return number of occurances of the delimiter(semicolon)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \return number of occurrences of the delimiter(semicolon)</span><br><span> */</span><br><span> static int semicolon_count_str(const char *somestr)</span><br><span> {</span><br><span>diff --git a/tests/test_dns_srv.c b/tests/test_dns_srv.c</span><br><span>index db71beb..a8a1455 100644</span><br><span>--- a/tests/test_dns_srv.c</span><br><span>+++ b/tests/test_dns_srv.c</span><br><span>@@ -266,7 +266,7 @@</span><br><span> { 10, 20, 5060, "goose.down" },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int srv_record_occurence[2] = { 0, };</span><br><span style="color: hsl(120, 100%, 40%);">+ int srv_record_occurrence[2] = { 0, };</span><br><span> enum ast_test_result_state res = AST_TEST_PASS;</span><br><span> int count = 0;</span><br><span> </span><br><span>@@ -322,14 +322,14 @@</span><br><span> continue;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- srv_record_occurence[i]++;</span><br><span style="color: hsl(120, 100%, 40%);">+ srv_record_occurrence[i]++;</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span> ast_dns_result_free(result);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (srv_record_occurence[0] > srv_record_occurence[1]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (srv_record_occurrence[0] > srv_record_occurrence[1]) {</span><br><span> ast_test_status_update(test, "SRV sorting resulted in lesser weight being returned more often\n");</span><br><span> res = AST_TEST_FAIL;</span><br><span> }</span><br><span>@@ -355,7 +355,7 @@</span><br><span> };</span><br><span> </span><br><span> int srv_record_priority[4] = { 5, 5, 10, 10 };</span><br><span style="color: hsl(0, 100%, 40%);">- int srv_record_occurence[4] = { 0, };</span><br><span style="color: hsl(120, 100%, 40%);">+ int srv_record_occurrence[4] = { 0, };</span><br><span> enum ast_test_result_state res = AST_TEST_PASS;</span><br><span> int count = 0;</span><br><span> </span><br><span>@@ -421,19 +421,19 @@</span><br><span> continue;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- srv_record_occurence[i]++;</span><br><span style="color: hsl(120, 100%, 40%);">+ srv_record_occurrence[i]++;</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span> ast_dns_result_free(result);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (srv_record_occurence[0] > srv_record_occurence[1]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (srv_record_occurrence[0] > srv_record_occurrence[1]) {</span><br><span> ast_test_status_update(test, "SRV sorting resulted in lesser weight being returned more often for priority 10\n");</span><br><span> res = AST_TEST_FAIL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (srv_record_occurence[3] > srv_record_occurence[2]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (srv_record_occurrence[3] > srv_record_occurrence[2]) {</span><br><span> ast_test_status_update(test, "SRV sorting resulted in lesser weight being returned more often for priority 5\n");</span><br><span> res = AST_TEST_FAIL;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17061">change 17061</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/+/17061"/><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: If132dbf6fb373423cdc4c982be1c3fde7a18a93d </div>
<div style="display:none"> Gerrit-Change-Number: 17061 </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>