Use g_steal_pointer where possible

Via coccinelle (not the handbag!)
spatches used:
@ rule1 @
identifier a, b;
symbol NULL;
@@

- b = a;
  ... when != a
- a = NULL;
+ b = g_steal_pointer(&a);

@@

- *b = a;
  ... when != a
- a = NULL;
+ *b = g_steal_pointer(&a);

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/admin/admin_server.c b/src/admin/admin_server.c
index ebc0cfb0451ca155b5f454693e24df88476f990c..7d1a21a6780446a3b59cc24fa53bb2fe56ccdb0c 100644 (file)
--- a/src/admin/admin_server.c
+++ b/src/admin/admin_server.c
@@ -50,8 +50,7 @@ adminConnectListServers(virNetDaemonPtr dmn,
         goto cleanup;
 
     if (servers) {
-        *servers = srvs;
-        srvs = NULL;
+        *servers = g_steal_pointer(&srvs);
     }
  cleanup:
     if (ret > 0)
@@ -179,8 +178,7 @@ adminServerListClients(virNetServerPtr srv,
         return -1;
 
     if (clients) {
-        *clients = clts;
-        clts = NULL;
+        *clients = g_steal_pointer(&clts);
     }
 
     virObjectListFreeCount(clts, ret);

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 69d9bb0e389babb523dc05519067cf6fa4766887..f610975ae5ea9db92899508e05a3a7f05ee3a62f 100644 (file)
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -1501,9 +1501,8 @@ virCapabilitiesGetNUMASiblingInfo(int node,
     if (VIR_REALLOC_N(tmp, tmp_size) < 0)
         goto cleanup;
 
-    *siblings = tmp;
     *nsiblings = tmp_size;
-    tmp = NULL;
+    *siblings = g_steal_pointer(&tmp);
     tmp_size = 0;
     ret = 0;
  cleanup:

diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c
index 4fb7aa4e3d2c4e7abc86b49e096c42fae2503bc1..ff25641b2c01a7c323c4b7fe1769dcf1f13cd7c7 100644 (file)
--- a/src/conf/netdev_bandwidth_conf.c
+++ b/src/conf/netdev_bandwidth_conf.c
@@ -205,8 +205,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth,
     if (!def->in && !def->out)
         VIR_FREE(def);
 
-    *bandwidth = def;
-    def = NULL;
+    *bandwidth = g_steal_pointer(&def);
     ret = 0;
 
  cleanup:

diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c
index 2521cd56c2be0501c7abaf3349f8c362b86937f5..d37bbc94a637ff9a30064c2177ed7ddb37a2e68a 100644 (file)
--- a/src/conf/virdomainobjlist.c
+++ b/src/conf/virdomainobjlist.c
@@ -1083,8 +1083,7 @@ virDomainObjListExport(virDomainObjListPtr domlist,
                 goto cleanup;
         }
 
-        *domains = doms;
-        doms = NULL;
+        *domains = g_steal_pointer(&doms);
     }
 
     ret = nvms;

diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c
index 3157522eb25a8750e11f7484fe3f05a19bebcf1b..f4bf1b083d0e3508bef2a5b9de35a437102ec1fa 100644 (file)
--- a/src/conf/virnwfilterobj.c
+++ b/src/conf/virnwfilterobj.c
@@ -464,8 +464,7 @@ virNWFilterObjListExport(virConnectPtr conn,
         virNWFilterObjUnlock(obj);
     }
 
-    *filters = tmp_filters;
-    tmp_filters = NULL;
+    *filters = g_steal_pointer(&tmp_filters);
     ret = nfilters;
 
  cleanup:

diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c
index e40a4cb1083a63914d45bd72fd5e25d19637e46f..f8613fea86c88e67d542774f00f91f2e99d9171f 100644 (file)
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -715,8 +715,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn,
     if (tmp_iface_objs) {
         /* trim the array to the final size */
         ignore_value(VIR_REALLOC_N(tmp_iface_objs, niface_objs + 1));
-        *ifaces = tmp_iface_objs;
-        tmp_iface_objs = NULL;
+        *ifaces = g_steal_pointer(&tmp_iface_objs);
     }
 
     ret = niface_objs;

diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
index 6a94a4504467acb5bca866d76907b207f18fda9d..ab95b2e3ff00cf6dab03e0f07788949780ca8ccd 100644 (file)
--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
@@ -394,8 +394,7 @@ udevConnectListAllInterfaces(virConnectPtr conn,
     /* Trim the array to its final size */
     if (ifaces) {
         ignore_value(VIR_REALLOC_N(ifaces_list, count + 1));
-        *ifaces = ifaces_list;
-        ifaces_list = NULL;
+        *ifaces = g_steal_pointer(&ifaces_list);
     }
 
     return count;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b9bbdf8d483159539ff3fa3afabaab0e10643b46..d1a36597745ff0b6ee47b086b872d16edb0caa47 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5097,8 +5097,7 @@ qemuDomainGetIOThreadsConfig(virDomainDefPtr targetDef,
         bitmap = NULL;
     }
 
-    *info = info_ret;
-    info_ret = NULL;
+    *info = g_steal_pointer(&info_ret);
     ret = targetDef->niothreadids;
 
  cleanup:
@@ -9133,9 +9132,8 @@ qemuDomainGetPerfEvents(virDomainPtr dom,
             goto endjob;
     }
 
-    *params = par;
     *nparams = npar;
-    par = NULL;
+    *params = g_steal_pointer(&par);
     npar = 0;
     ret = 0;
 
@@ -18729,8 +18727,7 @@ qemuConnectGetAllDomainStats(virConnectPtr conn,
         virObjectUnlock(vm);
     }
 
-    *retStats = tmpstats;
-    tmpstats = NULL;
+    *retStats = g_steal_pointer(&tmpstats);
 
     ret = nstats;
 
@@ -19259,9 +19256,8 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr *params,
 
 #undef ADD_BITMAP
 
-    *params = par;
     *nparams = npar;
-    par = NULL;
+    *params = g_steal_pointer(&par);
     ret = 0;
 
  cleanup:

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index b2034b3a40af28778fadf7e2370928474abfe015..f706ef65fcd3ea53d20321932b11b41e389aa9f1 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -5822,8 +5822,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon,
     }
 
     ret = n;
-    *machines = infolist;
-    infolist = NULL;
+    *machines = g_steal_pointer(&infolist);
 
  cleanup:
     if (infolist) {
@@ -6270,8 +6269,7 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon,
     }
 
     ret = n;
-    *commands = commandlist;
-    commandlist = NULL;
+    *commands = g_steal_pointer(&commandlist);
 
 
  cleanup:
@@ -6329,8 +6327,7 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon,
     }
 
     ret = n;
-    *events = eventlist;
-    eventlist = NULL;
+    *events = g_steal_pointer(&eventlist);
 
  cleanup:
     g_strfreev(eventlist);
@@ -6474,8 +6471,7 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon,
     }
 
     ret = n;
