diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2013-01-06 17:50:24 +0200 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-01-06 17:50:24 +0200 |
commit | 2f2a3ede0ed2275718a271caf0ddc89c70737ba1 (patch) | |
tree | b1cb7931ede16059fc7be092b607081243d7d041 /src/eir.c | |
parent | 67a60317056c82fe94d059c21d327215aa5de1e4 (diff) | |
download | bluez-2f2a3ede0ed2275718a271caf0ddc89c70737ba1.tar.gz |
core: Fix missing const qualifier in EIR parsing API
Diffstat (limited to 'src/eir.c')
-rw-r--r-- | src/eir.c | 20 |
1 files changed, 12 insertions, 8 deletions
@@ -53,9 +53,10 @@ void eir_data_free(struct eir_data *eir) eir->randomizer = NULL; } -static void eir_parse_uuid16(struct eir_data *eir, void *data, uint8_t len) +static void eir_parse_uuid16(struct eir_data *eir, const void *data, + uint8_t len) { - uint16_t *uuid16 = data; + const uint16_t *uuid16 = data; uuid_t service; char *uuid_str; unsigned int i; @@ -69,9 +70,10 @@ static void eir_parse_uuid16(struct eir_data *eir, void *data, uint8_t len) } } -static void eir_parse_uuid32(struct eir_data *eir, void *data, uint8_t len) +static void eir_parse_uuid32(struct eir_data *eir, const void *data, + uint8_t len) { - uint32_t *uuid32 = data; + const uint32_t *uuid32 = data; uuid_t service; char *uuid_str; unsigned int i; @@ -85,9 +87,10 @@ static void eir_parse_uuid32(struct eir_data *eir, void *data, uint8_t len) } } -static void eir_parse_uuid128(struct eir_data *eir, uint8_t *data, uint8_t len) +static void eir_parse_uuid128(struct eir_data *eir, const uint8_t *data, + uint8_t len) { - uint8_t *uuid_ptr = data; + const uint8_t *uuid_ptr = data; uuid_t service; char *uuid_str; unsigned int i; @@ -126,7 +129,7 @@ static char *name2utf8(const uint8_t *name, uint8_t len) return g_strdup(utf8_name); } -int eir_parse(struct eir_data *eir, uint8_t *eir_data, uint8_t eir_len) +int eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len) { uint16_t len = 0; @@ -138,7 +141,8 @@ int eir_parse(struct eir_data *eir, uint8_t *eir_data, uint8_t eir_len) while (len < eir_len - 1) { uint8_t field_len = eir_data[0]; - uint8_t data_len, *data = &eir_data[2]; + const uint8_t *data = &eir_data[2]; + uint8_t data_len; /* Check for the end of EIR */ if (field_len == 0) |