diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2014-11-21 23:04:42 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-11-24 09:48:59 +0100 |
| commit | eed16ccebf8fd1fdf9709affbd5c831f6957b8ae (patch) | |
| tree | 5bb56b3817318d9a66c5ebc24aeca232ea6ad180 | |
| parent | gpg: Refer to --throw-keyids instead of --throw-keyid (diff) | |
| download | gnupg2-eed16ccebf8fd1fdf9709affbd5c831f6957b8ae.tar.xz gnupg2-eed16ccebf8fd1fdf9709affbd5c831f6957b8ae.zip | |
Distinguish between ARGPARSE_AMBIGUOUS_{OPTION,COMMAND}
* common/argparse.c (initialize): Use correct value.
--
This avoids a dead path in the argparse code.
It's not clear that this is needed, however, since
ARGPARSE_AMBIGUOUS_COMMAND is never actually used in the code.
Another approach would be to trim out ARGPARSE_AMBIGUOUS_COMMAND
entirely.
| -rw-r--r-- | common/argparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/argparse.c b/common/argparse.c index 0a36a9e53..169e23431 100644 --- a/common/argparse.c +++ b/common/argparse.c @@ -290,7 +290,7 @@ initialize( ARGPARSE_ARGS *arg, const char *filename, unsigned *lineno ) jnlib_log_error (_("invalid command \"%.50s\"\n"), s); else if ( arg->r_opt == ARGPARSE_AMBIGUOUS_OPTION ) jnlib_log_error (_("option \"%.50s\" is ambiguous\n"), s); - else if ( arg->r_opt == ARGPARSE_AMBIGUOUS_OPTION ) + else if ( arg->r_opt == ARGPARSE_AMBIGUOUS_COMMAND ) jnlib_log_error (_("command \"%.50s\" is ambiguous\n"),s ); else if ( arg->r_opt == ARGPARSE_OUT_OF_CORE ) jnlib_log_error ("%s\n", _("out of core\n")); |