<p>Josh Soref has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17067">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">spelling: only<br><br>Change-Id: Ic938737d7ab999b9bedf670070bac9d427fcb3ad<br>---<br>M include/asterisk/bridge.h<br>M main/bridge.c<br>M main/bridge_channel.c<br>M main/translate.c<br>M res/res_pjsip.c<br>5 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/67/17067/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/bridge.h b/include/asterisk/bridge.h</span><br><span>index fa2e251..99a9af6 100644</span><br><span>--- a/include/asterisk/bridge.h</span><br><span>+++ b/include/asterisk/bridge.h</span><br><span>@@ -382,7 +382,7 @@</span><br><span> /*! Number of active channels in the bridge. */</span><br><span> unsigned int num_active;</span><br><span> /*! Number of channels with AST_BRIDGE_CHANNEL_FLAG_LONELY in the bridge. */</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int num_lonely;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int num_lonly;</span><br><span> /*!</span><br><span> * \brief Count of the active temporary requests to inhibit bridge merges.</span><br><span> * Zero if merges are allowed.</span><br><span>diff --git a/main/bridge.c b/main/bridge.c</span><br><span>index b58364a..a01e119 100644</span><br><span>--- a/main/bridge.c</span><br><span>+++ b/main/bridge.c</span><br><span>@@ -1127,7 +1127,7 @@</span><br><span> AST_LIST_INSERT_TAIL(&dummy_bridge.channels, bridge_channel, entry);</span><br><span> dummy_bridge.num_channels++;</span><br><span> if (ast_test_flag(&bridge_channel->features->feature_flags, AST_BRIDGE_CHANNEL_FLAG_LONELY)) {</span><br><span style="color: hsl(0, 100%, 40%);">- dummy_bridge.num_lonely++;</span><br><span style="color: hsl(120, 100%, 40%);">+ dummy_bridge.num_lonly++;</span><br><span> }</span><br><span> if (!bridge_channel->suspended) {</span><br><span> dummy_bridge.num_active++;</span><br><span>@@ -1147,7 +1147,7 @@</span><br><span> AST_LIST_INSERT_TAIL(&bridge->channels, bridge_channel, entry);</span><br><span> dummy_bridge.num_channels--;</span><br><span> if (ast_test_flag(&bridge_channel->features->feature_flags, AST_BRIDGE_CHANNEL_FLAG_LONELY)) {</span><br><span style="color: hsl(0, 100%, 40%);">- dummy_bridge.num_lonely--;</span><br><span style="color: hsl(120, 100%, 40%);">+ dummy_bridge.num_lonly--;</span><br><span> }</span><br><span> if (!bridge_channel->suspended) {</span><br><span> dummy_bridge.num_active--;</span><br><span>diff --git a/main/bridge_channel.c b/main/bridge_channel.c</span><br><span>index 012d2ef..ea77bfb 100644</span><br><span>--- a/main/bridge_channel.c</span><br><span>+++ b/main/bridge_channel.c</span><br><span>@@ -2163,11 +2163,11 @@</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bridge->num_lonely && bridge->num_lonely == bridge->num_channels) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bridge->num_lonly && bridge->num_lonly == bridge->num_channels) {</span><br><span> /*</span><br><span> * This will start a chain reaction where each channel leaving</span><br><span> * enters this function and causes the next to leave as long as</span><br><span style="color: hsl(0, 100%, 40%);">- * there aren't non-lonely channels in the bridge.</span><br><span style="color: hsl(120, 100%, 40%);">+ * there aren't non-lonly channels in the bridge.</span><br><span> */</span><br><span> ast_bridge_channel_leave_bridge(AST_LIST_FIRST(&bridge->channels),</span><br><span> BRIDGE_CHANNEL_STATE_END_NO_DISSOLVE,</span><br><span>@@ -2208,7 +2208,7 @@</span><br><span> --bridge->num_active;</span><br><span> }</span><br><span> if (ast_test_flag(&bridge_channel->features->feature_flags, AST_BRIDGE_CHANNEL_FLAG_LONELY)) {</span><br><span style="color: hsl(0, 100%, 40%);">- --bridge->num_lonely;</span><br><span style="color: hsl(120, 100%, 40%);">+ --bridge->num_lonly;</span><br><span> }</span><br><span> --bridge->num_channels;</span><br><span> AST_LIST_REMOVE(&bridge->channels, bridge_channel, entry);</span><br><span>@@ -2283,7 +2283,7 @@</span><br><span> AST_LIST_INSERT_TAIL(&bridge->channels, bridge_channel, entry);</span><br><span> ++bridge->num_channels;</span><br><span> if (ast_test_flag(&bridge_channel->features->feature_flags, AST_BRIDGE_CHANNEL_FLAG_LONELY)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ++bridge->num_lonely;</span><br><span style="color: hsl(120, 100%, 40%);">+ ++bridge->num_lonly;</span><br><span> }</span><br><span> if (!bridge_channel->suspended) {</span><br><span> ++bridge->num_active;</span><br><span>diff --git a/main/translate.c b/main/translate.c</span><br><span>index 27e73f6..8a08267 100644</span><br><span>--- a/main/translate.c</span><br><span>+++ b/main/translate.c</span><br><span>@@ -755,7 +755,7 @@</span><br><span> * dst formats.</span><br><span> *</span><br><span> * \note This function allows older translators built before the translation cost</span><br><span style="color: hsl(0, 100%, 40%);">- * changed away from using onely computational time to continue to be registered</span><br><span style="color: hsl(120, 100%, 40%);">+ * changed away from using only computational time to continue to be registered</span><br><span> * correctly. It is expected that translators built after the introduction of this</span><br><span> * function will manually assign their own table cost value.</span><br><span> *</span><br><span>diff --git a/res/res_pjsip.c b/res/res_pjsip.c</span><br><span>index c6de853..893431f 100644</span><br><span>--- a/res/res_pjsip.c</span><br><span>+++ b/res/res_pjsip.c</span><br><span>@@ -279,7 +279,7 @@</span><br><span> codec_prefs_incoming_answer = keep: first</span><br><span> </example></span><br><span> <para></span><br><span style="color: hsl(0, 100%, 40%);">- Use the defaults but keep oinly the first codec.</span><br><span style="color: hsl(120, 100%, 40%);">+ Use the defaults but keep only the first codec.</span><br><span> </para></span><br><span> </description></span><br><span> </configOption></span><br><span>@@ -337,7 +337,7 @@</span><br><span> codec_prefs_incoming_answer = keep: first</span><br><span> </example></span><br><span> <para></span><br><span style="color: hsl(0, 100%, 40%);">- Use the defaults but keep oinly the first codec.</span><br><span style="color: hsl(120, 100%, 40%);">+ Use the defaults but keep only the first codec.</span><br><span> </para></span><br><span> </description></span><br><span> </configOption></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17067">change 17067</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/+/17067"/><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: Ic938737d7ab999b9bedf670070bac9d427fcb3ad </div>
<div style="display:none"> Gerrit-Change-Number: 17067 </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>