From 200c94587973c2091a7ad8bc3899e72d8c5b37b4 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 1 Feb 2011 05:55:32 +0000 Subject: [PATCH] 2011-02-01 Ralf Corsepius * libmisc/stringto/stringtounsignedchar.c, libmisc/stringto/stringtounsignedint.c: Reformat range check. --- cpukit/ChangeLog | 2 ++ cpukit/libmisc/stringto/stringtounsignedchar.c | 8 +++----- cpukit/libmisc/stringto/stringtounsignedint.c | 8 +++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index ccb7399719..bc7e59ea5d 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,7 @@ 2011-02-01 Ralf Corsepius + * libmisc/stringto/stringtounsignedchar.c, + libmisc/stringto/stringtounsignedint.c: Reformat range check. * libmisc/Makefile.am: Add stringto/stringtolongdouble.c. * libmisc/stringto/stringtolongdouble.c: New. * libmisc/stringto/stringto.h: Rename header-guard. diff --git a/cpukit/libmisc/stringto/stringtounsignedchar.c b/cpukit/libmisc/stringto/stringtounsignedchar.c index 6bd28c6494..5223b03fb7 100644 --- a/cpukit/libmisc/stringto/stringtounsignedchar.c +++ b/cpukit/libmisc/stringto/stringtounsignedchar.c @@ -49,11 +49,9 @@ rtems_status_code rtems_string_to_unsigned_char ( 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; + if ( ( errno == ERANGE ) && + (( result == 0 ) || ( result == ULONG_MAX ))) + return RTEMS_INVALID_NUMBER; #if (UCHAR_MAX < ULONG_MAX) if ( result > UCHAR_MAX ) { diff --git a/cpukit/libmisc/stringto/stringtounsignedint.c b/cpukit/libmisc/stringto/stringtounsignedint.c index 58baaa9c22..9821beff87 100644 --- a/cpukit/libmisc/stringto/stringtounsignedint.c +++ b/cpukit/libmisc/stringto/stringtounsignedint.c @@ -49,11 +49,9 @@ rtems_status_code rtems_string_to_unsigned_int ( 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; + if ( ( errno == ERANGE ) && + (( result == 0 ) || ( result == ULONG_MAX ))) + return RTEMS_INVALID_NUMBER; #if (UINT_MAX < ULONG_MAX) if ( result > UINT_MAX ) {