-    *types = typelist;
-    typelist = NULL;
+    *types = g_steal_pointer(&typelist);
 
  cleanup:
     g_strfreev(typelist);
@@ -6544,8 +6540,7 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon,
     }
 
     ret = n;
-    *paths = pathlist;
-    pathlist = NULL;
+    *paths = g_steal_pointer(&pathlist);
 
  cleanup:
     if (pathlist) {
@@ -6781,8 +6776,7 @@ qemuMonitorJSONParsePropsList(virJSONValuePtr cmd,
     }
 
     ret = count;
-    *props = proplist;
-    proplist = NULL;
+    *props = g_steal_pointer(&proplist);
 
  cleanup:
     g_strfreev(proplist);
@@ -6964,8 +6958,7 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon,
     }
 
     ret = n;
-    *capabilities = list;
-    list = NULL;
+    *capabilities = g_steal_pointer(&list);
 
  cleanup:
     g_strfreev(list);
@@ -7093,8 +7086,7 @@ qemuMonitorJSONGetGICCapabilities(qemuMonitorPtr mon,
     }
 
     ret = n;
-    *capabilities = list;
-    list = NULL;
+    *capabilities = g_steal_pointer(&list);
 
  cleanup:
     VIR_FREE(list);
@@ -8155,8 +8147,7 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon,
     }
 
     *niothreads = n;
-    *iothreads = infolist;
-    infolist = NULL;
+    *iothreads = g_steal_pointer(&infolist);
     ret = 0;
 
  cleanup:

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index a83cd866e763b07dc87dd926086d34e0bedc8ac6..31868269b17fc491f03e1a9deb08fe090a1a0004 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -6299,8 +6299,7 @@ remoteConnectGetCPUModelNames(virConnectPtr conn,
             retmodels[i] = ret.models.models_val[i];
             ret.models.models_val[i] = NULL;
         }
-        *models = retmodels;
-        retmodels = NULL;
+        *models = g_steal_pointer(&retmodels);
     }
 
     rv = ret.ret;
@@ -7464,8 +7463,7 @@ remoteNetworkGetDHCPLeases(virNetworkPtr net,
                 goto cleanup;
         }
 
-        *leases = leases_ret;
-        leases_ret = NULL;
+        *leases = g_steal_pointer(&leases_ret);
     }
 
     rv = ret.ret;
@@ -7555,8 +7553,7 @@ remoteConnectGetAllDomainStats(virConnectPtr conn,
         elem = NULL;
     }
 
