From 9b6ad25f08dd8a9db2299cfb2d34d11075e1bbd6 Mon Sep 17 00:00:00 2001 From: Michal Nazarewicz Date: Mon, 9 Aug 2010 17:20:54 -0700 Subject: [PATCH] --- yaml --- r: 207332 b: refs/heads/master c: 559b140a36613bb5b63f258b2ad833dad8cd11d9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/lib/vsprintf.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index a4b1f0955fa3..81084be11389 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3f76e3386ee38e3654e81c2f3933ccca1f2d639 +refs/heads/master: 559b140a36613bb5b63f258b2ad833dad8cd11d9 diff --git a/trunk/lib/vsprintf.c b/trunk/lib/vsprintf.c index 4ee19d0d3910..7af9d841c43b 100644 --- a/trunk/lib/vsprintf.c +++ b/trunk/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; }