X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fxstrtol.h;h=3a94a9c6da811272707c6657c1930814bc8efcde;hb=b187ff0528e2a081392a834e684d1d0c161708a7;hp=45043d01df09e37f8916f987c10f0c6bbdf5b42e;hpb=3af47ca3f672f6c43bc63843a91ecfac278d846f;p=gnulib.git
diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index 45043d01d..3a94a9c6d 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,57 +1,83 @@
-#ifndef _xstrtol_h_
-#define _xstrtol_h_ 1
-
-#if STRING_TO_UNSIGNED
-# define __xstrtol xstrtoul
-# define __strtol strtoul
-# define __unsigned unsigned
-# define __ZLONG_MAX ULONG_MAX
-#else
-# define __xstrtol xstrtol
-# define __strtol strtol
-# define __unsigned /* empty */
-# define __ZLONG_MAX LONG_MAX
-#endif
+/* A more useful interface to strtol.
-#if defined (__STDC__) && __STDC__
-#define __P(x) x
-#else
-#define __P(x) ()
-#endif
+ Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2010 Free Software
+ Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
+
+#ifndef XSTRTOL_H_
+# define XSTRTOL_H_ 1
+# include
+# include
+
+# ifndef _STRTOL_ERROR
enum strtol_error
{
- LONGINT_OK, LONGINT_INVALID, LONGINT_INVALID_SUFFIX_CHAR, LONGINT_OVERFLOW
+ LONGINT_OK = 0,
+
+ /* These two values can be ORed together, to indicate that both
+ errors occurred. */
+ LONGINT_OVERFLOW = 1,
+ LONGINT_INVALID_SUFFIX_CHAR = 2,
+
+ LONGINT_INVALID_SUFFIX_CHAR_WITH_OVERFLOW = (LONGINT_INVALID_SUFFIX_CHAR
+ | LONGINT_OVERFLOW),
+ LONGINT_INVALID = 4
};
typedef enum strtol_error strtol_error;
+# endif
+
+# define _DECLARE_XSTRTOL(name, type) \
+ strtol_error name (const char *, char **, int, type *, const char *);
+_DECLARE_XSTRTOL (xstrtol, long int)
+_DECLARE_XSTRTOL (xstrtoul, unsigned long int)
+_DECLARE_XSTRTOL (xstrtoimax, intmax_t)
+_DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
+
+#if HAVE_LONG_LONG_INT
+_DECLARE_XSTRTOL (xstrtoll, long long int)
+_DECLARE_XSTRTOL (xstrtoull, unsigned long long int)
+#endif
+
+#ifndef __attribute__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
+# define __attribute__(x)
+# endif
+#endif
+
+#ifndef ATTRIBUTE_NORETURN
+# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#endif
+
+/* Report an error for an invalid integer in an option argument.
+
+ ERR is the error code returned by one of the xstrto* functions.
+
+ Use OPT_IDX to decide whether to print the short option string "C"
+ or "-C" or a long option string derived from LONG_OPTION. OPT_IDX
+ is -2 if the short option "C" was used, without any leading "-"; it
+ is -1 if the short option "-C" was used; otherwise it is an index
+ into LONG_OPTIONS, which should have a name preceded by two '-'
+ characters.
+
+ ARG is the option-argument containing the integer.
+
+ After reporting an error, exit with a failure status. */
+
+void xstrtol_fatal (enum strtol_error,
+ int, char, struct option const *,
+ char const *) ATTRIBUTE_NORETURN;
-strtol_error
- __xstrtol __P ((const char *s, char **ptr, int base,
- __unsigned long int *val, int allow_bkm_suffix));
-
-#define STRTOL_FATAL_ERROR(str, argument_type_string, err) \
- do \
- { \
- switch ((err)) \
- { \
- case LONGINT_OK: \
- abort (); \
- \
- case LONGINT_INVALID: \
- error (2, 0, "invalid %s `%s'", (argument_type_string), (str));\
- break; \
- \
- case LONGINT_INVALID_SUFFIX_CHAR: \
- error (2, 0, "invalid character following %s `%s'", \
- (argument_type_string), (str)); \
- break; \
- \
- case LONGINT_OVERFLOW: \
- error (2, 0, "%s `%s' larger than maximum long int", \
- (argument_type_string), (str)); \
- break; \
- } \
- } \
- while (0)
-
-#endif /* _xstrtol_h_ */
+#endif /* not XSTRTOL_H_ */