---
lib/bluetooth.c | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/lib/bluetooth.c b/lib/bluetooth.c
index 4af2ef6..875119b 100644
--- a/lib/bluetooth.c
+++ b/lib/bluetooth.c
@@ -118,33 +118,24 @@ int ba2oui(const bdaddr_t *ba, char *str)
int bachk(const char *str)
{
- char tmp[18], *ptr = tmp;
-
if (!str)
return -1;
if (strlen(str) != 17)
return -1;
- memcpy(tmp, str, 18);
-
- while (*ptr) {
- *ptr = toupper(*ptr);
- if (*ptr < '0'|| (*ptr > '9' && *ptr < 'A') || *ptr > 'F')
+ while (*str) {
+ if (!isxdigit(*str++))
return -1;
- ptr++;
- *ptr = toupper(*ptr);
- if (*ptr < '0'|| (*ptr > '9' && *ptr < 'A') || *ptr > 'F')
+ if (!isxdigit(*str++))
return -1;
- ptr++;
- *ptr = toupper(*ptr);
- if (*ptr == 0)
+ if (*str == 0)
break;
- if (*ptr != ':')
+
+ if (*str++ != ':')
return -1;
- ptr++;
}
return 0;
--
1.7.0.4
on behalf of ST-Ericsson
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
