Use g_autoptr instead of virNetDevIPRouteFree if possible

In files: src/conf/domain_conf: in virDomainNetIPInfoParseXML(),
src/lxc/lxc_native: in lxcAddNetworkRouteDefinition(),
src/vz/vz_sdk: in prlsdkGetRoutes(), src/conf/networkcommon_conf:
in virNetDevIPRouteCreate()

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b731744f0407c66e4e3c1791843b401138c68eaf..25049119317a759b4f5abf54dd3378f8d9e3986e 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7481,7 +7481,7 @@ virDomainNetIPInfoParseXML(const char *source,
                            xmlXPathContextPtr ctxt,
                            virNetDevIPInfoPtr def)
 {
-    virNetDevIPRoutePtr route = NULL;
+    g_autoptr(virNetDevIPRoute) route = NULL;
     int nnodes;
     int ret = -1;
     size_t i;
@@ -7511,7 +7511,6 @@ virDomainNetIPInfoParseXML(const char *source,
  cleanup:
     if (ret < 0)
         virNetDevIPInfoClear(def);
-    virNetDevIPRouteFree(route);
     return ret;
 }
 

diff --git a/src/conf/networkcommon_conf.c b/src/conf/networkcommon_conf.c
index 430d48a9977516384432f938d45ade11c9786750..db78b852686794400cf998119f23e94acbc16bea 100644 (file)
--- a/src/conf/networkcommon_conf.c
+++ b/src/conf/networkcommon_conf.c
@@ -41,7 +41,7 @@ virNetDevIPRouteCreate(const char *errorDetail,
                        unsigned int metric,
                        bool hasMetric)
 {
-    virNetDevIPRoutePtr def = NULL;
+    g_autoptr(virNetDevIPRoute) def = NULL;
     virSocketAddr testAddr;
 
     def = g_new0(virNetDevIPRoute, 1);
@@ -209,10 +209,9 @@ virNetDevIPRouteCreate(const char *errorDetail,
         goto error;
     }
 
-    return def;
+    return g_steal_pointer(&def);
 
  error:
-    virNetDevIPRouteFree(def);
     return NULL;
 }
 

diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index b903dc91d6cefb33104680c7ae7642dcec50b69c..d5020dafa7addd4ec2476b38fc251fe367f0b995 100644 (file)
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -441,7 +441,7 @@ lxcAddNetworkRouteDefinition(const char *address,
                              virNetDevIPRoutePtr **routes,
                              size_t *nroutes)
 {
-    virNetDevIPRoutePtr route = NULL;
+    g_autoptr(virNetDevIPRoute) route = NULL;
     g_autofree char *familyStr = NULL;
     g_autofree char *zero = NULL;
 
@@ -460,7 +460,6 @@ lxcAddNetworkRouteDefinition(const char *address,
     return 0;
 
  error:
-    virNetDevIPRouteFree(route);
     return -1;
 }
 

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index f49cd983f0059ab5121c20fd473d978c719ca2e9..6f712c7a31dd7cda932e925a4445df0b7007a4f1 100644 (file)
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -974,7 +974,7 @@ prlsdkGetRoutes(PRL_HANDLE sdknet, virDomainNetDefPtr net)
     int ret = -1;
     char *gw = NULL;
     char *gw6 = NULL;
-    virNetDevIPRoutePtr route = NULL;
+    g_autoptr(virNetDevIPRoute) route = NULL;
 
     if (!(gw = prlsdkGetStringParamVar(PrlVmDevNet_GetDefaultGateway, sdknet)))
         goto cleanup;
@@ -1006,7 +1006,6 @@ prlsdkGetRoutes(PRL_HANDLE sdknet, virDomainNetDefPtr net)
     ret = 0;
 
  cleanup:
-    virNetDevIPRouteFree(route);
     VIR_FREE(gw);
     VIR_FREE(gw6);