X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtol.h;h=0d6b98482eff00a3b2514b3ce083925b9a75b251;hb=5e6933eb225721fac1de4a8abf6c0da985ddaa6a;hp=a1ad32dd5d1300746df9868cb7420d64201acc37;hpb=511a4370313100c793b53bed34c101909016ba32;p=gnulib.git

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index a1ad32dd5..0d6b98482 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,5 +1,7 @@
 /* A more useful interface to strtol.
-   Copyright 1995, 1996, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004 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
@@ -18,35 +20,34 @@
 #ifndef XSTRTOL_H_
 # define XSTRTOL_H_ 1
 
-/* Get uintmax_t.  */
+# include "exitfail.h"
+
 # if HAVE_INTTYPES_H
 #  include <inttypes.h>
-# else
-#  if HAVE_STDINT_H
-#   include <stdint.h>
-#  endif
 # endif
-
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
+# if HAVE_STDINT_H
+#  include <stdint.h>
 # endif
 
 # 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 PARAMS ((const char *s, char **ptr, int base, \
-		  type *val, const char *valid_suffixes));
+  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)
@@ -57,7 +58,7 @@ _DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
     {									\
       switch ((Err))							\
 	{								\
-	case LONGINT_OK:						\
+	default:							\
 	  abort ();							\
 									\
 	case LONGINT_INVALID:						\
@@ -66,6 +67,7 @@ _DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
 	  break;							\
 									\
 	case LONGINT_INVALID_SUFFIX_CHAR:				\
+	case LONGINT_INVALID_SUFFIX_CHAR | LONGINT_OVERFLOW:		\
 	  error ((Exit_code), 0, "invalid character following %s in `%s'", \
 		 (Argument_type_string), (Str));			\
 	  break;							\
@@ -79,7 +81,7 @@ _DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
   while (0)
 
 # define STRTOL_FATAL_ERROR(Str, Argument_type_string, Err)		\
-  _STRTOL_ERROR (2, 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)