From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 4 Nov 2021 12:38:02 +0000 (+0100)
Subject: virNetDevVPortProfileParse: Use g_autofree
X-Git-Tag: v7.10.0-rc1~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c70cf347b9a63cd143b3f2bc9171be86dc467d85;p=thirdparty%2Flibvirt.git

virNetDevVPortProfileParse: Use g_autofree

Explicit calls to VIR_FREE() can be dropped then.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Kristína Hanicová <khanicov@redhat.com>
---

diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c
index d98ce098df..dfffc4dd70 100644
--- a/src/conf/netdev_vport_profile_conf.c
+++ b/src/conf/netdev_vport_profile_conf.c
@@ -29,14 +29,14 @@
 virNetDevVPortProfile *
 virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags)
 {
-    char *virtPortType;
-    char *virtPortManagerID = NULL;
-    char *virtPortTypeID = NULL;
-    char *virtPortTypeIDVersion = NULL;
-    char *virtPortInstanceID = NULL;
-    char *virtPortProfileID = NULL;
-    char *virtPortInterfaceID = NULL;
-    virNetDevVPortProfile *virtPort = NULL;
+    g_autofree char *virtPortType = NULL;
+    g_autofree char *virtPortManagerID = NULL;
+    g_autofree char *virtPortTypeID = NULL;
+    g_autofree char *virtPortTypeIDVersion = NULL;
+    g_autofree char *virtPortInstanceID = NULL;
+    g_autofree char *virtPortProfileID = NULL;
+    g_autofree char *virtPortInterfaceID = NULL;
+    g_autofree virNetDevVPortProfile *virtPort = NULL;
     xmlNodePtr cur = node->children;
 
     virtPort = g_new0(virNetDevVPortProfile, 1);
@@ -178,20 +178,10 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags)
     if (virNetDevVPortProfileCheckNoExtras(virtPort) < 0)
         goto error;
 
- cleanup:
-    VIR_FREE(virtPortManagerID);
-    VIR_FREE(virtPortTypeID);
-    VIR_FREE(virtPortTypeIDVersion);
-    VIR_FREE(virtPortInstanceID);
-    VIR_FREE(virtPortProfileID);
-    VIR_FREE(virtPortType);
-    VIR_FREE(virtPortInterfaceID);
-
-    return virtPort;
+    return g_steal_pointer(&virtPort);
 
  error:
-    VIR_FREE(virtPort);
-    goto cleanup;
+    return NULL;
 }