falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/38558?usp=email ) 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/58/38558/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 14befea..b608680 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1983,10 +1983,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 @@ -1997,10 +1996,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); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38558?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ide00e819222bb0173eca42ee3714db7f7e1a6d1e Gerrit-Change-Number: 38558 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon@freecalypso.org>