laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/38558?usp=email )

(

1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: cosmetic: eliminate else-after-return in gsmtap_csd_rlp_process() ......................................................................

cosmetic: eliminate else-after-return in gsmtap_csd_rlp_process()

The code in this function used else-after-return constructs, which are now rejected by the linter for newly committed code. This function needs to be moved to a new source file, which will cause it to be treated as new code by the linter - hence fix this code style issue first.

Change-Id: Ide00e819222bb0173eca42ee3714db7f7e1a6d1e --- M src/common/l1sap.c 1 file changed, 4 insertions(+), 6 deletions(-)

Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved

diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 1abc409..fdbd4bc 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1977,10 +1977,9 @@ if (e7 == 0) { osmo_ubit2pbit_ext(rlp_buf, 0, data, 0, data_len, 1); return; - } else { - osmo_ubit2pbit_ext(rlp_buf, 120, data, 0, data_len, 1); - byte_len = 240/8; } + osmo_ubit2pbit_ext(rlp_buf, 120, data, 0, data_len, 1); + byte_len = 240/8; } else if (lchan->type == GSM_LCHAN_TCH_F && lchan->tch_mode == GSM48_CMODE_DATA_14k5) { /* in this mode we have 290bit MAC blocks containing M1, M2 and 288 data bits; * two of them need to be concatenated to render a @@ -1991,10 +1990,9 @@ if (m1 == 0) { osmo_ubit2pbit_ext(rlp_buf, 0, data, 2, data_len, 1); return; - } else { - osmo_ubit2pbit_ext(rlp_buf, 288, data, 2, data_len, 1); - byte_len = 576/8; } + osmo_ubit2pbit_ext(rlp_buf, 288, data, 2, data_len, 1); + byte_len = 576/8; } else { byte_len = osmo_ubit2pbit_ext(rlp_buf, 0, data, 0, data_len, 1); }