X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtol.h;h=475728aa44c908e31713a6e3c477b316ec7f2551;hb=5dbc6b9ffe005b87928b01c3d0b8e4dae77baf0a;hp=3c16c7e01cf4bb663a33131178e5268fe00aa076;hpb=358e52e8bb23ab6e5bcc42ca3546493a868d9591;p=gnulib.git

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index 3c16c7e01..475728aa4 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,60 +1,77 @@
+/* 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
 
-# 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
+# include "exitfail.h"
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
+# 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 PARAMS ((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)
 
-# undef _STRTOL_ERROR
 # define _STRTOL_ERROR(Exit_code, Str, Argument_type_string, Err)	\
   do									\
     {									\
       switch ((Err))							\
 	{								\
-	case LONGINT_OK:						\
+	default:							\
 	  abort ();							\
 									\
 	case LONGINT_INVALID:						\
-	  error ((Exit_code), 0, "invalid %s `%s'",			\
+	  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'",	\
+	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:						\
-	  /* FIXME: make this message dependent on STRING_TO_UNSIGNED */\
-	  error ((Exit_code), 0, "%s `%s' larger than maximum long int",\
+	  error ((Exit_code), 0, gettext ("%s `%s' too large"),		\
 		 (Argument_type_string), (Str));			\
 	  break;							\
 	}								\
@@ -62,7 +79,7 @@ strtol_error
   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)