[MERGED] osmo-msc[master]: cosmetic: rx_bssmap: read message type once into local var

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: cosmetic: rx_bssmap: read message type once into local var
......................................................................


cosmetic: rx_bssmap: read message type once into local var

Instead of referencing msg->l3h[0] all the time, use local variable msg_type.

Related: OS#3122
Change-Id: If70c9fa00edd462d3470bded6eb2c6521e4d9234
---
M src/libmsc/a_iface_bssap.c
1 file changed, 6 insertions(+), 4 deletions(-)

Approvals:
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c
index 3c1bcc8..743814c 100644
--- a/src/libmsc/a_iface_bssap.c
+++ b/src/libmsc/a_iface_bssap.c
@@ -554,11 +554,13 @@
 	struct gsm_subscriber_connection *conn;
 	struct tlv_parsed tp;
 	int rc;
+	uint8_t msg_type;
 
 	if (msgb_l3len(msg) < 1) {
 		LOGP(DBSSAP, LOGL_NOTICE, "Error: No data received -- discarding message!\n");
 		return -1;
 	}
+	msg_type = msg->l3h[0];
 
 	rc = tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l3h + 1, msgb_l3len(msg) - 1, 0, 0);
 	if (rc < 0) {
@@ -568,7 +570,7 @@
 	}
 
 	/* Only message types allowed without a 'conn' */
-	switch (msg->l3h[0]) {
+	switch (msg_type) {
 	case BSS_MAP_MSG_COMPLETE_LAYER_3:
 		return bssmap_rx_l3_compl(scu, a_conn_info, msg, &tp);
 	case BSS_MAP_MSG_CLEAR_COMPLETE:
@@ -583,9 +585,9 @@
 		return -EINVAL;
 	}
 
-	LOGPCONN(conn, LOGL_DEBUG, "Rx BSSMAP DT1 %s\n", gsm0808_bssmap_name(msg->l3h[0]));
+	LOGPCONN(conn, LOGL_DEBUG, "Rx BSSMAP DT1 %s\n", gsm0808_bssmap_name(msg_type));
 
-	switch (msg->l3h[0]) {
+	switch (msg_type) {
 	case BSS_MAP_MSG_CLEAR_RQST:
 		return bssmap_rx_clear_rqst(conn, msg, &tp);
 	case BSS_MAP_MSG_CLASSMARK_UPDATE:
@@ -601,7 +603,7 @@
 	case BSS_MAP_MSG_ASSIGMENT_COMPLETE:
 		return bssmap_rx_ass_compl(conn, msg, &tp);
 	default:
-		LOGPCONN(conn, LOGL_ERROR, "Unimplemented msg type: %s\n", gsm0808_bssmap_name(msg->l3h[0]));
+		LOGPCONN(conn, LOGL_ERROR, "Unimplemented msg type: %s\n", gsm0808_bssmap_name(msg_type));
 		return -EINVAL;
 	}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If70c9fa00edd462d3470bded6eb2c6521e4d9234
Gerrit-PatchSet: 1
Gerrit-Project: osmo-msc
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>
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>