projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Explain the different license terms for module descriptions,
[gnulib.git]
/
lib
/
xstrtol.h
diff --git
a/lib/xstrtol.h
b/lib/xstrtol.h
index
f3b9295
..
475728a
100644
(file)
--- a/
lib/xstrtol.h
+++ b/
lib/xstrtol.h
@@
-1,7
+1,7
@@
/* A more useful interface to strtol.
/* A more useful interface to strtol.
- Copyright (C) 1995, 1996, 1998, 1999, 2001, 2002, 2003
Free
- Software Foundation, Inc.
+ 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
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
@@
-15,19
+15,16
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
#ifndef XSTRTOL_H_
# define XSTRTOL_H_ 1
#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
+# include "exitfail.h"
+
+# include <inttypes.h>
+
+# include "gettext.h"
# ifndef _STRTOL_ERROR
enum strtol_error
# ifndef _STRTOL_ERROR
enum strtol_error
@@
-62,18
+59,19
@@
_DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
abort (); \
\
case LONGINT_INVALID: \
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: \
case LONGINT_INVALID_SUFFIX_CHAR | LONGINT_OVERFLOW: \
(Argument_type_string), (Str)); \
break; \
\
case LONGINT_INVALID_SUFFIX_CHAR: \
case LONGINT_INVALID_SUFFIX_CHAR | LONGINT_OVERFLOW: \
- error ((Exit_code), 0, "invalid character following %s in `%s'", \
+ error ((Exit_code), 0, \
+ gettext ("invalid character following %s in `%s'"), \
(Argument_type_string), (Str)); \
break; \
\
case LONGINT_OVERFLOW: \
(Argument_type_string), (Str)); \
break; \
\
case LONGINT_OVERFLOW: \
- error ((Exit_code), 0,
"%s `%s' too large",
\
+ error ((Exit_code), 0,
gettext ("%s `%s' too large"),
\
(Argument_type_string), (Str)); \
break; \
} \
(Argument_type_string), (Str)); \
break; \
} \
@@
-81,7
+79,7
@@
_DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
while (0)
# define STRTOL_FATAL_ERROR(Str, Argument_type_string, Err) \
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)
# define STRTOL_FAIL_WARN(Str, Argument_type_string, Err) \
_STRTOL_ERROR (0, Str, Argument_type_string, Err)