arehbein has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/32073 )
Change subject: common: Remove redundant checks
......................................................................
common: Remove redundant checks
Remove checks that are performed in gsm_bts_trx_num() already.
Related: OS#5961
Related: OS#5967
Change-Id: I9f21f1a0a9dab897d4fd89ab6b7341ca4aec8b22
---
M src/common/oml.c
1 file changed, 19 insertions(+), 18 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/common/oml.c b/src/common/oml.c
index 5f9feff..4df5372 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -1743,24 +1743,18 @@
mo = &bts->mo;
break;
case NM_OC_RADIO_CARRIER:
- if (obj_inst->trx_nr >= bts->num_trx) {
+ if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr)))
return NULL;
- }
- trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
mo = &trx->mo;
break;
case NM_OC_BASEB_TRANSC:
- if (obj_inst->trx_nr >= bts->num_trx) {
+ if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr)))
return NULL;
- }
- trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
mo = &trx->bb_transc.mo;
break;
case NM_OC_CHANNEL:
- if (obj_inst->trx_nr >= bts->num_trx) {
+ if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr)))
return NULL;
- }
- trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
if (obj_inst->ts_nr >= TRX_NR_TS)
return NULL;
mo = &trx->ts[obj_inst->ts_nr].mo;
@@ -1814,24 +1808,18 @@
obj = bts;
break;
case NM_OC_RADIO_CARRIER:
- if (obj_inst->trx_nr >= bts->num_trx) {
+ if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr)))
return NULL;
- }
- trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
obj = trx;
break;
case NM_OC_BASEB_TRANSC:
- if (obj_inst->trx_nr >= bts->num_trx) {
+ if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr)))
return NULL;
- }
- trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
obj = &trx->bb_transc;
break;
case NM_OC_CHANNEL:
- if (obj_inst->trx_nr >= bts->num_trx) {
+ if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr)))
return NULL;
- }
- trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
if (obj_inst->ts_nr >= TRX_NR_TS)
return NULL;
obj = &trx->ts[obj_inst->ts_nr];
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32073
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I9f21f1a0a9dab897d4fd89ab6b7341ca4aec8b22
Gerrit-Change-Number: 32073
Gerrit-PatchSet: 6
Gerrit-Owner: arehbein <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein <[email protected]>
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
