[libvirt PATCH 03/12] tools: virsh: cmdDominfo: rename 'ostype' variable

Ján Tomko jtomko at redhat.com
Thu Aug 12 08:32:41 UTC 2021


Use 'ostype' instead of generic 'str', to discourage
reuse. Also mark it as autofree.

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 tools/virsh-domain-monitor.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index a2bf5c05fc..cf0803dcd3 100644
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -1288,7 +1288,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;
@@ -1306,10 +1307,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:"),
-- 
2.31.1




More information about the libvir-list mailing list