From 6b99642f0a40bc92b3e2a10bb1a9b8fac2b19545 Mon Sep 17 00:00:00 2001 From: Martin Kletzander Date: Tue, 11 Nov 2014 12:03:11 +0100 Subject: [PATCH] virsh: Error out if VSH_OT_STRING option has VSH_OFLAG_REQ flag Recent commit 12bd207e217f3c5dc2272a5ea943b81067bd8034 fixed few VSH_OT_STRING options that should've been VSH_OT_DATA. That lead me to this commit that enforces people to check that newly added options have proper type. Thanks to virsh erroring out with error message, this will immediately show up in 'make check' thanks to our virsh-synopsis test. Signed-off-by: Martin Kletzander --- tools/virsh.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/virsh.c b/tools/virsh.c index 41893bb071..e10b3de725 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1386,6 +1386,12 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) break; case VSH_OT_STRING: /* OT_STRING should never be VSH_OFLAG_REQ */ + if (opt->flags & VSH_OFLAG_REQ) { + vshError(ctl, + _("internal error: bad options in command: '%s'"), + def->name); + return false; + } snprintf(buf, sizeof(buf), _("--%s "), opt->name); break; case VSH_OT_DATA: