diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-01 05:55:32 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-01 05:55:32 +0000 |
| commit | 200c94587973c2091a7ad8bc3899e72d8c5b37b4 (patch) | |
| tree | 07a65d11ae5d5776b28816f2f7405492a974f468 /cpukit/libmisc | |
| parent | 2011-02-01 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-200c94587973c2091a7ad8bc3899e72d8c5b37b4.tar.bz2 | |
2011-02-01 Ralf Corsepius <ralf.corsepius@rtems.org>
* libmisc/stringto/stringtounsignedchar.c,
libmisc/stringto/stringtounsignedint.c: Reformat range check.
Diffstat (limited to 'cpukit/libmisc')
| -rw-r--r-- | cpukit/libmisc/stringto/stringtounsignedchar.c | 8 | ||||
| -rw-r--r-- | cpukit/libmisc/stringto/stringtounsignedint.c | 8 |
2 files changed, 6 insertions, 10 deletions
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 ) { |