Messages in this thread Patch in this message | | | Date | Thu, 24 Mar 2011 20:52:09 +0200 | From | Alexey Dobriyan <> | Subject | [PATCH] kstrtox: simpler code in _kstrtoull() |
| |
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> ---
lib/kstrtox.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
--- a/lib/kstrtox.c +++ b/lib/kstrtox.c @@ -49,12 +49,9 @@ static int _kstrtoull(const char *s, unsigned int base, unsigned long long *res) val = *s - '0'; else if ('a' <= _tolower(*s) && _tolower(*s) <= 'f') val = _tolower(*s) - 'a' + 10; - else if (*s == '\n') { - if (*(s + 1) == '\0') - break; - else - return -EINVAL; - } else + else if (*s == '\n' && *(s + 1) == '\0') + break; + else return -EINVAL; if (val >= base)
| |