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

virsh: use g_strdup in cmdDomblkinfoGet

Browse Source 
Prefer GLib's g_strdup to vshStrdup.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Ján Tomko 2019-10-18 17:24:29 +02:00
parent 4e66c38655
commit d20f55c0f3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -420,17 +420,16 @@ static const vshCmdOptDef opts_domblkinfo[] = {
};
static bool
cmdDomblkinfoGet(vshControl *ctl,
const virDomainBlockInfo *info,
cmdDomblkinfoGet(const virDomainBlockInfo *info,
char **cap,
char **alloc,
char **phy,
bool human)
{
if (info->capacity == 0 && info->allocation == 0 && info->physical == 0) {
*cap = vshStrdup(ctl, "-");
*alloc = vshStrdup(ctl, "-");
*phy = vshStrdup(ctl, "-");
*cap = g_strdup("-");
*alloc = g_strdup("-");
*phy = g_strdup("-");
} else if (!human) {
if (virAsprintf(cap, "%llu", info->capacity) < 0 ||
virAsprintf(alloc, "%llu", info->allocation) < 0 ||
@ -530,7 +529,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd)
memset(&info, 0, sizeof(info));
}
if (!cmdDomblkinfoGet(ctl, &info, &cap, &alloc, &phy, human))
if (!cmdDomblkinfoGet(&info, &cap, &alloc, &phy, human))
goto cleanup;
if (vshTableRowAppend(table, target, cap, alloc, phy, NULL) < 0)
goto cleanup;
@ -545,7 +544,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd)
if (virDomainGetBlockInfo(dom, device, &info, 0) < 0)
goto cleanup;
if (!cmdDomblkinfoGet(ctl, &info, &cap, &alloc, &phy, human))
if (!cmdDomblkinfoGet(&info, &cap, &alloc, &phy, human))
goto cleanup;
vshPrint(ctl, "%-15s %s\n", _("Capacity:"), cap);
vshPrint(ctl, "%-15s %s\n", _("Allocation:"), alloc);