diff options
| author | Jim Meyering <jim@meyering.net> | 1999-04-18 23:16:23 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1999-04-18 23:16:23 +0000 |
| commit | 0501984933b14c2e507c069e17a436ee17a0a68d (patch) | |
| tree | 2ac480b9cd04738358f14382da8a521ba4f6d9e2 /lib | |
| parent | f8474e242112618d797f1fd69fdc988b039241ee (diff) | |
| download | coreutils-0501984933b14c2e507c069e17a436ee17a0a68d.tar.xz | |
(__xstrtol, __strtol, __unsigned): Remove macro decls.
<inttypes.h>: Include if HAVE_INTTYPES_H.
(_DECLARE_XSTRTOL): New macro.
(xstrtol, xstrtoul, xstrtoumax): Declare all three functions, so that
we need only one include file, not three.
(_STRTOL_ERROR): Do not undef, as this is no longer needed.
Reword overflow message so that it's independent of type.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/xstrtol.h | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/lib/xstrtol.h b/lib/xstrtol.h index 5715134c8..7a9a02445 100644 --- a/lib/xstrtol.h +++ b/lib/xstrtol.h @@ -1,14 +1,8 @@ #ifndef XSTRTOL_H_ # define XSTRTOL_H_ 1 -# if STRING_TO_UNSIGNED -# define __xstrtol xstrtoul -# define __strtol strtoul -# define __unsigned unsigned -# else -# define __xstrtol xstrtol -# define __strtol strtol -# define __unsigned /* empty */ +# if HAVE_INTTYPES_H +# include <inttypes.h> /* for uintmax_t */ # endif # ifndef PARAMS @@ -27,11 +21,14 @@ enum strtol_error typedef enum strtol_error strtol_error; # endif -strtol_error - __xstrtol PARAMS ((const char *s, char **ptr, int base, - __unsigned long int *val, const char *valid_suffixes)); +# define _DECLARE_XSTRTOL(name, type) \ + strtol_error \ + name PARAMS ((const char *s, char **ptr, int base, \ + type *val, const char *valid_suffixes)); +_DECLARE_XSTRTOL (xstrtol, long int) +_DECLARE_XSTRTOL (xstrtoul, unsigned long int) +_DECLARE_XSTRTOL (xstrtoumax, uintmax_t) -# undef _STRTOL_ERROR # define _STRTOL_ERROR(Exit_code, Str, Argument_type_string, Err) \ do \ { \ @@ -51,8 +48,7 @@ strtol_error break; \ \ case LONGINT_OVERFLOW: \ - /* FIXME: make this message dependent on STRING_TO_UNSIGNED */\ - error ((Exit_code), 0, "%s `%s' larger than maximum long int",\ + error ((Exit_code), 0, "%s `%s' too large", \ (Argument_type_string), (Str)); \ break; \ } \ |