Commit 559b140a authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Linus Torvalds

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: default avatarMichal Nazarewicz <mina86@mina86.com>
Cc: "Yi Yang" <yi.y.yang@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e3f76e33
...@@ -146,19 +146,16 @@ int strict_strtoul(const char *cp, unsigned int base, unsigned long *res) ...@@ -146,19 +146,16 @@ int strict_strtoul(const char *cp, unsigned int base, unsigned long *res)
{ {
char *tail; char *tail;
unsigned long val; unsigned long val;
size_t len;
*res = 0; *res = 0;
len = strlen(cp); if (!*cp)
if (len == 0)
return -EINVAL; return -EINVAL;
val = simple_strtoul(cp, &tail, base); val = simple_strtoul(cp, &tail, base);
if (tail == cp) if (tail == cp)
return -EINVAL; return -EINVAL;
if ((*tail == '\0') || if ((tail[0] == '\0') || (tail[0] == '\n' && tail[1] == '\0')) {
((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) {
*res = val; *res = val;
return 0; return 0;
} }
...@@ -220,18 +217,15 @@ int strict_strtoull(const char *cp, unsigned int base, unsigned long long *res) ...@@ -220,18 +217,15 @@ int strict_strtoull(const char *cp, unsigned int base, unsigned long long *res)
{ {
char *tail; char *tail;
unsigned long long val; unsigned long long val;
size_t len;
*res = 0; *res = 0;
len = strlen(cp); if (!*cp)
if (len == 0)
return -EINVAL; return -EINVAL;
val = simple_strtoull(cp, &tail, base); val = simple_strtoull(cp, &tail, base);
if (tail == cp) if (tail == cp)
return -EINVAL; return -EINVAL;
if ((*tail == '\0') || if ((tail[0] == '\0') || (tail[0] == '\n' && tail[1] == '\0')) {
((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) {
*res = val; *res = val;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment