Mercurial > hg > octave-lojdl > gnulib-hg
changeset 1922:ad3c50c248b8
(ARGMATCH_QUOTING_STYLE):
Change from escape_quoting_style to locale_quoting_style.
(argmatch_invalid): Use new quotearg_style primitive for simplicity.
Also, use ARGMATCH_QUOTING_STYLE to quote, instead of quoting ourselves.
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Tue, 10 Aug 1999 11:00:12 +0000 |
| parents | d92e0bf8d650 |
| children | b6bcc4ab409e |
| files | lib/argmatch.c |
| diffstat | 1 files changed, 5 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/argmatch.c +++ b/lib/argmatch.c @@ -43,7 +43,7 @@ by using the quoting style ARGMATCH_QUOTING_STYLE. Do not use literal_quoting_style. */ #ifndef ARGMATCH_QUOTING_STYLE -# define ARGMATCH_QUOTING_STYLE escape_quoting_style +# define ARGMATCH_QUOTING_STYLE locale_quoting_style #endif /* The following test is to work around the gross typo in @@ -155,21 +155,11 @@ void argmatch_invalid (const char *context, const char *value, int problem) { - enum quoting_style saved_quoting_style; - char const *format; - - /* Make sure to have a good quoting style to report errors. - literal is insane here. */ - saved_quoting_style = get_quoting_style (NULL); - set_quoting_style (NULL, ARGMATCH_QUOTING_STYLE); + char const *format = (problem == -1 + ? _("invalid argument %s for `%s'") + : _("ambiguous argument %s for `%s'")); - format = (problem == -1 - ? _("invalid argument `%s' for `%s'") - : _("ambiguous argument `%s' for `%s'")); - - error (0, 0, format, quotearg (value), context); - - set_quoting_style (NULL, saved_quoting_style); + error (0, 0, format, quotearg_style (ARGMATCH_QUOTING_STYLE, value), context); } /* List the valid arguments for argmatch.