-    *retStats = tmpret;
-    tmpret = NULL;
+    *retStats = g_steal_pointer(&tmpret);
     rv = ret.retStats.retStats_len;
 
  cleanup:
@@ -7774,8 +7771,7 @@ remoteDomainInterfaceAddresses(virDomainPtr dom,
             }
         }
     }
-    *ifaces = ifaces_ret;
-    ifaces_ret = NULL;
+    *ifaces = g_steal_pointer(&ifaces_ret);
 
     rv = ret.ifaces.ifaces_len;
 

diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 30faa0190b55288f587bc9c339ea3f7fe37990b7..2b849465c3dfd8d872d21662e9cded5ff64cbee4 100644 (file)
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -1111,8 +1111,7 @@ virNetServerGetClients(virNetServerPtr srv,
         }
     }
 
-    *clts = list;
-    list = NULL;
+    *clts = g_steal_pointer(&list);
     ret = nclients;
 
  cleanup:

diff --git a/src/util/virfile.c b/src/util/virfile.c
index 5710495bbf1eaa5a29c3aea4b9929b2ecd1f1d02..7cb60e66d327fe2e328e6fc139b0dd2ad941bf1a 100644 (file)
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -840,8 +840,7 @@ int virFileLoopDeviceAssociate(const char *file,
     }
 
     VIR_DEBUG("Attached loop device  %s %d to %s", file, lofd, loname);
-    *dev = loname;
-    loname = NULL;
+    *dev = g_steal_pointer(&loname);
 
     ret = 0;
 
@@ -3200,8 +3199,7 @@ virFileOpenTty(int *ttyprimary, char **ttyName, int rawmode)
             errno = rc;
             goto cleanup;
         }
-        *ttyName = name;
-        name = NULL;
+        *ttyName = g_steal_pointer(&name);
     }
 
     ret = 0;
@@ -3637,9 +3635,8 @@ virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs,
         tmp->deflt = tmp->size == default_hugepagesz;
     }
 
-    *ret_fs = fs;
     *ret_nfs = nfs;
-    fs = NULL;
+    *ret_fs = g_steal_pointer(&fs);
     nfs = 0;
     ret = 0;
 

diff --git a/src/util/virlog.c b/src/util/virlog.c
index cdfeba82512c6881423e0e3c292f43ec4c3ee3d6..00c0fcc45702c2488bcd355beb82a8dbbada9709 100644 (file)
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -1658,8 +1658,7 @@ virLogParseOutputs(const char *src, virLogOutputPtr **outputs)
     }
 
     ret = noutputs;
-    *outputs = list;
-    list = NULL;
+    *outputs = g_steal_pointer(&list);
  cleanup:
     g_strfreev(strings);
     return ret;
@@ -1708,8 +1707,7 @@ virLogParseFilters(const char *src, virLogFilterPtr **filters)
     }
 
     ret = nfilters;
-    *filters = list;
-    list = NULL;
+    *filters = g_steal_pointer(&list);
  cleanup:
     g_strfreev(strings);
     return ret;

diff --git a/src/util/virmdev.c b/src/util/virmdev.c
index db40fe8cc3745c7b5dbcf44b6881ed72b9da3bf3..2b7f730bd1cf99e4d76aa456cbe817ecd3f7fbdd 100644 (file)
--- a/src/util/virmdev.c
+++ b/src/util/virmdev.c
@@ -95,8 +95,7 @@ virMediatedDeviceGetSysfsDeviceAPI(virMediatedDevicePtr dev,
     if ((tmp = strchr(buf, '\n')))
         *tmp = '\0';
 
-    *device_api = buf;
-    buf = NULL;
+    *device_api = g_steal_pointer(&buf);
 
     return 0;
 }

diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index 995650334ceaf3a44075b828ae94897aaf1c20c4..001602825401f362d33599b8c0a15eb833aa329c 100644 (file)
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
@@ -258,8 +258,7 @@ virSysinfoParsePPCSystem(const char *base, virSysinfoSystemDefPtr *sysdef)
         def = NULL;
     }
 
-    *sysdef = def;
-    def = NULL;
+    *sysdef = g_steal_pointer(&def);
     ret = 0;
     virSysinfoSystemDefFree(def);
     return ret;
@@ -381,8 +380,7 @@ virSysinfoParseARMSystem(const char *base, virSysinfoSystemDefPtr *sysdef)
         def = NULL;
     }
 
-    *sysdef = def;
-    def = NULL;
+    *sysdef = g_steal_pointer(&def);
     ret = 0;
     virSysinfoSystemDefFree(def);
     return ret;
@@ -521,8 +519,7 @@ virSysinfoParseS390System(const char *base, virSysinfoSystemDefPtr *sysdef)
         def = NULL;
     }
 
