forked from Imagelibrary/rtems
2011-01-31 Ralf Corsepius <ralf.corsepius@rtems.org>
* libmisc/stringto/stringtoint.c, libmisc/stringto/stringtounsignedint.c, libmisc/stringto/stringtounsignedchar.c: Rework.
This commit is contained in:
@@ -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,61 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include <rtems/stringto.h>
|
||||
|
||||
/*
|
||||
* Instantiate an error checking wrapper for strtol (int)
|
||||
*/
|
||||
#define STRING_TO_INTEGER
|
||||
#define STRING_TO_TYPE int
|
||||
#define STRING_TO_NAME rtems_string_to_int
|
||||
#define STRING_TO_METHOD strtol
|
||||
#define STRING_TO_MAX LONG_MAX
|
||||
#include "stringto_template.h"
|
||||
|
||||
rtems_status_code rtems_string_to_int (
|
||||
const char *s,
|
||||
int *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;
|
||||
|
||||
#if (INT_MAX < LONG_MAX)
|
||||
if ( result > INT_MAX ) {
|
||||
errno = ERANGE;
|
||||
return RTEMS_INVALID_NUMBER;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if (INT_MIN < LONG_MIN)
|
||||
if ( result < INT_MIN ) {
|
||||
errno = ERANGE;
|
||||
return RTEMS_INVALID_NUMBER;
|
||||
}
|
||||
#endif
|
||||
|
||||
*n = result;
|
||||
|
||||
return RTEMS_SUCCESSFUL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user