X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtol.h;h=5354c872b11748e894218841215da79fa910b6fd;hb=533101a268dc5015a140ff4695d8eeb04fbe57b6;hp=2a5eb16b64337cec232fc2035232429445d82fcb;hpb=c03635e1ae69ad9fc848ed85ed5dc8e0c7c9b68c;p=gnulib.git
diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index 2a5eb16b6..5354c872b 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,12 +1,12 @@
/* A more useful interface to strtol.
- Copyright (C) 1995, 1996, 1998, 1999, 2001-2004, 2006-2007
- Free Software Foundation, Inc.
+ Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2013 Free Software
+ Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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.
+ the Free Software Foundation; either version 3 of the License, 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
@@ -14,18 +14,14 @@
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. */
+ along with this program. If not, see . */
#ifndef XSTRTOL_H_
# define XSTRTOL_H_ 1
-# include "exitfail.h"
-
+# include
# include
-# include "gettext.h"
-
# ifndef _STRTOL_ERROR
enum strtol_error
{
@@ -37,7 +33,7 @@ enum strtol_error
LONGINT_INVALID_SUFFIX_CHAR = 2,
LONGINT_INVALID_SUFFIX_CHAR_WITH_OVERFLOW = (LONGINT_INVALID_SUFFIX_CHAR
- | LONGINT_OVERFLOW),
+ | LONGINT_OVERFLOW),
LONGINT_INVALID = 4
};
typedef enum strtol_error strtol_error;
@@ -50,45 +46,28 @@ _DECLARE_XSTRTOL (xstrtoul, unsigned long int)
_DECLARE_XSTRTOL (xstrtoimax, intmax_t)
_DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
-/* Signal an error for an out-of-range integer argument, through the error()
- function.
- EXIT_CODE is the exit code (0 for a non-fatal error).
- STR is the value of the given argument value.
- OPTION is the option that takes the argument (usually starting with one
- or two minus signs).
- ERR is the error code returned by one of the xstrto* functions. */
-# define _STRTOL_ERROR(Exit_code, Str, Option, Err) \
- do \
- { \
- switch ((Err)) \
- { \
- default: \
- abort (); \
- \
- case LONGINT_INVALID: \
- error ((Exit_code), 0, gettext ("invalid %s argument `%s'"), \
- (Option), (Str)); \
- break; \
- \
- case LONGINT_INVALID_SUFFIX_CHAR: \
- case LONGINT_INVALID_SUFFIX_CHAR | LONGINT_OVERFLOW: \
- error ((Exit_code), 0, \
- gettext ("invalid character following %s argument in `%s'"), \
- (Option), (Str)); \
- break; \
- \
- case LONGINT_OVERFLOW: \
- error ((Exit_code), 0, gettext ("%s argument `%s' too large"), \
- (Option), (Str)); \
- break; \
- } \
- } \
- while (0)
-
-# define STRTOL_FATAL_ERROR(Str, Option, Err) \
- _STRTOL_ERROR (exit_failure, Str, Option, Err)
-
-# define STRTOL_FAIL_WARN(Str, Option, Err) \
- _STRTOL_ERROR (0, Str, Option, Err)
+#if HAVE_LONG_LONG_INT
+_DECLARE_XSTRTOL (xstrtoll, long long int)
+_DECLARE_XSTRTOL (xstrtoull, unsigned long long int)
+#endif
+
+/* Report an error for an invalid integer in an option argument.
+
+ ERR is the error code returned by one of the xstrto* functions.
+
+ Use OPT_IDX to decide whether to print the short option string "C"
+ or "-C" or a long option string derived from LONG_OPTION. OPT_IDX
+ is -2 if the short option "C" was used, without any leading "-"; it
+ is -1 if the short option "-C" was used; otherwise it is an index
+ into LONG_OPTIONS, which should have a name preceded by two '-'
+ characters.
+
+ ARG is the option-argument containing the integer.
+
+ After reporting an error, exit with a failure status. */
+
+_Noreturn void xstrtol_fatal (enum strtol_error,
+ int, char, struct option const *,
+ char const *);
#endif /* not XSTRTOL_H_ */