lib: vsprintf: useless strlen() removed

The strict_strtoul() and strict_strtoull() functions used strlen() to
check argument's length in a situation where it wasn't strictly necessary

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Cc: "Yi Yang" <yi.y.yang@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 4ee19d0d3910b36ad15f88688db46d5d1249fa61..7af9d841c43beea318540340739ac3432b87ed12 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -146,19 +146,16 @@ int strict_strtoul(const char *cp, unsigned int base, unsigned long *res)
 {
        char *tail;
        unsigned long val;
-       size_t len;
 
        *res = 0;
-       len = strlen(cp);
-       if (len == 0)
+       if (!*cp)
                return -EINVAL;
 
        val = simple_strtoul(cp, &tail, base);
        if (tail == cp)
                return -EINVAL;
 
-       if ((*tail == '\0') ||
-               ((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) {
+       if ((tail[0] == '\0') || (tail[0] == '\n' && tail[1] == '\0')) {
                *res = val;
                return 0;
        }
@@ -220,18 +217,15 @@ int strict_strtoull(const char *cp, unsigned int base, unsigned long long *res)
 {
        char *tail;
        unsigned long long val;
-       size_t len;
 
        *res = 0;
-       len = strlen(cp);
-       if (len == 0)
+       if (!*cp)
                return -EINVAL;
 
        val = simple_strtoull(cp, &tail, base);
        if (tail == cp)
                return -EINVAL;
-       if ((*tail == '\0') ||
-               ((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) {
+       if ((tail[0] == '\0') || (tail[0] == '\n' && tail[1] == '\0')) {
                *res = val;
                return 0;
        }