summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-01-13 01:16:08 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2012-01-13 01:16:08 +0200
commita6409a7dacb82597d1aa0fee8eca63e0f38ee5df (patch)
tree3696d3bb83e6fe56c7e0ec0aa679948c4118dd68
parent91f7452c230bbd958c96014fcb80b9a8527b76e7 (diff)
downloadbluez-a6409a7dacb82597d1aa0fee8eca63e0f38ee5df.tar.gz
eir: Remove unnecessary name_len variable
-rw-r--r--src/eir.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/eir.c b/src/eir.c
index f460438b0..7ae68341e 100644
--- a/src/eir.c
+++ b/src/eir.c
@@ -119,7 +119,6 @@ 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];
- ssize_t name_len;
/* Check for the end of EIR */
if (field_len == 0)
@@ -160,10 +159,8 @@ int eir_parse(struct eir_data *eir, uint8_t *eir_data, uint8_t eir_len)
while (field_len > 1 && eir_data[field_len] == '\0')
field_len--;
- name_len = field_len - 1;
-
if (!g_utf8_validate((char *) &eir_data[2],
- name_len, NULL))
+ field_len -1, NULL))
break;
g_free(eir->name);