From 1822b1deb939c28d8ca8078d16c4ab33e8edec90 Mon Sep 17 00:00:00 2001 From: Piotr Jaroszyński Date: Sun, 18 Jul 2010 17:52:43 +0200 Subject: [libc] Add strtoull() Don't implement strtoul() on top of strtoull() as strtoull() is much bigger and only used on linux currently. Instead refactor most of the logic out of strtoul() into static inlines and reuse that. Also put it in a separate object so it won't get linked in. Signed-off-by: Piotr Jaroszyński Signed-off-by: Michael Brown --- src/include/stdlib.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'src/include') diff --git a/src/include/stdlib.h b/src/include/stdlib.h index 254e39b3a..19a7c8e09 100644 --- a/src/include/stdlib.h +++ b/src/include/stdlib.h @@ -5,6 +5,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include #include +#include /***************************************************************************** * @@ -13,7 +14,46 @@ FILE_LICENCE ( GPL2_OR_LATER ); **************************************************************************** */ +static inline int strtoul_base ( const char **pp, int base ) +{ + const char *p = *pp; + + while ( isspace ( *p ) ) + p++; + + if ( base == 0 ) { + base = 10; + if ( *p == '0' ) { + p++; + base = 8; + if ( ( *p | 0x20 ) == 'x' ) { + p++; + base = 16; + } + } + } + + *pp = p; + + return base; +} + +static inline unsigned int strtoul_charval ( unsigned int charval ) +{ + if ( charval >= 'a' ) { + charval = ( charval - 'a' + 10 ); + } else if ( charval >= 'A' ) { + charval = ( charval - 'A' + 10 ); + } else if ( charval <= '9' ) { + charval = ( charval - '0' ); + } + + return charval; +} + extern unsigned long strtoul ( const char *p, char **endp, int base ); +extern unsigned long long strtoull ( const char *p, char **endp, int base ); + /***************************************************************************** * -- cgit v1.2.3-55-g7522