This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Harald Welte gerrit-no-reply at lists.osmocom.orgHarald Welte has submitted this change and it was merged. Change subject: cosmetic: chan_alloc: use switch instead of if-cascade ...................................................................... cosmetic: chan_alloc: use switch instead of if-cascade Preparing cosmetically for a subsequent commit which will add another pchan kind to be checked, rather use a "switch (pchan) {}". Also reverse one if() branch to "early-exit" style. Change-Id: Ie5eb0fa859c4f225616095dc56d52ce0f2dc8bdc --- M openbsc/src/libbsc/chan_alloc.c 1 file changed, 12 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c index 0f4d90a..a50b4ee 100644 --- a/openbsc/src/libbsc/chan_alloc.c +++ b/openbsc/src/libbsc/chan_alloc.c @@ -124,7 +124,8 @@ * to check whether a dynamic timeslot is already in TCH/H mode * and whether one of the two channels is still available. */ - if (pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) { + switch (pchan) { + case GSM_PCHAN_TCH_F_TCH_H_PDCH: if (ts->dyn.pchan_is != ts->dyn.pchan_want) { /* The TS's mode is being switched. Not * available anymore/yet. */ @@ -141,17 +142,19 @@ continue; return ts->lchan; } - if (ts->dyn.pchan_is == dyn_as_pchan) { - /* The requested type matches the dynamic - * timeslot's current mode. A channel may still - * be available (think TCH/H). */ - check_subslots = ts_subslots(ts); - } else - /* Otherwise this slot is not applicable. */ + if (ts->dyn.pchan_is != dyn_as_pchan) + /* not applicable. */ continue; - } else { + /* The requested type matches the dynamic timeslot's + * current mode. A channel may still be available + * (think TCH/H). */ + check_subslots = ts_subslots(ts); + break; + + default: /* Not a dynamic channel, there is only one pchan kind: */ check_subslots = ts_subslots(ts); + break; } /* Is a sub-slot still available? */ -- To view, visit https://gerrit.osmocom.org/1365 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie5eb0fa859c4f225616095dc56d52ce0f2dc8bdc Gerrit-PatchSet: 3 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>