-    *sysdef = def;
-    def = NULL;
+    *sysdef = g_steal_pointer(&def);
     ret = 0;
  cleanup:
     virSysinfoSystemDefFree(def);
@@ -686,8 +683,7 @@ virSysinfoParseBIOS(const char *base, virSysinfoBIOSDefPtr *bios)
         def = NULL;
     }
 
-    *bios = def;
-    def = NULL;
+    *bios = g_steal_pointer(&def);
     ret = 0;
     virSysinfoBIOSDefFree(def);
     return ret;
@@ -763,8 +759,7 @@ virSysinfoParseX86System(const char *base, virSysinfoSystemDefPtr *sysdef)
         def = NULL;
     }
 
-    *sysdef = def;
-    def = NULL;
+    *sysdef = g_steal_pointer(&def);
     ret = 0;
     virSysinfoSystemDefFree(def);
     return ret;
@@ -845,9 +840,8 @@ virSysinfoParseX86BaseBoard(const char *base,
         ignore_value(VIR_REALLOC_N(boards, nboards));
     }
 
-    *baseBoard = boards;
     *nbaseBoard = nboards;
-    boards = NULL;
+    *baseBoard = g_steal_pointer(&boards);
     nboards = 0;
     ret = 0;
  cleanup:
@@ -915,8 +909,7 @@ virSysinfoParseX86Chassis(const char *base,
         def = NULL;
     }
 
-    *chassisdef = def;
-    def = NULL;
+    *chassisdef = g_steal_pointer(&def);
     ret = 0;
     virSysinfoChassisDefFree(def);
     return ret;

diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c
index f9ab6f6042861812714a3f67bebd738681ae2a92..c4c26a1183acadd316eb3b6a2c36e1a7f6e6d463 100644 (file)
--- a/src/util/virtypedparam.c
+++ b/src/util/virtypedparam.c
@@ -706,9 +706,8 @@ virTypedParamsSerialize(virTypedParameterPtr params,
         j++;
     }
 
-    *remote_params_val = params_val;
     *remote_params_len = params_len;
-    params_val = NULL;
+    *remote_params_val = g_steal_pointer(&params_val);
     rv = 0;
 
  cleanup:

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 138403b034081154a89a2aab9c8621eba950c222..0c4126bd38056cf97eb7b4bd01118d9f10fce474 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -7583,8 +7583,7 @@ vboxConnectListAllDomains(virConnectPtr conn,
         /* safe to ignore, new size will be equal or less than
          * previous allocation */
         ignore_value(VIR_REALLOC_N(doms, count + 1));
-        *domains = doms;
-        doms = NULL;
+        *domains = g_steal_pointer(&doms);
     }
 
     ret = count;

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 0ebcb06234b1deaa5022fce28fcf63edab34e5bb..60ed286ceedcf1a286f1599222ac3f8a4afaeeea 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -3817,8 +3817,7 @@ vzConnectGetAllDomainStats(virConnectPtr conn,
         tmpstats[nstats++] = tmp;
     }
 
-    *retStats = tmpstats;
-    tmpstats = NULL;
+    *retStats = g_steal_pointer(&tmpstats);
     ret = nstats;
 
  cleanup:

diff --git a/tests/commandhelper.c b/tests/commandhelper.c
index b3c65ab3cc2ed8b36bde15d565de40cf42a07cec..ee06339392f4c3cd1a8a0a7c51efe14e1fef52a8 100644 (file)
--- a/tests/commandhelper.c
+++ b/tests/commandhelper.c
@@ -116,8 +116,7 @@ static struct Arguments *parseArguments(int argc, char** argv)
         }
     }
 
-    ret = args;
-    args = NULL;
+    ret = g_steal_pointer(&args);
     return ret;
 }
 

diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c
index 6e68ba66fff172c0a927b1e345dbebe47a3c9a1d..91f7c963c1e548769545b8cf85b8bf254d7488db 100644 (file)
--- a/tools/virsh-checkpoint.c
+++ b/tools/virsh-checkpoint.c
@@ -633,8 +633,7 @@ virshCheckpointListCollect(vshControl *ctl,
         qsort(checkpointlist->chks, checkpointlist->nchks,
               sizeof(*checkpointlist->chks), virshChkSorter);
 
-    ret = checkpointlist;
-    checkpointlist = NULL;
+    ret = g_steal_pointer(&checkpointlist);
 
  cleanup:
     virshCheckpointListFree(checkpointlist);

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index df334676468ee9d69b354cdb7104c12b3e043336..cac2d33a293202f3d53b9d9a336529e6ca092d05 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -5187,8 +5187,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd,
         goto cleanup;
 
     ret = nparams;
-    *update_params = params;
-    params = NULL;
+    *update_params = g_steal_pointer(&params);
 
  cleanup:
     VIR_FREE(set_field);