arehbein submitted this change.

View Change

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(-)

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 change 32073. To unsubscribe, or for help writing mail filters, visit settings.