<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20651">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[cosmetic] rest_octets: Follow coding style regarding {}<br><br>As pespin point out, the kernel coding style says:<br><br>Do not unnecessarily use braces where a single statement will do.<br>[...]<br>This does not apply if only one branch of a conditional statement is a single<br>statement; in the latter case use braces in both branches:<br><br>Change-Id: Ia23c4bd018db141ff0afe77fe25678a9b2a395f0<br>---<br>M src/gsm/gsm48_rest_octets.c<br>1 file changed, 46 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/51/20651/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm/gsm48_rest_octets.c b/src/gsm/gsm48_rest_octets.c</span><br><span>index 86f18b7..a527598 100644</span><br><span>--- a/src/gsm/gsm48_rest_octets.c</span><br><span>+++ b/src/gsm/gsm48_rest_octets.c</span><br><span>@@ -46,8 +46,9 @@</span><br><span> if (nch_pos) {</span><br><span> bitvec_set_bit(&bv, H);</span><br><span> bitvec_set_uint(&bv, *nch_pos, 5);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (is1800_net)</span><br><span> bitvec_set_bit(&bv, L);</span><br><span>@@ -134,8 +135,9 @@</span><br><span> /* E-UTRAN_PRIORITY: 3GPP TS 45.008*/</span><br><span> bitvec_set_bit(bv, 1);</span><br><span> bitvec_set_uint(bv, e->prio, 3);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(bv, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* THRESH_E-UTRAN_high */</span><br><span> bitvec_set_uint(bv, e->thresh_hi, 5);</span><br><span>@@ -144,15 +146,17 @@</span><br><span> /* THRESH_E-UTRAN_low: */</span><br><span> bitvec_set_bit(bv, 1);</span><br><span> bitvec_set_uint(bv, e->thresh_lo, 5);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(bv, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (e->qrxlm_valid) {</span><br><span> /* E-UTRAN_QRXLEVMIN: */</span><br><span> bitvec_set_bit(bv, 1);</span><br><span> bitvec_set_uint(bv, e->qrxlm, 5);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(bv, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return true;</span><br><span> }</span><br><span>@@ -404,8 +408,9 @@</span><br><span> if (i < uarfcn_length) {</span><br><span> cu = uarfcn_list[i];</span><br><span> st = i;</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* stop bit - end of Repeated UTRAN FDD Neighbour Cells */</span><br><span>@@ -508,8 +513,9 @@</span><br><span> bitvec_set_uint(bv, sp->cell_resel_off, 6);</span><br><span> bitvec_set_uint(bv, sp->temp_offs, 3);</span><br><span> bitvec_set_uint(bv, sp->penalty_time, 5);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* Append power offset to bitvec */</span><br><span>@@ -519,8 +525,9 @@</span><br><span> if (po->present) {</span><br><span> bitvec_set_bit(bv, H);</span><br><span> bitvec_set_uint(bv, po->power_offset, 2);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* Append GPRS indicator to bitvec */</span><br><span>@@ -532,8 +539,9 @@</span><br><span> bitvec_set_uint(bv, gi->ra_colour, 3);</span><br><span> /* 0 == SI13 in BCCH Norm, 1 == SI13 sent on BCCH Ext */</span><br><span> bitvec_set_bit(bv, gi->si13_position);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* Generate SI3 Rest Octests (Chapter 10.5.2.34 / Table 10.4.72) */</span><br><span>@@ -567,8 +575,9 @@</span><br><span> if (si3->scheduling.present) {</span><br><span> bitvec_set_bit(&bv, H);</span><br><span> bitvec_set_uint(&bv, si3->scheduling.where, 3);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* GPRS Indicator */</span><br><span> append_gprs_ind(&bv, &si3->gprs_ind);</span><br><span>@@ -618,22 +627,25 @@</span><br><span> if (si4->lsa_params.present) {</span><br><span> bitvec_set_bit(&bv, H);</span><br><span> append_lsa_params(&bv, &si4->lsa_params);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* Cell Identity */</span><br><span> if (1) {</span><br><span> bitvec_set_bit(&bv, H);</span><br><span> bitvec_set_uint(&bv, si4->cell_id, 16);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* LSA ID Information */</span><br><span> if (0) {</span><br><span> bitvec_set_bit(&bv, H);</span><br><span> /* FIXME */</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else {</span><br><span> /* L and break indicator */</span><br><span> bitvec_set_bit(&bv, L);</span><br><span>@@ -671,25 +683,29 @@</span><br><span> if (in->pch_nch_info.call_priority_present) {</span><br><span> bitvec_set_bit(&bv, 1);</span><br><span> bitvec_set_uint(&bv, in->pch_nch_info.call_priority, 3);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(&bv, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> bitvec_set_bit(&bv, !!in->pch_nch_info.nln_status_sacch);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (in->vbs_vgcs_options.present) {</span><br><span> bitvec_set_bit(&bv, H);</span><br><span> bitvec_set_bit(&bv, !!in->vbs_vgcs_options.inband_notifications);</span><br><span> bitvec_set_bit(&bv, !!in->vbs_vgcs_options.inband_pagings);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (in->dtm_support.present) {</span><br><span> bitvec_set_bit(&bv, H);</span><br><span> bitvec_set_uint(&bv, in->dtm_support.rac, 8);</span><br><span> bitvec_set_uint(&bv, in->dtm_support.max_lapdm, 3);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (in->band_indicator_1900)</span><br><span> bitvec_set_bit(&bv, H);</span><br><span>@@ -699,8 +715,9 @@</span><br><span> if (in->gprs_ms_txpwr_max_ccch.present) {</span><br><span> bitvec_set_bit(&bv, H);</span><br><span> bitvec_set_uint(&bv, in->gprs_ms_txpwr_max_ccch.max_txpwr, 5);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> bitvec_spare_padding(&bv, (bv.data_len * 8) - 1);</span><br><span> return bv.data_len;</span><br><span>@@ -730,8 +747,9 @@</span><br><span> /* We want to use a RFL number list */</span><br><span> bitvec_set_bit(bv, 1);</span><br><span> /* FIXME: RFL number list */</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(bv, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (0) {</span><br><span> /* We want to use a MA_BITMAP */</span><br><span>@@ -743,8 +761,9 @@</span><br><span> /* We want to provide an ARFCN index list */</span><br><span> bitvec_set_bit(bv, 1);</span><br><span> /* FIXME */</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> bitvec_set_bit(bv, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -973,15 +992,17 @@</span><br><span> sp->cell_resel_off = bitvec_get_uint(&bv, 6);</span><br><span> sp->temp_offs = bitvec_get_uint(&bv, 3);</span><br><span> sp->penalty_time = bitvec_get_uint(&bv, 5);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> sp->present = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* Optional Power Offset */</span><br><span> if (bitvec_get_bit_high(&bv) == H) {</span><br><span> po->present = 1;</span><br><span> po->power_offset = bitvec_get_uint(&bv, 2);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> po->present = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* System Information 2ter Indicator */</span><br><span> if (bitvec_get_bit_high(&bv) == H)</span><br><span>@@ -999,16 +1020,18 @@</span><br><span> if (bitvec_get_bit_high(&bv) == H) {</span><br><span> si3->scheduling.present = 1;</span><br><span> si3->scheduling.where = bitvec_get_uint(&bv, 3);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> si3->scheduling.present = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* GPRS Indicator */</span><br><span> if (bitvec_get_bit_high(&bv) == H) {</span><br><span> gi->present = 1;</span><br><span> gi->ra_colour = bitvec_get_uint(&bv, 3);</span><br><span> gi->si13_position = bitvec_get_uint(&bv, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> gi->present = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* 3G Early Classmark Sending Restriction. If H, then controlled by</span><br><span> * early_cm_ctrl above */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20651">change 20651</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/libosmocore/+/20651"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia23c4bd018db141ff0afe77fe25678a9b2a395f0 </div>
<div style="display:none"> Gerrit-Change-Number: 20651 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>