From: Ján Tomko Date: Wed, 11 Aug 2021 14:16:39 +0000 (+0200) Subject: tools: virsh: cmdDominfo: rename 'ostype' variable X-Git-Tag: v7.7.0-rc1~197 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c0443fb7301afaa08132a240490de1d1414e8da;p=thirdparty%2Flibvirt.git tools: virsh: cmdDominfo: rename 'ostype' variable Use 'ostype' instead of generic 'str', to discourage reuse. Also mark it as autofree. Signed-off-by: Ján Tomko Reviewed-by: Martin Kletzander --- diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 55c8dcf118..365c84fb5b 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1276,7 +1276,8 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) bool ret = true; int autostart; unsigned int id; - char *str, uuid[VIR_UUID_STRING_BUFLEN]; + char uuid[VIR_UUID_STRING_BUFLEN]; + g_autofree char *ostype = NULL; int has_managed_save = 0; virshControl *priv = ctl->privData; g_auto(GStrv) messages = NULL; @@ -1294,10 +1295,8 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) if (virDomainGetUUIDString(dom, &uuid[0]) == 0) vshPrint(ctl, "%-15s %s\n", _("UUID:"), uuid); - if ((str = virDomainGetOSType(dom))) { - vshPrint(ctl, "%-15s %s\n", _("OS Type:"), str); - VIR_FREE(str); - } + if ((ostype = virDomainGetOSType(dom))) + vshPrint(ctl, "%-15s %s\n", _("OS Type:"), ostype); if (virDomainGetInfo(dom, &info) == 0) { vshPrint(ctl, "%-15s %s\n", _("State:"),