External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: introduce 'ret' in cmdDomFSInfo

Browse Source 
Failing to print the table is also a reason to return failure
and print the reported error.

Switch to the usual pattern where we fall through the cleanup
label right after setting ret to true instead of infering the
return value from the number of filesystems returned.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Ján Tomko 2019-02-12 07:53:20 +01:00
parent eb3f5a2c6d
commit 023f0672d4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/virsh-domain.c
View File

@ -13941,6 +13941,7 @@ cmdDomFSInfo(vshControl *ctl, const vshCmd *cmd)
virDomainFSInfoPtr *info = NULL;
vshTablePtr table = NULL;
size_t ninfos = 0;
bool ret = false;
if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
return false;
@ -13953,6 +13954,7 @@ cmdDomFSInfo(vshControl *ctl, const vshCmd *cmd)
ninfos = rc;
if (ninfos == 0) {
ret = true;
vshError(ctl, _("No filesystems are mounted in the domain"));
goto cleanup;
}
@ -13986,6 +13988,8 @@ cmdDomFSInfo(vshControl *ctl, const vshCmd *cmd)
vshTablePrintToStdout(table, ctl);
}
ret = true;
cleanup:
if (info) {
for (i = 0; i < ninfos; i++)
@ -13994,7 +13998,7 @@ cmdDomFSInfo(vshControl *ctl, const vshCmd *cmd)
}
vshTableFree(table);
virshDomainFree(dom);
return rc >= 0;
return ret;
}
const vshCmdDef domManagementCmds[] = {