<p>Josh Soref has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16785">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">spelling: cadence<br><br>Change-Id: Ie4740969444625e66f951c4622c842bbb95de2ec<br>---<br>M channels/chan_dahdi.c<br>1 file changed, 11 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/85/16785/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c</span><br><span>index e750648..3454293 100644</span><br><span>--- a/channels/chan_dahdi.c</span><br><span>+++ b/channels/chan_dahdi.c</span><br><span>@@ -2897,13 +2897,13 @@</span><br><span> *</span><br><span> * \details</span><br><span> * original dialstring:</span><br><span style="color: hsl(0, 100%, 40%);">- * DAHDI/[i<span>-](g|G|r|R)<group#(0-63)>[c|r<cadance#>|d][/extension[/options]]</span><br><span style="color: hsl(120, 100%, 40%);">+ * DAHDI/[i<span>-](g|G|r|R)<group#(0-63)>[c|r<cadence#>|d][/extension[/options]]</span><br><span> *</span><br><span> * The modified dialstring will have prefixed the channel-group section</span><br><span> * with the ISDN channel restriction.</span><br><span> *</span><br><span> * buf:</span><br><span style="color: hsl(0, 100%, 40%);">- * DAHDI/i<span>-(g|G|r|R)<group#(0-63)>[c|r<cadance#>|d][/extension[/options]]</span><br><span style="color: hsl(120, 100%, 40%);">+ * DAHDI/i<span>-(g|G|r|R)<group#(0-63)>[c|r<cadence#>|d][/extension[/options]]</span><br><span> *</span><br><span> * The routine will check to see if the ISDN channel restriction is already</span><br><span> * in the original dialstring.</span><br><span>@@ -13328,8 +13328,8 @@</span><br><span> int rr_starting_point;</span><br><span> /*! ISDN span where channels can be picked (Zero if not specified) */</span><br><span> int span;</span><br><span style="color: hsl(0, 100%, 40%);">- /*! Analog channel distinctive ring cadance index. */</span><br><span style="color: hsl(0, 100%, 40%);">- int cadance;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Analog channel distinctive ring cadence index. */</span><br><span style="color: hsl(120, 100%, 40%);">+ int cadence;</span><br><span> /*! Dialing option. c/r/d if present and valid. */</span><br><span> char opt;</span><br><span> /*! TRUE if to search the channel list backwards. */</span><br><span>@@ -13355,10 +13355,10 @@</span><br><span> /*</span><br><span> * data is ---v</span><br><span> * Dial(DAHDI/pseudo[/extension[/options]])</span><br><span style="color: hsl(0, 100%, 40%);">- * Dial(DAHDI/<channel#>[c|r<cadance#>|d][/extension[/options]])</span><br><span style="color: hsl(0, 100%, 40%);">- * Dial(DAHDI/<subdir>!<channel#>[c|r<cadance#>|d][/extension[/options]])</span><br><span style="color: hsl(120, 100%, 40%);">+ * Dial(DAHDI/<channel#>[c|r<cadence#>|d][/extension[/options]])</span><br><span style="color: hsl(120, 100%, 40%);">+ * Dial(DAHDI/<subdir>!<channel#>[c|r<cadence#>|d][/extension[/options]])</span><br><span> * Dial(DAHDI/i<span>[/extension[/options]])</span><br><span style="color: hsl(0, 100%, 40%);">- * Dial(DAHDI/[i<span>-](g|G|r|R)<group#(0-63)>[c|r<cadance#>|d][/extension[/options]])</span><br><span style="color: hsl(120, 100%, 40%);">+ * Dial(DAHDI/[i<span>-](g|G|r|R)<group#(0-63)>[c|r<cadence#>|d][/extension[/options]])</span><br><span> *</span><br><span> * i - ISDN span channel restriction.</span><br><span> * Used by CC to ensure that the CC recall goes out the same span.</span><br><span>@@ -13371,7 +13371,7 @@</span><br><span> * R - channel group allocation round robin search backward</span><br><span> *</span><br><span> * c - Wait for DTMF digit to confirm answer</span><br><span style="color: hsl(0, 100%, 40%);">- * r<cadance#> - Set distintive ring cadance number</span><br><span style="color: hsl(120, 100%, 40%);">+ * r<cadence#> - Set distintive ring cadence number</span><br><span> * d - Force bearer capability for ISDN/SS7 call to digital.</span><br><span> */</span><br><span> </span><br><span>@@ -13421,7 +13421,7 @@</span><br><span> if (toupper(args.group[0]) == 'G' || toupper(args.group[0])=='R') {</span><br><span> /* Retrieve the group number */</span><br><span> s = args.group + 1;</span><br><span style="color: hsl(0, 100%, 40%);">- res = sscanf(s, "%30d%1c%30d", &x, ¶m->opt, ¶m->cadance);</span><br><span style="color: hsl(120, 100%, 40%);">+ res = sscanf(s, "%30d%1c%30d", &x, ¶m->opt, ¶m->cadence);</span><br><span> if (res < 1) {</span><br><span> ast_log(LOG_WARNING, "Unable to determine group for data %s\n", data);</span><br><span> return NULL;</span><br><span>@@ -13460,7 +13460,7 @@</span><br><span> x = CHAN_PSEUDO;</span><br><span> param->channelmatch = x;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- res = sscanf(s, "%30d%1c%30d", &x, ¶m->opt, ¶m->cadance);</span><br><span style="color: hsl(120, 100%, 40%);">+ res = sscanf(s, "%30d%1c%30d", &x, ¶m->opt, ¶m->cadence);</span><br><span> if (res < 1) {</span><br><span> ast_log(LOG_WARNING, "Unable to determine channel for data %s\n", data);</span><br><span> return NULL;</span><br><span>@@ -13566,7 +13566,7 @@</span><br><span> break;</span><br><span> case 'r':</span><br><span> /* Distinctive ring */</span><br><span style="color: hsl(0, 100%, 40%);">- p->distinctivering = start.cadance;</span><br><span style="color: hsl(120, 100%, 40%);">+ p->distinctivering = start.cadence;</span><br><span> break;</span><br><span> case 'd':</span><br><span> #if defined(HAVE_PRI) || defined(HAVE_SS7)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16785">change 16785</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/+/16785"/><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: Ie4740969444625e66f951c4622c842bbb95de2ec </div>
<div style="display:none"> Gerrit-Change-Number: 16785 </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>