2011-01-31 Ralf Corsepius <ralf.corsepius@rtems.org>

* libmisc/stringto/stringtopointer.c: Rework.
This commit is contained in:
Ralf Corsepius
2011-01-31 16:03:16 +00:00
parent 268531a72e
commit 58dac487fd
2 changed files with 34 additions and 12 deletions

View File

@@ -1,3 +1,7 @@
2011-01-31 Ralf Corsepius <ralf.corsepius@rtems.org>
* libmisc/stringto/stringtopointer.c: Rework.
2011-01-28 Joel Sherrill <joel.sherrilL@OARcorp.com>
* include/rtems/bspIo.h, include/rtems/concat.h, include/rtems/irq.h,

View File

@@ -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,17 +15,33 @@
#include "config.h"
#endif
#include <errno.h>
#include <stdlib.h>
#include <limits.h>
#include <stdint.h>
#include <rtems/stringto.h>
/*
* Instantiate an error checking wrapper for strtoul which is
* used to input a (void *)
*
* NOTE: This is only an appropriate implementation when unsigned long
* can represent a void *
* Instantiate an error checking wrapper for strtoul/strtoull (void *)
*/
#define STRING_TO_POINTER
#define STRING_TO_TYPE void *
#define STRING_TO_INPUT_TYPE unsigned long
#define STRING_TO_NAME rtems_string_to_pointer
#define STRING_TO_METHOD strtoul
#define STRING_TO_MAX ULONG_MAX
#include "stringto_template.h"
#if (UINTPTR_MAX == ULONG_MAX)
#define STRTOFUNC(a,b,c) rtems_string_to_unsigned_long(a, (unsigned long*) b, c, 0)
#elif (UINTPTR_MAX == ULONG_LONG_MAX)
#define STRTOFUNC(a,b,c) rtems_string_to_unsigned_long_long(a, (unsigned long long*) b, c, 0)
#elif (UINTPTR_MAX == UINT_MAX)
#define STRTOFUNC(a,b,c) rtems_string_to_unsigned_int(a, (unsigned int*) b, c, 0)
#else
/* Fallback to unsigned long */
#define STRTOFUNC(a,b,c) rtems_string_to_unsigned_long(a, (unsigned long*) b, c, 0)
#endif
rtems_status_code rtems_string_to_pointer (
const char *s,
void **n,
char **endptr
)
{
return STRTOFUNC( s, n, endptr );
}