[PATCH 1/4] virNetDevVPortProfileParse: Use g_autofree

Explicit calls to VIR_FREE() can be dropped then. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- src/conf/netdev_vport_profile_conf.c | 30 ++++++++++------------------ 1 file changed, 10 insertions(+), 20 deletions(-) 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; } -- 2.32.0