(libfu_a_SOURCES): Add oa-hash.c.

[gnulib.git] / lib / xstrtol.h

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index 45043d0..5f351a7 100644 (file)
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,57 +1,69 @@
-#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
+#ifndef XSTRTOL_H_
+# define XSTRTOL_H_ 1
 
-#if defined (__STDC__) && __STDC__
-#define        __P(x) x
-#else
-#define        __P(x) ()
-#endif
+# 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
+
+# undef PARAMS
+# if defined (__STDC__) && __STDC__
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
 
+#ifndef _STRTOL_ERROR
 enum strtol_error
   {
     LONGINT_OK, LONGINT_INVALID, LONGINT_INVALID_SUFFIX_CHAR, LONGINT_OVERFLOW
   };
 typedef enum strtol_error strtol_error;
+#endif
 
 strtol_error
-  __xstrtol __P ((const char *s, char **ptr, int base,
-                 __unsigned long int *val, int allow_bkm_suffix));
+  __xstrtol PARAMS ((const char *s, char **ptr, int base,
+                    __unsigned long int *val, const char *valid_suffixes));
 
-#define STRTOL_FATAL_ERROR(str, argument_type_string, err)             \
+#undef _STRTOL_ERROR
+# define _STRTOL_ERROR(Exit_code, Str, Argument_type_string, Err)      \
   do                                                                   \
     {                                                                  \
-      switch ((err))                                                   \
+      switch ((Err))                                                   \
        {                                                               \
        case LONGINT_OK:                                                \
          abort ();                                                     \
                                                                        \
        case LONGINT_INVALID:                                           \
-         error (2, 0, "invalid %s `%s'", (argument_type_string), (str));\
+         error ((Exit_code), 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));                        \
+         error ((Exit_code), 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));                        \
+         /* FIXME: make this message dependent on STRING_TO_UNSIGNED */\
+         error ((Exit_code), 0, "%s `%s' larger than maximum long int",\
+                (Argument_type_string), (Str));                        \
          break;                                                        \
        }                                                               \
     }                                                                  \
   while (0)
 
-#endif /* _xstrtol_h_ */
+# define STRTOL_FATAL_ERROR(Str, Argument_type_string, Err)            \
+  _STRTOL_ERROR (2, Str, Argument_type_string, Err)
+
+# define STRTOL_FAIL_WARN(Str, Argument_type_string, Err)              \
+  _STRTOL_ERROR (0, Str, Argument_type_string, Err)
+
+#endif /* not XSTRTOL_H_ */