[MERGED] osmo-bts[master]: litecell15/tch.c: Clean up use of empty buffer

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged.

Change subject: litecell15/tch.c: Clean up use of empty buffer
......................................................................


litecell15/tch.c: Clean up use of empty buffer

Make code easier to read and avoid reading first byte of the buffer if size is 0.

Change-Id: Ib9ee967c0f42098b3a0569e9d84f23832eb4f2d5
---
M src/osmo-bts-litecell15/tch.c
1 file changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-litecell15/tch.c b/src/osmo-bts-litecell15/tch.c
index ffc1eb3..8bed695 100644
--- a/src/osmo-bts-litecell15/tch.c
+++ b/src/osmo-bts-litecell15/tch.c
@@ -361,9 +361,7 @@
 {
 	GsmL1_Prim_t *l1p = msgb_l1prim(l1p_msg);
 	GsmL1_PhDataInd_t *data_ind = &l1p->u.phDataInd;
-	uint8_t payload_type = data_ind->msgUnitParam.u8Buffer[0];
-	uint8_t *payload = data_ind->msgUnitParam.u8Buffer + 1;
-	uint8_t payload_len, sid_first[9] = { 0 };
+	uint8_t *payload, payload_type, payload_len, sid_first[9] = { 0 };
 	struct msgb *rmsg = NULL;
 	struct gsm_lchan *lchan = &trx->ts[L1SAP_CHAN2TS(chan_nr)].lchan[l1sap_chan2ss(chan_nr)];
 
@@ -375,6 +373,9 @@
 			chan_nr);
 		return -EINVAL;
 	}
+
+	payload_type = data_ind->msgUnitParam.u8Buffer[0];
+	payload = data_ind->msgUnitParam.u8Buffer + 1;
 	payload_len = data_ind->msgUnitParam.u8Size - 1;
 
 	switch (payload_type) {

-- 
To view, visit https://gerrit.osmocom.org/3076
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9ee967c0f42098b3a0569e9d84f23832eb4f2d5
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>