commit 51254bd761d8612f870224a79aa3255d72f4892a
author Claudio Takahasi <claudio.takahasi@openbossa.org> Tue Dec 07 18:33:15 2010 -0300
committer Johan Hedberg <johan.hedberg@nokia.com> Tue Dec 07 23:59:29 2010 +0200
tree ed8cf29a89b26a9b3137f074d09f7aa1e0b769a7
parent deef474b995b8471b534c0059f0de4ad71285791

Make EIR type an optional argument for bt_extract_eir_name

src/adapter.c

diff --git a/src/adapter.c b/src/adapter.c
index 857b2cc..a95e202 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3121,8 +3121,7 @@
 						(GCompareFunc) dev_rssi_cmp);
 
 	if (info->length) {
-		uint8_t type;
-		char *tmp_name = bt_extract_eir_name(info->data, &type);
+		char *tmp_name = bt_extract_eir_name(info->data, NULL);
 		if (tmp_name) {
 			g_free(dev->name);
 			dev->name = tmp_name;

src/glib-helper.c

diff --git a/src/glib-helper.c b/src/glib-helper.c
index 927fb7c..e71841b 100644
--- a/src/glib-helper.c
+++ b/src/glib-helper.c
@@ -744,9 +744,10 @@
 	if (data[0] == 0)
 		return NULL;
 
-	*type = data[1];
+	if (type)
+		*type = data[1];
 
-	switch (*type) {
+	switch (data[1]) {
 	case EIR_NAME_SHORT:
 	case EIR_NAME_COMPLETE:
 		if (!g_utf8_validate((char *) (data + 2), data[0] - 1, NULL))