diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2020-01-30 15:08:30 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2020-02-04 17:22:06 +0100 |
| commit | e6a3c0901703bf98827e2da456daf0ced42dd96c (patch) | |
| tree | 769328d0a218456878554134164e3726ef3261fc | |
| parent | 4791d0f035e006e9541d27ef2c3dcb6ea561324a (diff) | |
| download | lvm2-e6a3c0901703bf98827e2da456daf0ced42dd96c.tar.gz | |
command: validate reporting of previous argument
When reporting parsing error, report 'previous' argument
only when there is one.
| -rw-r--r-- | tools/command.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/command.c b/tools/command.c index 0cbd8773c..50791b169 100644 --- a/tools/command.c +++ b/tools/command.c @@ -999,8 +999,8 @@ static void __add_optional_opt_line(struct cmd_context *cmdtool, struct command else if (takes_arg) _update_prev_opt_arg(cmdtool, cmd, argv[i], OPTIONAL); else { - log_error("Parsing command defs: can't parse argc %d argv %s prev %s.", - i, argv[i], argv[i-1]); + log_error("Parsing command defs: can't parse argc %d argv %s%s%s.", + i, argv[i], (i > 0) ? " prev " : "", (i > 0) ? argv[i - 1] : ""); cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR; return; } @@ -1025,8 +1025,8 @@ static void _add_ignore_opt_line(struct cmd_context *cmdtool, struct command *cm else if (takes_arg) _update_prev_opt_arg(cmdtool, cmd, argv[i], IGNORE); else { - log_error("Parsing command defs: can't parse argc %d argv %s prev %s.", - i, argv[i], argv[i-1]); + log_error("Parsing command defs: can't parse argc %d argv %s%s%s.", + i, argv[i], (i > 0) ? " prev " : "", (i > 0) ? argv[i - 1] : ""); cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR; return; } @@ -1060,8 +1060,8 @@ static void _add_required_opt_line(struct cmd_context *cmdtool, struct command * else if (takes_arg) _update_prev_opt_arg(cmdtool, cmd, argv[i], REQUIRED); else { - log_error("Parsing command defs: can't parse argc %d argv %s prev %s.", - i, argv[i], argv[i-1]); + log_error("Parsing command defs: can't parse argc %d argv %s%s%s.", + i, argv[i], (i > 0) ? " prev " : "", (i > 0) ? argv[i - 1] : ""); cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR; return; } @@ -1150,8 +1150,8 @@ static void _add_required_line(struct cmd_context *cmdtool, struct command *cmd, /* set property for previous required_pos_arg */ _update_prev_pos_arg(cmd, argv[i], REQUIRED); } else { - log_error("Parsing command defs: can't parse argc %d argv %s prev %s.", - i, argv[i], argv[i-1]); + log_error("Parsing command defs: can't parse argc %d argv %s%s%s.", + i, argv[i], (i > 0) ? " prev " : "", (i > 0) ? argv[i - 1] : ""); cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR; return; } |