They way our VIR_ENUM_IMPL() and virXXXTypeFromString() work is
that for any string that's not recognized a negative one is
returned. And, since VIR_XXX_LAST is passed to VIR_ENUM_IMPL() we
can be sure that all enum members are covered. Therefore, there
is no way that virXXXTypeFromString() can return a value that's
bigger or equal to VIR_XXX_LAST.
I've noticed two places where such comparison was made, both in
cmdNetworkUpdate(). Drop them.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tools/virsh-network.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index 5f574be78c..b2daf31d6b 100644
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -984,7 +984,7 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd)
command = VIR_NETWORK_UPDATE_COMMAND_ADD_LAST;
} else {
command = virshNetworkUpdateCommandTypeFromString(commandStr);
- if (command <= 0 || command >= VIR_NETWORK_UPDATE_COMMAND_LAST) {
+ if (command <= 0) {
vshError(ctl, _("unrecognized command name '%s'"),
commandStr);
goto cleanup;
}
@@ -994,7 +994,7 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd)
goto cleanup;
section = virshNetworkSectionTypeFromString(sectionStr);
- if (section <= 0 || section >= VIR_NETWORK_SECTION_LAST) {
+ if (section <= 0) {
vshError(ctl, _("unrecognized section name '%s'"),
sectionStr);
goto cleanup;
}
--
2.34.1