diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-11-08 17:01:00 +0100 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-11-09 15:50:44 +0000 |
| commit | ac858945ddfb4e62bc9c13b01406811e7c532f20 (patch) | |
| tree | 55cdcb95c5644b89c1c61f8eb483096750e20699 | |
| parent | 89d72d8055191bde798df3fd2be5db17a93193d8 (diff) | |
abis_nm: Rename m_id_len to ease review of forthcoming patches
This function will be merged into another using a "len" variable. This
change makes diffs easier to follow in future patches.
Change-Id: I1be03e31901ccf284e31237a04bb7448d1f22c07
| -rw-r--r-- | src/osmo-bsc/abis_nm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index f75470d40..ef61f9e58 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -470,27 +470,27 @@ static inline const uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, con 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; + uint16_t len = 0; uint8_t adjust = 0, i; abis_nm_tlv_parse(&tp, bts, data, *data_len); if (TLVP_PRES_LEN(&tp, NM_ATT_MANUF_ID, 2)) { - m_id_len = TLVP_LEN(&tp, NM_ATT_MANUF_ID); + len = TLVP_LEN(&tp, NM_ATT_MANUF_ID); /* log potential BTS feature vector overflow */ - if (m_id_len > sizeof(bts->_features_data)) + if (len > sizeof(bts->_features_data)) LOGP(DNM, LOGL_NOTICE, "BTS%u Get Attributes Response: feature vector is truncated to %u bytes\n", bts->nr, MAX_BTS_FEATURES/8); /* check that max. expected BTS attribute is above given feature vector length */ - if (m_id_len > OSMO_BYTES_FOR_BITS(_NUM_BTS_FEAT)) + if (len > OSMO_BYTES_FOR_BITS(_NUM_BTS_FEAT)) LOGP(DNM, LOGL_NOTICE, "BTS%u Get Attributes Response: reported unexpectedly long (%u bytes) " "feature vector - most likely it was compiled against newer BSC headers. " "Consider upgrading your BSC to later version.\n", - bts->nr, m_id_len); + bts->nr, len); memcpy(bts->_features_data, TLVP_VAL(&tp, NM_ATT_MANUF_ID), sizeof(bts->_features_data)); - adjust = m_id_len + 3; /* adjust for parsed TL16V struct */ + adjust = len + 3; /* adjust for parsed TL16V struct */ for (i = 0; i < _NUM_BTS_FEAT; i++) if (osmo_bts_has_feature(&bts->features, i) != osmo_bts_has_feature(&bts->model->features, i)) |