<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24295">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  dexter: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">select_codecs(): do not confuse bool 'true' with integer value 1<br><br>In practice, '+ true' may result in '+ 1', but that is not type safe. We<br>rely on the number of items added by summing up booleans, rather make it<br>explicitly 1.<br><br>Change-Id: I17a82f4f208203b748ba2d6ace0ddc06f87c1cef<br>---<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>1 file changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>index c3716ce..7a7579b 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>@@ -681,12 +681,12 @@</span><br><span>       case GSM0808_SPEECH_FULL_BM:</span><br><span>                 rc = match_codec_pref(&req->ch_mode_rate[nc], ct, &conn->codec_list, msc, bts,</span><br><span>                                       RATE_PREF_FR);</span><br><span style="color: hsl(0, 100%, 40%);">-            nc += (rc == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+              nc += (rc == 0) ? 1 : 0;</span><br><span>             break;</span><br><span>       case GSM0808_SPEECH_HALF_LM:</span><br><span>                 rc = match_codec_pref(&req->ch_mode_rate[nc], ct, &conn->codec_list, msc, bts,</span><br><span>                                       RATE_PREF_HR);</span><br><span style="color: hsl(0, 100%, 40%);">-            nc += (rc == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+              nc += (rc == 0) ? 1 : 0;</span><br><span>             break;</span><br><span>       case GSM0808_SPEECH_PERM:</span><br><span>    case GSM0808_SPEECH_PERM_NO_CHANGE:</span><br><span>@@ -694,19 +694,19 @@</span><br><span>  case GSM0808_SPEECH_FULL_PREF:</span><br><span>               rc = match_codec_pref(&req->ch_mode_rate[nc], ct, &conn->codec_list, msc, bts,</span><br><span>                                       RATE_PREF_FR);</span><br><span style="color: hsl(0, 100%, 40%);">-            nc += (rc == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+              nc += (rc == 0) ? 1 : 0;</span><br><span>             rc = match_codec_pref(&req->ch_mode_rate[nc], ct, &conn->codec_list, msc, bts,</span><br><span>                                       RATE_PREF_HR);</span><br><span style="color: hsl(0, 100%, 40%);">-            nc += (rc == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+              nc += (rc == 0) ? 1 : 0;</span><br><span>             break;</span><br><span>       case GSM0808_SPEECH_HALF_PREF_NO_CHANGE:</span><br><span>     case GSM0808_SPEECH_HALF_PREF:</span><br><span>               rc = match_codec_pref(&req->ch_mode_rate[nc], ct, &conn->codec_list, msc, bts,</span><br><span>                                       RATE_PREF_HR);</span><br><span style="color: hsl(0, 100%, 40%);">-            nc += (rc == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+              nc += (rc == 0) ? 1 : 0;</span><br><span>             rc = match_codec_pref(&req->ch_mode_rate[nc], ct, &conn->codec_list, msc, bts,</span><br><span>                                       RATE_PREF_FR);</span><br><span style="color: hsl(0, 100%, 40%);">-            nc += (rc == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+              nc += (rc == 0) ? 1 : 0;</span><br><span>             break;</span><br><span>       default:</span><br><span>             rc = -EINVAL;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24295">change 24295</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/c/osmo-bsc/+/24295"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I17a82f4f208203b748ba2d6ace0ddc06f87c1cef </div>
<div style="display:none"> Gerrit-Change-Number: 24295 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>