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

virsh: Simplify vshTableRowAppend() calling in cmdList(), part two

Browse Source 
Instead of having many if-else statements, each with its own
vshTableRowAppend() call, we can use a simple trick - have an
array of string pointers, set array members in the if bodies and
then call vshTableRowAppend() once.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2024-08-19 12:15:01 +02:00
parent cf0e0715e0
commit f644cba8ae
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/virsh-domain-monitor.c
View File

@ -1891,6 +1891,8 @@ cmdList(vshControl *ctl, const vshCmd *cmd)
if (optTable) { if (optTable) {
const char *domName = virDomainGetName(dom); const char *domName = virDomainGetName(dom);
const char *stateStr = NULL; const char *stateStr = NULL;
g_autofree char *title = NULL;
const char *arg[2] = {};
state = virshDomainState(ctl, dom, NULL); state = virshDomainState(ctl, dom, NULL);
@ -1906,43 +1908,33 @@ cmdList(vshControl *ctl, const vshCmd *cmd)
} }
if (optTitle && !optUUID) { if (optTitle && !optUUID) {
g_autofree char *title = NULL;
if (!(title = virshGetDomainDescription(ctl, dom, true, 0))) if (!(title = virshGetDomainDescription(ctl, dom, true, 0)))
goto cleanup; goto cleanup;
if (vshTableRowAppend(table, id_buf,
domName, stateStr, arg[0] = title;
title, NULL) < 0)
goto cleanup;
} else if (optUUID && !optTitle) { } else if (optUUID && !optTitle) {
if (virDomainGetUUIDString(dom, uuid) < 0) { if (virDomainGetUUIDString(dom, uuid) < 0) {
vshError(ctl, "%s", _("Failed to get domain's UUID")); vshError(ctl, "%s", _("Failed to get domain's UUID"));
goto cleanup; goto cleanup;
} }
if (vshTableRowAppend(table, id_buf,
domName, stateStr,
uuid, NULL) < 0)
goto cleanup;
} else if (optUUID && optTitle) {
g_autofree char *title = NULL;
arg[0] = uuid;
} else if (optUUID && optTitle) {
if (!(title = virshGetDomainDescription(ctl, dom, true, 0))) if (!(title = virshGetDomainDescription(ctl, dom, true, 0)))
goto cleanup; goto cleanup;
if (virDomainGetUUIDString(dom, uuid) < 0) { if (virDomainGetUUIDString(dom, uuid) < 0) {
vshError(ctl, "%s", _("Failed to get domain's UUID")); vshError(ctl, "%s", _("Failed to get domain's UUID"));
goto cleanup; goto cleanup;
} }
if (vshTableRowAppend(table, id_buf,
domName, stateStr, arg[0] = title;
title, uuid, NULL) < 0) arg[1] = uuid;
goto cleanup;
} else {
if (vshTableRowAppend(table, id_buf,
domName, stateStr,
NULL) < 0)
goto cleanup;
} }
if (vshTableRowAppend(table, id_buf,
domName, stateStr,
arg[0], arg[1], NULL) < 0)
goto cleanup;
} else { } else {
if (optUUID) { if (optUUID) {
if (virDomainGetUUIDString(dom, uuid) < 0) { if (virDomainGetUUIDString(dom, uuid) < 0) {