提交 d20f55c0 编写于 作者: J Ján Tomko

virsh: use g_strdup in cmdDomblkinfoGet

Prefer GLib's g_strdup to vshStrdup.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NDaniel Henrique Barboza <danielhb413@gmail.com>
上级 4e66c386
......@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册