<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12290">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx/loops.c: Make code control flow more readable<br><br>Use the 'else' construct where applicable to avoid too many return paths<br>from functions<br><br>Change-Id: I819f0c80e90855e8b3252795c837f8e3053b6e87<br>Related: OS#1622, OS#1851<br>---<br>M src/osmo-bts-trx/loops.c<br>1 file changed, 9 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/90/12290/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c</span><br><span>index e9bc560..a0b979a 100644</span><br><span>--- a/src/osmo-bts-trx/loops.c</span><br><span>+++ b/src/osmo-bts-trx/loops.c</span><br><span>@@ -78,19 +78,15 @@</span><br><span> if (lchan->ms_power_ctrl.current == new_power) {</span><br><span> LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping MS new_power at control level %d (%d dBm)\n",</span><br><span> new_power, ms_pwr_dbm(band, new_power));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS new_power from control level %d (%d dBm) to %d (%d dBm)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ (diff > 0) ? "Raising" : "Lowering",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current),</span><br><span style="color: hsl(120, 100%, 40%);">+ new_power, ms_pwr_dbm(band, new_power));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* store the resulting new MS power level in the lchan */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.current = new_power;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS new_power from control level %d (%d dBm) to %d (%d dBm)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- (diff > 0) ? "Raising" : "Lowering",</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current),</span><br><span style="color: hsl(0, 100%, 40%);">- new_power, ms_pwr_dbm(band, new_power));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* store the resulting new MS power level in the lchan */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.current = new_power;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span> }</span><br><span> </span><br><span> /*! Input a new RSSI value into the MS power control loop for the given logical channel.</span><br><span>@@ -110,8 +106,7 @@</span><br><span> chan_state->meas.rssi_got_burst = 1;</span><br><span> </span><br><span> /* store and process RSSI */</span><br><span style="color: hsl(0, 100%, 40%);">- if (chan_state->meas.rssi_valid_count</span><br><span style="color: hsl(0, 100%, 40%);">- == ARRAY_SIZE(chan_state->meas.rssi))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (chan_state->meas.rssi_valid_count == ARRAY_SIZE(chan_state->meas.rssi))</span><br><span> return;</span><br><span> chan_state->meas.rssi[chan_state->meas.rssi_valid_count++] = rssi;</span><br><span> chan_state->meas.rssi_valid_count++;</span><br><span>@@ -293,11 +288,7 @@</span><br><span> chan_state->dl_cmr - 1);</span><br><span> chan_state->dl_cmr--;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* upgrade */</span><br><span style="color: hsl(0, 100%, 40%);">- if (chan_state->dl_cmr < chan_state->codecs - 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (chan_state->dl_cmr < chan_state->codecs - 1) {</span><br><span> /* degrade, if ber is above threshold FIXME: C/I*/</span><br><span> if (ber <</span><br><span> lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].threshold</span><br><span>@@ -307,8 +298,6 @@</span><br><span> chan_state->dl_cmr + 1);</span><br><span> chan_state->dl_cmr++;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12290">change 12290</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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.osmocom.org/12290"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I819f0c80e90855e8b3252795c837f8e3053b6e87 </div>
<div style="display:none"> Gerrit-Change-Number: 12290 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>