From 2f8f4950fcf7b8b40d17fc3999ebede6bc323ee8 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 1 Feb 2011 02:32:46 +0000 Subject: 2011-02-01 Ralf Corsepius * libmisc/stringto/stringtolong.c, libmisc/stringto/stringtolonglong.c, libmisc/stringto/stringtounsignedlong.c, libmisc/stringto/stringtounsignedlonglong.c: Rework. --- cpukit/libmisc/stringto/stringtolong.c | 50 +++++++++++++++++++--- cpukit/libmisc/stringto/stringtolonglong.c | 50 +++++++++++++++++++--- cpukit/libmisc/stringto/stringtounsignedlong.c | 49 ++++++++++++++++++--- cpukit/libmisc/stringto/stringtounsignedlonglong.c | 49 ++++++++++++++++++--- 4 files changed, 172 insertions(+), 26 deletions(-) (limited to 'cpukit/libmisc') diff --git a/cpukit/libmisc/stringto/stringtolong.c b/cpukit/libmisc/stringto/stringtolong.c index 8228888312..9800c537d1 100644 --- a/cpukit/libmisc/stringto/stringtolong.c +++ b/cpukit/libmisc/stringto/stringtolong.c @@ -2,6 +2,8 @@ * COPYRIGHT (c) 2009. * On-Line Applications Research Corporation (OAR). * + * Copyright (c) 2011 Ralf Corsépius, Ulm, Germany. + * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. @@ -13,13 +15,47 @@ #include "config.h" #endif +#include +#include +#include + +#include + /* * Instantiate an error checking wrapper for strtol (long) */ -#define STRING_TO_INTEGER -#define STRING_TO_TYPE long int -#define STRING_TO_NAME rtems_string_to_long -#define STRING_TO_METHOD strtol -#define STRING_TO_MIN LONG_MIN -#define STRING_TO_MAX LONG_MAX -#include "stringto_template.h" + +rtems_status_code rtems_string_to_long ( + const char *s, + long *n, + char **endptr, + int base +) +{ + long result; + char *end; + + if ( !n ) + return RTEMS_INVALID_ADDRESS; + + errno = 0; + *n = 0; + + result = strtol( s, &end, base ); + + if ( endptr ) + *endptr = end; + + if ( end == s ) + return RTEMS_NOT_DEFINED; + + if ( (result == LONG_MAX) && (errno == ERANGE) ) + return RTEMS_INVALID_NUMBER; + + if ( (result == LONG_MIN) && (errno == ERANGE) ) + return RTEMS_INVALID_NUMBER; + + *n = result; + + return RTEMS_SUCCESSFUL; +} diff --git a/cpukit/libmisc/stringto/stringtolonglong.c b/cpukit/libmisc/stringto/stringtolonglong.c index ada88b66fc..206437b658 100644 --- a/cpukit/libmisc/stringto/stringtolonglong.c +++ b/cpukit/libmisc/stringto/stringtolonglong.c @@ -2,6 +2,8 @@ * COPYRIGHT (c) 2009. * On-Line Applications Research Corporation (OAR). * + * Copyright (c) 2011 Ralf Corsépius, Ulm, Germany. + * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. @@ -13,13 +15,47 @@ #include "config.h" #endif +#include +#include +#include + +#include + /* * Instantiate an error checking wrapper for strtoll (long long) */ -#define STRING_TO_INTEGER -#define STRING_TO_TYPE long long -#define STRING_TO_NAME rtems_string_to_long_long -#define STRING_TO_METHOD strtoll -#define STRING_TO_MIN LONG_LONG_MIN -#define STRING_TO_MAX LONG_LONG_MAX -#include "stringto_template.h" + +rtems_status_code rtems_string_to_long_long ( + const char *s, + long long *n, + char **endptr, + int base +) +{ + long long result; + char *end; + + if ( !n ) + return RTEMS_INVALID_ADDRESS; + + errno = 0; + *n = 0; + + result = strtoll( s, &end, base ); + + if ( endptr ) + *endptr = end; + + if ( end == s ) + return RTEMS_NOT_DEFINED; + + if ( (result == LONG_LONG_MAX) && (errno == ERANGE) ) + return RTEMS_INVALID_NUMBER; + + if ( (result == LONG_LONG_MIN) && (errno == ERANGE) ) + return RTEMS_INVALID_NUMBER; + + *n = result; + + return RTEMS_SUCCESSFUL; +} diff --git a/cpukit/libmisc/stringto/stringtounsignedlong.c b/cpukit/libmisc/stringto/stringtounsignedlong.c index 918b665a9a..e26e85f0dc 100644 --- a/cpukit/libmisc/stringto/stringtounsignedlong.c +++ b/cpukit/libmisc/stringto/stringtounsignedlong.c @@ -2,6 +2,8 @@ * COPYRIGHT (c) 2009. * On-Line Applications Research Corporation (OAR). * + * Copyright (c) 2011 Ralf Corsépius, Ulm, Germany. + * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. @@ -13,12 +15,47 @@ #include "config.h" #endif +#include +#include +#include + +#include + /* * Instantiate an error checking wrapper for strtoul (unsigned long) */ -#define STRING_TO_INTEGER -#define STRING_TO_TYPE unsigned long int -#define STRING_TO_NAME rtems_string_to_unsigned_long -#define STRING_TO_METHOD strtoul -#define STRING_TO_MAX ULONG_MAX -#include "stringto_template.h" + +rtems_status_code rtems_string_to_unsigned_long ( + const char *s, + unsigned long *n, + char **endptr, + int base +) +{ + unsigned long result; + char *end; + + if ( !n ) + return RTEMS_INVALID_ADDRESS; + + errno = 0; + *n = 0; + + result = strtoul( s, &end, base ); + + if ( endptr ) + *endptr = end; + + if ( end == s ) + return RTEMS_NOT_DEFINED; + + if ( (result == ULONG_MAX) && (errno == ERANGE) ) + return RTEMS_INVALID_NUMBER; + + if ( (result == 0) && (errno == ERANGE) ) + return RTEMS_INVALID_NUMBER; + + *n = result; + + return RTEMS_SUCCESSFUL; +} diff --git a/cpukit/libmisc/stringto/stringtounsignedlonglong.c b/cpukit/libmisc/stringto/stringtounsignedlonglong.c index 7821902662..e418a64624 100644 --- a/cpukit/libmisc/stringto/stringtounsignedlonglong.c +++ b/cpukit/libmisc/stringto/stringtounsignedlonglong.c @@ -2,6 +2,8 @@ * COPYRIGHT (c) 2009. * On-Line Applications Research Corporation (OAR). * + * Copyright (c) 2011 Ralf Corsépius, Ulm, Germany. + * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. @@ -13,12 +15,47 @@ #include "config.h" #endif +#include +#include +#include + +#include + /* * Instantiate an error checking wrapper for strtoull (unsigned long long) */ -#define STRING_TO_INTEGER -#define STRING_TO_TYPE unsigned long long -#define STRING_TO_NAME rtems_string_to_unsigned_long_long -#define STRING_TO_METHOD strtoull -#define STRING_TO_MAX ULONG_LONG_MAX -#include "stringto_template.h" + +rtems_status_code rtems_string_to_unsigned_long_long ( + const char *s, + unsigned long long *n, + char **endptr, + int base +) +{ + unsigned long long result; + char *end; + + if ( !n ) + return RTEMS_INVALID_ADDRESS; + + errno = 0; + *n = 0; + + result = strtoull( s, &end, base ); + + if ( endptr ) + *endptr = end; + + if ( end == s ) + return RTEMS_NOT_DEFINED; + + if ( (result == ULONG_LONG_MAX) && (errno == ERANGE) ) + return RTEMS_INVALID_NUMBER; + + if ( (result == 0) && (errno == ERANGE) ) + return RTEMS_INVALID_NUMBER; + + *n = result; + + return RTEMS_SUCCESSFUL; +} -- cgit v1.2.3