* build-aux/config.guess: Update from config.

[gnulib.git] / lib / xstrtol.h

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index ff44d6b..475728a 100644 (file)
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,64 +1,87 @@
-#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
-
-#if defined (__STDC__) && __STDC__
-#define        __P(x) x
-#else
-#define        __P(x) ()
-#endif
+/* A more useful interface to strtol.
 
+   Copyright (C) 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004, 2006
+   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 2, 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, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef XSTRTOL_H_
+# define XSTRTOL_H_ 1
+
+# include "exitfail.h"
+
+# include <inttypes.h>
+
+# include "gettext.h"
+
+# 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
 
-strtol_error
-  __xstrtol __P ((const char *s, char **ptr, int base,
-                 __unsigned long int *val, const char *valid_suffixes));
+# 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)
 
-#define _STRTOL_ERROR(exit_code, str, argument_type_string, err)       \
+# define _STRTOL_ERROR(Exit_code, Str, Argument_type_string, Err)      \
   do                                                                   \
     {                                                                  \
-      switch ((err))                                                   \
+      switch ((Err))                                                   \
        {                                                               \
-       case LONGINT_OK:                                                \
+       default:                                                        \
          abort ();                                                     \
                                                                        \
        case LONGINT_INVALID:                                           \
-         error ((exit_code), 0, "invalid %s `%s'",                     \
-                (argument_type_string), (str));                        \
+         error ((Exit_code), 0, gettext ("invalid %s `%s'"),           \
+                (Argument_type_string), (Str));                        \
          break;                                                        \
                                                                        \
        case LONGINT_INVALID_SUFFIX_CHAR:                               \
-         error ((exit_code), 0, "invalid character following %s `%s'", \
-                (argument_type_string), (str));                        \
+       case LONGINT_INVALID_SUFFIX_CHAR | LONGINT_OVERFLOW:            \
+         error ((Exit_code), 0,                                        \
+                gettext ("invalid character following %s in `%s'"),    \
+                (Argument_type_string), (Str));                        \
          break;                                                        \
                                                                        \
        case LONGINT_OVERFLOW:                                          \
-         error ((exit_code), 0, "%s `%s' larger than maximum long int",\
-                (argument_type_string), (str));                        \
+         error ((Exit_code), 0, gettext ("%s `%s' too large"),         \
+                (Argument_type_string), (Str));                        \
          break;                                                        \
        }                                                               \
     }                                                                  \
   while (0)
 
-#define STRTOL_FATAL_ERROR(str, argument_type_string, err)             \
-  _STRTOL_ERROR (2, str, argument_type_string, err)
+# define STRTOL_FATAL_ERROR(Str, Argument_type_string, Err)            \
+  _STRTOL_ERROR (exit_failure, Str, Argument_type_string, Err)
 
-#define STRTOL_FAIL_WARN(str, argument_type_string, err)               \
-  _STRTOL_ERROR (0, str, argument_type_string, err)
+# define STRTOL_FAIL_WARN(Str, Argument_type_string, Err)              \
+  _STRTOL_ERROR (0, Str, Argument_type_string, Err)
 
-#endif /* _xstrtol_h_ */
+#endif /* not XSTRTOL_H_ */