1 files changed, 14 insertions, 33 deletions

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index d7222a9c8267..993599e66e5a 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -31,17 +31,7 @@
 #include <asm/div64.h>
 #include <asm/sections.h>       /* for dereference_function_descriptor() */
 
-static unsigned int simple_guess_base(const char *cp)
-{
-        if (cp[0] == '0') {
-                if (_tolower(cp[1]) == 'x' && isxdigit(cp[2]))
-                        return 16;
-                else
-                        return 8;
-        } else {
-                return 10;
-        }
-}
+#include "kstrtox.h"
 
 /**
  * simple_strtoull - convert a string to an unsigned long long
@@ -51,23 +41,14 @@ static unsigned int simple_guess_base(const char *cp)
  */
 unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base)
 {
-        unsigned long long result = 0;
+        unsigned long long result;
+        unsigned int rv;
 
-        if (!base)
-                base = simple_guess_base(cp);
+        cp = _parse_integer_fixup_radix(cp, &base);
+        rv = _parse_integer(cp, base, &result);
+        /* FIXME */
+        cp += (rv & ~KSTRTOX_OVERFLOW);
 
-        if (base == 16 && cp[0] == '0' && _tolower(cp[1]) == 'x')
-                cp += 2;
-
-        while (isxdigit(*cp)) {
-                unsigned int value;
-
-                value = isdigit(*cp) ? *cp - '0' : _tolower(*cp) - 'a' + 10;
-                if (value >= base)
-                        break;
-                result = result * base + value;
-                cp++;
-        }
         if (endp)
                 *endp = (char *)cp;
 
@@ -566,7 +547,7 @@ char *mac_address_string(char *buf, char *end, u8 *addr,
         }
 
         for (i = 0; i < 6; i++) {
-                p = pack_hex_byte(p, addr[i]);
+                p = hex_byte_pack(p, addr[i]);
                 if (fmt[0] == 'M' && i != 5)
                         *p++ = separator;
         }
@@ -686,13 +667,13 @@ char *ip6_compressed_string(char *p, const char *addr)
                 lo = word & 0xff;
                 if (hi) {
                         if (hi > 0x0f)
-                                p = pack_hex_byte(p, hi);
+                                p = hex_byte_pack(p, hi);
                         else
                                 *p++ = hex_asc_lo(hi);
-                        p = pack_hex_byte(p, lo);
+                        p = hex_byte_pack(p, lo);
                 }
                 else if (lo > 0x0f)
-                        p = pack_hex_byte(p, lo);
+                        p = hex_byte_pack(p, lo);
                 else
                         *p++ = hex_asc_lo(lo);
                 needcolon = true;
@@ -714,8 +695,8 @@ char *ip6_string(char *p, const char *addr, const char *fmt)
         int i;
 
         for (i = 0; i < 8; i++) {
-                p = pack_hex_byte(p, *addr++);
-                p = pack_hex_byte(p, *addr++);
+                p = hex_byte_pack(p, *addr++);
+                p = hex_byte_pack(p, *addr++);
                 if (fmt[0] == 'I' && i != 7)
                         *p++ = ':';
         }
@@ -773,7 +754,7 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
         }
 
         for (i = 0; i < 16; i++) {
-                p = pack_hex_byte(p, addr[index[i]]);
+                p = hex_byte_pack(p, addr[index[i]]);
                 switch (i) {
                 case 3:
                 case 5: