Skip to content

Commit

Permalink
lib: vsprintf: useless strlen() removed
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mina86 authored and torvalds committed Aug 10, 2010
1 parent e3f76e3 commit 559b140
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions lib/vsprintf.c
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 559b140

Please sign in to comment.