[MERGED] osmo-bsc[master]: compiler warnings: constify in abis_nm.c

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: compiler warnings: constify in abis_nm.c
......................................................................


compiler warnings: constify in abis_nm.c

Constify in- and output arguments for Parse Attribute Response Info chain to
avoid compiler warnings, and more clearly indicate const data in the first
place.

Change-Id: Ib7d069fe1fda69e89dfd171cd76b1ed6d6db0ceb
---
M src/libbsc/abis_nm.c
1 file changed, 5 insertions(+), 4 deletions(-)

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



diff --git a/src/libbsc/abis_nm.c b/src/libbsc/abis_nm.c
index f1a56a6..2c84ba7 100644
--- a/src/libbsc/abis_nm.c
+++ b/src/libbsc/abis_nm.c
@@ -455,7 +455,7 @@
 }
 
 /* Parse Attribute Response Info - return pointer to the actual content */
-static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len)
+static inline const uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, const uint8_t *ari, uint16_t ari_len, uint16_t *out_len)
 {
 	uint8_t num_unreported = ari[0], i;
 
@@ -474,7 +474,7 @@
 }
 
 /* Parse Attribute Response Info content for 3GPP TS 52.021 §9.4.30 Manufacturer Id */
-static inline uint8_t *parse_attr_resp_info_manuf_id(struct gsm_bts *bts, uint8_t *data, uint16_t *data_len)
+static inline const uint8_t *parse_attr_resp_info_manuf_id(struct gsm_bts *bts, const uint8_t *data, uint16_t *data_len)
 {
 	struct tlv_parsed tp;
 	uint16_t m_id_len = 0;
@@ -513,7 +513,7 @@
 }
 
 /* Parse Attribute Response Info content for 3GPP TS 52.021 §9.4.28 Manufacturer Dependent State */
-static inline uint8_t *parse_attr_resp_info_manuf_state(const struct gsm_bts_trx *trx, uint8_t *data, uint16_t *data_len)
+static inline const uint8_t *parse_attr_resp_info_manuf_state(const struct gsm_bts_trx *trx, const uint8_t *data, uint16_t *data_len)
 {
 	struct tlv_parsed tp;
 	const uint8_t *power;
@@ -542,7 +542,8 @@
 	struct e1inp_sign_link *sign_link = mb->dst;
 	struct gsm_bts *bts = trx ? trx->bts : sign_link->trx->bts;
 	struct tlv_parsed tp;
-	uint8_t *data, i;
+	const uint8_t *data;
+	int i;
 	uint16_t data_len;
 	int rc;
 	struct abis_nm_sw_desc sw_descr[MAX_BTS_ATTR];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7d069fe1fda69e89dfd171cd76b1ed6d6db0ceb
Gerrit-PatchSet: 4
Gerrit-Project: osmo-bsc
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>