Mercurial > hg > octave-nkf > gnulib-hg
changeset 9127:0bb31cd5b7ea
Revert last patch.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Thu, 26 Jul 2007 08:28:56 +0000 |
parents | e18ac20a0e07 |
children | a80538d72b35 |
files | NEWS lib/human.c lib/human.h lib/xstrtol.h |
diffstat | 4 files changed, 17 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS +++ b/NEWS @@ -6,10 +6,6 @@ Date Modules Changes -2007-07-26 human The function human_options takes an additional - third argument, the option that introduced the - argument that was passed to a xstrto* function. - 2007-07-14 gpl, lgpl New Texinfo versions with no sectioning commands. 2007-07-10 version-etc Output now mentions GPLv3+, not GPLv2+. Use
--- a/lib/human.c +++ b/lib/human.c @@ -1,7 +1,7 @@ /* human.c -- print human readable file size Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007 Free Software Foundation, Inc. + 2005, 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 @@ -464,8 +464,7 @@ } int -human_options (char const *spec, bool report_errors, char const *option, - uintmax_t *block_size) +human_options (char const *spec, bool report_errors, uintmax_t *block_size) { int opts; strtol_error e = humblock (spec, block_size, &opts); @@ -475,6 +474,6 @@ e = LONGINT_INVALID; } if (e != LONGINT_OK && report_errors) - STRTOL_FATAL_ERROR (spec, option, e); + STRTOL_FATAL_ERROR (spec, _("block size"), e); return opts; }
--- a/lib/human.h +++ b/lib/human.h @@ -1,7 +1,7 @@ /* human.h -- print human readable file size Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007 Free Software Foundation, Inc. + 2005, 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 @@ -78,6 +78,6 @@ char *human_readable (uintmax_t, char *, int, uintmax_t, uintmax_t); -int human_options (char const *, bool, char const *, uintmax_t *); +int human_options (char const *, bool, uintmax_t *); #endif /* HUMAN_H_ */
--- a/lib/xstrtol.h +++ b/lib/xstrtol.h @@ -1,6 +1,6 @@ /* A more useful interface to strtol. - Copyright (C) 1995, 1996, 1998, 1999, 2001-2004, 2006-2007 + 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 @@ -50,14 +50,7 @@ _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) \ +# define _STRTOL_ERROR(Exit_code, Str, Argument_type_string, Err) \ do \ { \ switch ((Err)) \ @@ -66,29 +59,29 @@ abort (); \ \ case LONGINT_INVALID: \ - error ((Exit_code), 0, gettext ("invalid %s argument `%s'"), \ - (Option), (Str)); \ + 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: \ error ((Exit_code), 0, \ - gettext ("invalid character following %s argument in `%s'"), \ - (Option), (Str)); \ + gettext ("invalid character following %s in `%s'"), \ + (Argument_type_string), (Str)); \ break; \ \ case LONGINT_OVERFLOW: \ - error ((Exit_code), 0, gettext ("%s argument `%s' too large"), \ - (Option), (Str)); \ + error ((Exit_code), 0, gettext ("%s `%s' too large"), \ + (Argument_type_string), (Str)); \ break; \ } \ } \ while (0) -# define STRTOL_FATAL_ERROR(Str, Option, Err) \ - _STRTOL_ERROR (exit_failure, Str, Option, Err) +# define STRTOL_FATAL_ERROR(Str, Argument_type_string, Err) \ + _STRTOL_ERROR (exit_failure, Str, Argument_type_string, Err) -# define STRTOL_FAIL_WARN(Str, Option, Err) \ - _STRTOL_ERROR (0, Str, Option, Err) +# define STRTOL_FAIL_WARN(Str, Argument_type_string, Err) \ + _STRTOL_ERROR (0, Str, Argument_type_string, Err) #endif /* not XSTRTOL_H_ */