mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-12 07:42:56 +00:00
virsh-network: Don't check for virshXXXTypeFromString() >= VIR_XXX_LAST
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@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
parent
d724ca8fcd
commit
ec7fbdef56
@ -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;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user