From nobody Mon May 6 07:18:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614088785; cv=none; d=zohomail.com; s=zohoarc; b=gpymCUFT5ea3OojtMxmNLL+yUmIaytGzbspfRvfNgZ/5kdLsEys1OAEIoXK5L1ugIh9MuVvm8VLX+gRcx+XUwEoSRCESC9jLMM2AnhZa6pESX/eJLnIb1oR2Q0inuODKzNwL4reVBGay7T7Pj2BgoCHmSpD4FnkbxNXhDKpbWdE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614088785; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=AhQFvJg3RcBjTaVu5ldEoKGKRcREA+uCXWnAfhANJLA=; b=A3XCxvhpeTyWBo6Ujra3t14VzWjDDJ8VmMpCbo5DurHT2ZtuLgWHt/6adshfhARAA0Nkqwa9tbBTbTRqF2il31ufmY5wH/IaxSZ7NtJ9Yl+c/ADRAZGh2YutlnVjFa78D1OWhbEMGV3OB9sNzrFFOKk4d5GrB1R4O8GeQuq2NlA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1614088784637840.7516759375786; Tue, 23 Feb 2021 05:59:44 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-149-wo7TstuVPLqAdpozJI0jTQ-1; Tue, 23 Feb 2021 08:58:59 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8655580196C; Tue, 23 Feb 2021 13:58:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4AD5D60C04; Tue, 23 Feb 2021 13:58:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 145534E58E; Tue, 23 Feb 2021 13:58:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11NDwmgI016316 for ; Tue, 23 Feb 2021 08:58:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4E4D45D6CF; Tue, 23 Feb 2021 13:58:48 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.194.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 653BB5D6AC for ; Tue, 23 Feb 2021 13:58:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614088783; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=AhQFvJg3RcBjTaVu5ldEoKGKRcREA+uCXWnAfhANJLA=; b=KAN3hTJw1mbefNVIKqclXB7TEmEUlvJD5hsYWcPHuhhDZcdIGx86F3P21devui6YsfXM3j BviEsZK3hyofzvsyvct5lk4NP8yI1oNDoKtt6u5T6EXgsJhvEAkDkhk8JhGVPy6+ZPBu/X TgfKDX6QZlnA3P1d9cl2O4xuqDmFzeg= X-MC-Unique: wo7TstuVPLqAdpozJI0jTQ-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH] Use g_steal_pointer where possible Date: Tue, 23 Feb 2021 14:58:29 +0100 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Via coccinelle (not the hanbag!) spatches used: @ rule1 @ identifier a, b; symbol NULL; @@ - b =3D a; ... when !=3D a - a =3D NULL; + b =3D g_steal_pointer(&a); @@ - *b =3D a; ... when !=3D a - a =3D NULL; + *b =3D g_steal_pointer(&a); Signed-off-by: Kristina Hanicova Reviewed-by: J=C3=A1n Tomko --- src/admin/admin_server.c | 6 ++---- src/conf/capabilities.c | 3 +-- src/conf/netdev_bandwidth_conf.c | 3 +-- src/conf/virdomainobjlist.c | 3 +-- src/conf/virnwfilterobj.c | 3 +-- src/interface/interface_backend_netcf.c | 3 +-- src/interface/interface_backend_udev.c | 3 +-- src/qemu/qemu_driver.c | 12 ++++------- src/qemu/qemu_monitor_json.c | 27 +++++++++---------------- src/remote/remote_driver.c | 12 ++++------- src/rpc/virnetserver.c | 3 +-- src/util/virfile.c | 9 +++------ src/util/virlog.c | 6 ++---- src/util/virmdev.c | 3 +-- src/util/virsysinfo.c | 21 +++++++------------ src/util/virtypedparam.c | 3 +-- src/vbox/vbox_common.c | 3 +-- src/vz/vz_driver.c | 3 +-- tests/commandhelper.c | 3 +-- tools/virsh-checkpoint.c | 3 +-- tools/virsh-domain.c | 3 +-- 21 files changed, 45 insertions(+), 90 deletions(-) diff --git a/src/admin/admin_server.c b/src/admin/admin_server.c index ebc0cfb045..7d1a21a678 100644 --- a/src/admin/admin_server.c +++ b/src/admin/admin_server.c @@ -50,8 +50,7 @@ adminConnectListServers(virNetDaemonPtr dmn, goto cleanup; =20 if (servers) { - *servers =3D srvs; - srvs =3D NULL; + *servers =3D g_steal_pointer(&srvs); } cleanup: if (ret > 0) @@ -179,8 +178,7 @@ adminServerListClients(virNetServerPtr srv, return -1; =20 if (clients) { - *clients =3D clts; - clts =3D NULL; + *clients =3D g_steal_pointer(&clts); } =20 virObjectListFreeCount(clts, ret); diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 69d9bb0e38..f610975ae5 100644 --- 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; =20 - *siblings =3D tmp; *nsiblings =3D tmp_size; - tmp =3D NULL; + *siblings =3D g_steal_pointer(&tmp); tmp_size =3D 0; ret =3D 0; cleanup: diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_c= onf.c index 4fb7aa4e3d..ff25641b2c 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -205,8 +205,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidt= h, if (!def->in && !def->out) VIR_FREE(def); =20 - *bandwidth =3D def; - def =3D NULL; + *bandwidth =3D g_steal_pointer(&def); ret =3D 0; =20 cleanup: diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 2521cd56c2..d37bbc94a6 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -1083,8 +1083,7 @@ virDomainObjListExport(virDomainObjListPtr domlist, goto cleanup; } =20 - *domains =3D doms; - doms =3D NULL; + *domains =3D g_steal_pointer(&doms); } =20 ret =3D nvms; diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index 3157522eb2..f4bf1b083d 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -464,8 +464,7 @@ virNWFilterObjListExport(virConnectPtr conn, virNWFilterObjUnlock(obj); } =20 - *filters =3D tmp_filters; - tmp_filters =3D NULL; + *filters =3D g_steal_pointer(&tmp_filters); ret =3D nfilters; =20 cleanup: diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interf= ace_backend_netcf.c index e40a4cb108..f8613fea86 100644 --- 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 =3D tmp_iface_objs; - tmp_iface_objs =3D NULL; + *ifaces =3D g_steal_pointer(&tmp_iface_objs); } =20 ret =3D niface_objs; diff --git a/src/interface/interface_backend_udev.c b/src/interface/interfa= ce_backend_udev.c index 6a94a45044..ab95b2e3ff 100644 --- 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 =3D ifaces_list; - ifaces_list =3D NULL; + *ifaces =3D g_steal_pointer(&ifaces_list); } =20 return count; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b9bbdf8d48..d1a3659774 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5097,8 +5097,7 @@ qemuDomainGetIOThreadsConfig(virDomainDefPtr targetDe= f, bitmap =3D NULL; } =20 - *info =3D info_ret; - info_ret =3D NULL; + *info =3D g_steal_pointer(&info_ret); ret =3D targetDef->niothreadids; =20 cleanup: @@ -9133,9 +9132,8 @@ qemuDomainGetPerfEvents(virDomainPtr dom, goto endjob; } =20 - *params =3D par; *nparams =3D npar; - par =3D NULL; + *params =3D g_steal_pointer(&par); npar =3D 0; ret =3D 0; =20 @@ -18729,8 +18727,7 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, virObjectUnlock(vm); } =20 - *retStats =3D tmpstats; - tmpstats =3D NULL; + *retStats =3D g_steal_pointer(&tmpstats); =20 ret =3D nstats; =20 @@ -19259,9 +19256,8 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr = *params, =20 #undef ADD_BITMAP =20 - *params =3D par; *nparams =3D npar; - par =3D NULL; + *params =3D g_steal_pointer(&par); ret =3D 0; =20 cleanup: diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f8c78d9093..819389f5f9 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5820,8 +5820,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, } =20 ret =3D n; - *machines =3D infolist; - infolist =3D NULL; + *machines =3D g_steal_pointer(&infolist); =20 cleanup: if (infolist) { @@ -6268,8 +6267,7 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, } =20 ret =3D n; - *commands =3D commandlist; - commandlist =3D NULL; + *commands =3D g_steal_pointer(&commandlist); =20 =20 cleanup: @@ -6327,8 +6325,7 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, } =20 ret =3D n; - *events =3D eventlist; - eventlist =3D NULL; + *events =3D g_steal_pointer(&eventlist); =20 cleanup: g_strfreev(eventlist); @@ -6472,8 +6469,7 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, } =20 ret =3D n; - *types =3D typelist; - typelist =3D NULL; + *types =3D g_steal_pointer(&typelist); =20 cleanup: g_strfreev(typelist); @@ -6542,8 +6538,7 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr = mon, } =20 ret =3D n; - *paths =3D pathlist; - pathlist =3D NULL; + *paths =3D g_steal_pointer(&pathlist); =20 cleanup: if (pathlist) { @@ -6779,8 +6774,7 @@ qemuMonitorJSONParsePropsList(virJSONValuePtr cmd, } =20 ret =3D count; - *props =3D proplist; - proplist =3D NULL; + *props =3D g_steal_pointer(&proplist); =20 cleanup: g_strfreev(proplist); @@ -6962,8 +6956,7 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPt= r mon, } =20 ret =3D n; - *capabilities =3D list; - list =3D NULL; + *capabilities =3D g_steal_pointer(&list); =20 cleanup: g_strfreev(list); @@ -7091,8 +7084,7 @@ qemuMonitorJSONGetGICCapabilities(qemuMonitorPtr mon, } =20 ret =3D n; - *capabilities =3D list; - list =3D NULL; + *capabilities =3D g_steal_pointer(&list); =20 cleanup: VIR_FREE(list); @@ -8157,8 +8149,7 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, } =20 *niothreads =3D n; - *iothreads =3D infolist; - infolist =3D NULL; + *iothreads =3D g_steal_pointer(&infolist); ret =3D 0; =20 cleanup: diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index a83cd866e7..31868269b1 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6299,8 +6299,7 @@ remoteConnectGetCPUModelNames(virConnectPtr conn, retmodels[i] =3D ret.models.models_val[i]; ret.models.models_val[i] =3D NULL; } - *models =3D retmodels; - retmodels =3D NULL; + *models =3D g_steal_pointer(&retmodels); } =20 rv =3D ret.ret; @@ -7464,8 +7463,7 @@ remoteNetworkGetDHCPLeases(virNetworkPtr net, goto cleanup; } =20 - *leases =3D leases_ret; - leases_ret =3D NULL; + *leases =3D g_steal_pointer(&leases_ret); } =20 rv =3D ret.ret; @@ -7555,8 +7553,7 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, elem =3D NULL; } =20 - *retStats =3D tmpret; - tmpret =3D NULL; + *retStats =3D g_steal_pointer(&tmpret); rv =3D ret.retStats.retStats_len; =20 cleanup: @@ -7774,8 +7771,7 @@ remoteDomainInterfaceAddresses(virDomainPtr dom, } } } - *ifaces =3D ifaces_ret; - ifaces_ret =3D NULL; + *ifaces =3D g_steal_pointer(&ifaces_ret); =20 rv =3D ret.ifaces.ifaces_len; =20 diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index f0b866a962..265400ecfa 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -1146,8 +1146,7 @@ virNetServerGetClients(virNetServerPtr srv, } } =20 - *clts =3D list; - list =3D NULL; + *clts =3D g_steal_pointer(&list); ret =3D nclients; =20 cleanup: diff --git a/src/util/virfile.c b/src/util/virfile.c index 5710495bbf..7cb60e66d3 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -840,8 +840,7 @@ int virFileLoopDeviceAssociate(const char *file, } =20 VIR_DEBUG("Attached loop device %s %d to %s", file, lofd, loname); - *dev =3D loname; - loname =3D NULL; + *dev =3D g_steal_pointer(&loname); =20 ret =3D 0; =20 @@ -3200,8 +3199,7 @@ virFileOpenTty(int *ttyprimary, char **ttyName, int r= awmode) errno =3D rc; goto cleanup; } - *ttyName =3D name; - name =3D NULL; + *ttyName =3D g_steal_pointer(&name); } =20 ret =3D 0; @@ -3637,9 +3635,8 @@ virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs, tmp->deflt =3D tmp->size =3D=3D default_hugepagesz; } =20 - *ret_fs =3D fs; *ret_nfs =3D nfs; - fs =3D NULL; + *ret_fs =3D g_steal_pointer(&fs); nfs =3D 0; ret =3D 0; =20 diff --git a/src/util/virlog.c b/src/util/virlog.c index cdfeba8251..00c0fcc457 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -1658,8 +1658,7 @@ virLogParseOutputs(const char *src, virLogOutputPtr *= *outputs) } =20 ret =3D noutputs; - *outputs =3D list; - list =3D NULL; + *outputs =3D g_steal_pointer(&list); cleanup: g_strfreev(strings); return ret; @@ -1708,8 +1707,7 @@ virLogParseFilters(const char *src, virLogFilterPtr *= *filters) } =20 ret =3D nfilters; - *filters =3D list; - list =3D NULL; + *filters =3D g_steal_pointer(&list); cleanup: g_strfreev(strings); return ret; diff --git a/src/util/virmdev.c b/src/util/virmdev.c index db40fe8cc3..2b7f730bd1 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -95,8 +95,7 @@ virMediatedDeviceGetSysfsDeviceAPI(virMediatedDevicePtr d= ev, if ((tmp =3D strchr(buf, '\n'))) *tmp =3D '\0'; =20 - *device_api =3D buf; - buf =3D NULL; + *device_api =3D g_steal_pointer(&buf); =20 return 0; } diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 995650334c..0016028254 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -258,8 +258,7 @@ virSysinfoParsePPCSystem(const char *base, virSysinfoSy= stemDefPtr *sysdef) def =3D NULL; } =20 - *sysdef =3D def; - def =3D NULL; + *sysdef =3D g_steal_pointer(&def); ret =3D 0; virSysinfoSystemDefFree(def); return ret; @@ -381,8 +380,7 @@ virSysinfoParseARMSystem(const char *base, virSysinfoSy= stemDefPtr *sysdef) def =3D NULL; } =20 - *sysdef =3D def; - def =3D NULL; + *sysdef =3D g_steal_pointer(&def); ret =3D 0; virSysinfoSystemDefFree(def); return ret; @@ -521,8 +519,7 @@ virSysinfoParseS390System(const char *base, virSysinfoS= ystemDefPtr *sysdef) def =3D NULL; } =20 - *sysdef =3D def; - def =3D NULL; + *sysdef =3D g_steal_pointer(&def); ret =3D 0; cleanup: virSysinfoSystemDefFree(def); @@ -686,8 +683,7 @@ virSysinfoParseBIOS(const char *base, virSysinfoBIOSDef= Ptr *bios) def =3D NULL; } =20 - *bios =3D def; - def =3D NULL; + *bios =3D g_steal_pointer(&def); ret =3D 0; virSysinfoBIOSDefFree(def); return ret; @@ -763,8 +759,7 @@ virSysinfoParseX86System(const char *base, virSysinfoSy= stemDefPtr *sysdef) def =3D NULL; } =20 - *sysdef =3D def; - def =3D NULL; + *sysdef =3D g_steal_pointer(&def); ret =3D 0; virSysinfoSystemDefFree(def); return ret; @@ -845,9 +840,8 @@ virSysinfoParseX86BaseBoard(const char *base, ignore_value(VIR_REALLOC_N(boards, nboards)); } =20 - *baseBoard =3D boards; *nbaseBoard =3D nboards; - boards =3D NULL; + *baseBoard =3D g_steal_pointer(&boards); nboards =3D 0; ret =3D 0; cleanup: @@ -915,8 +909,7 @@ virSysinfoParseX86Chassis(const char *base, def =3D NULL; } =20 - *chassisdef =3D def; - def =3D NULL; + *chassisdef =3D g_steal_pointer(&def); ret =3D 0; virSysinfoChassisDefFree(def); return ret; diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index f9ab6f6042..c4c26a1183 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -706,9 +706,8 @@ virTypedParamsSerialize(virTypedParameterPtr params, j++; } =20 - *remote_params_val =3D params_val; *remote_params_len =3D params_len; - params_val =3D NULL; + *remote_params_val =3D g_steal_pointer(¶ms_val); rv =3D 0; =20 cleanup: diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 138403b034..0c4126bd38 100644 --- 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 =3D doms; - doms =3D NULL; + *domains =3D g_steal_pointer(&doms); } =20 ret =3D count; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 0ebcb06234..60ed286cee 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -3817,8 +3817,7 @@ vzConnectGetAllDomainStats(virConnectPtr conn, tmpstats[nstats++] =3D tmp; } =20 - *retStats =3D tmpstats; - tmpstats =3D NULL; + *retStats =3D g_steal_pointer(&tmpstats); ret =3D nstats; =20 cleanup: diff --git a/tests/commandhelper.c b/tests/commandhelper.c index b3c65ab3cc..ee06339392 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -116,8 +116,7 @@ static struct Arguments *parseArguments(int argc, char*= * argv) } } =20 - ret =3D args; - args =3D NULL; + ret =3D g_steal_pointer(&args); return ret; } =20 diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c index 6e68ba66ff..91f7c963c1 100644 --- 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); =20 - ret =3D checkpointlist; - checkpointlist =3D NULL; + ret =3D g_steal_pointer(&checkpointlist); =20 cleanup: virshCheckpointListFree(checkpointlist); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d40995f44d..3597190523 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5187,8 +5187,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd, goto cleanup; =20 ret =3D nparams; - *update_params =3D params; - params =3D NULL; + *update_params =3D g_steal_pointer(¶ms); =20 cleanup: VIR_FREE(set_field); --=20 2.29.2