X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtol.h;h=a1ad32dd5d1300746df9868cb7420d64201acc37;hb=a76a349e949dfad5716eb3893052070b770e949f;hp=baea032db0ec32bde0f58d6a4cff79fb67a62c21;hpb=5b08577168f0343751bcec977335dac4eaa45949;p=gnulib.git

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index baea032db..a1ad32dd5 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,36 +1,58 @@
-#ifndef _xstrtol_h_
-#define _xstrtol_h_ 1
+/* A more useful interface to strtol.
+   Copyright 1995, 1996, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
 
-#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
+   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.
 
-#undef PARAMS
-#if defined (__STDC__) && __STDC__
-# define PARAMS(Args) Args
-#else
-# define PARAMS(Args) ()
-#endif
+   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef XSTRTOL_H_
+# define XSTRTOL_H_ 1
+
+/* Get uintmax_t.  */
+# 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
+# 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 PARAMS ((const char *s, char **ptr, int base,
-		     __unsigned long int *val, const char *valid_suffixes));
+# define _DECLARE_XSTRTOL(name, type) \
+  strtol_error \
+    name PARAMS ((const char *s, char **ptr, int base, \
+		  type *val, const char *valid_suffixes));
+_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))							\
@@ -44,23 +66,22 @@ strtol_error
 	  break;							\
 									\
 	case LONGINT_INVALID_SUFFIX_CHAR:				\
-	  error ((Exit_code), 0, "invalid character following %s `%s'",	\
+	  error ((Exit_code), 0, "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, "%s `%s' too large",			\
 		 (Argument_type_string), (Str));			\
 	  break;							\
 	}								\
     }									\
   while (0)
 
-#define STRTOL_FATAL_ERROR(Str, Argument_type_string, Err)		\
+# 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)		\
+# define STRTOL_FAIL_WARN(Str, Argument_type_string, Err)		\
   _STRTOL_ERROR (0, Str, Argument_type_string, Err)
 
-#endif /* _xstrtol_h_ */
+#endif /* not XSTRTOL_H_ */