diff options
author | Piotr Jaroszyński <p.jaroszynski@gmail.com> | 2010-07-18 17:52:43 +0200 |
---|---|---|
committer | Michael Brown <mcb30@ipxe.org> | 2010-08-19 12:22:07 +0100 |
commit | 1822b1deb939c28d8ca8078d16c4ab33e8edec90 (patch) | |
tree | 4cd3b5f15877093357b3d78761d0770e5740dd22 /src/include/stdlib.h | |
parent | b1fa4378d1dcc68887cbb0f992c7b92f85b03ad5 (diff) | |
download | ipxe-1822b1deb939c28d8ca8078d16c4ab33e8edec90.zip ipxe-1822b1deb939c28d8ca8078d16c4ab33e8edec90.tar.gz ipxe-1822b1deb939c28d8ca8078d16c4ab33e8edec90.tar.bz2 |
[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 <p.jaroszynski@gmail.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include/stdlib.h')
-rw-r--r-- | src/include/stdlib.h | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/src/include/stdlib.h b/src/include/stdlib.h index 254e39b..19a7c8e 100644 --- a/src/include/stdlib.h +++ b/src/include/stdlib.h @@ -5,6 +5,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdint.h> #include <assert.h> +#include <ctype.h> /***************************************************************************** * @@ -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 ); + /***************************************************************************** * |