mirror of
https://https.git.savannah.gnu.org/git/gnulib.git
synced 2026-09-01 11:16:02 +00:00
Paul Eggert
e9c57721db
* lib/xstrtol.h: Don't include exitfail.h; that's now internal to xstrtol.c. Include getopt.h, since xstrtol_fatal's signature depends on it. (xstrtol_error): Remove. (xstrtol_fatal): New decl, replacing the functionality of xstrtol_error but with a different signature. (ATTRIBUTE_NORETURN, __attribute__): New macros. * lib/xstrtol-error.c: Include exitfail.h. (xstrtol_fatal): New function, with a different signature from the old xstrtol_error, so that the caller need not worry about passing in an exit status, or about storage management of the option argument. (xstrtol_error): Now a static function. Redo signature to implement xstrtol_fatal. Output the correct number of hyphens in front of the option so that the caller need not worry about storage management. (N_): New macro. (_): Remove; not used now. * modules/xstrtol: Depend on getopt. * tests/test-xstrtol.c (main): Use new xstrtol_error function instead of old STRTOL_FATAL_ERROR macro. * tests/test-xstrtol.sh (t-xstrtol.xo): Adjust to match new behavior of test program.
80 lines
2.6 KiB
C
80 lines
2.6 KiB
C
/* A more useful interface to strtol.
|
|
|
|
Copyright (C) 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004, 2006, 2007
|
|
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
|
|
|
|
# include <getopt.h>
|
|
# include <inttypes.h>
|
|
|
|
# ifndef _STRTOL_ERROR
|
|
enum strtol_error
|
|
{
|
|
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 (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)
|
|
|
|
#ifndef __attribute__
|
|
# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
|
|
# define __attribute__(x)
|
|
# endif
|
|
#endif
|
|
|
|
#ifndef ATTRIBUTE_NORETURN
|
|
# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
|
|
#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. */
|
|
|
|
void xstrtol_fatal (enum strtol_error,
|
|
int, char, struct option const *,
|
|
char const *) ATTRIBUTE_NORETURN;
|
|
|
|
#endif /* not XSTRTOL_H_ */
|