From nobody Sun Feb 8 23:05:38 2026 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=1614253951; cv=none; d=zohomail.com; s=zohoarc; b=b6/3Eep+9HmzmDpJ0K1o8+RePmM2uwzgUyHum0TSyEhrT+W4Uib4omeW4sgAYVdZzG8NNuDma7RmGLpVxLJiBRaKFMiAZDLWgKG/zltJenuLy85RNzSmLX1u+HFeAby/1erzcQX53AhcoMZndr9dlBqmNrvLd0leWaczwyNdyZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614253951; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HBPwD9P6CaPPf87xrXseKsfjCJxOcuzJ/1XP21aR+qE=; b=lMTzcaNsn9x+sjv6ckz0cYtV8c8d4GD8Fv0eIvZYinvoAGSlPiuTliqDF6hIypmJsel+g0IvE6kusF8eHweK5hpXzX6p0YJouDGVFwGfTJO88eEGOrWeaI6PUrBUJy99LUIpXptSaN4sTGSTjzE65K+VbQ/nVM1cyqrr/ZMsnqU= 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 161425395101693.96066269889957; Thu, 25 Feb 2021 03:52:31 -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-183-rtWASSldN8WfFTca-ZwcJg-1; Thu, 25 Feb 2021 06:52:27 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 44D3A801975; Thu, 25 Feb 2021 11:52:20 +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 1D2A81001281; Thu, 25 Feb 2021 11:52:20 +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 D74DC4EBC6; Thu, 25 Feb 2021 11:52:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11PBqIxI001424 for ; Thu, 25 Feb 2021 06:52:18 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6EC961001281; Thu, 25 Feb 2021 11:52:18 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.192.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id B520910013D6 for ; Thu, 25 Feb 2021 11:52:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614253950; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=HBPwD9P6CaPPf87xrXseKsfjCJxOcuzJ/1XP21aR+qE=; b=Q4iOouR4KqyM7pWLJbD9zLwtJZAQ3PMumVgZ+USvePkrNIHz1EnDCg5ttm95M7Lj04PB47 YiLlRna4/ObYc2b2Yc5c3Hsn/Vag5fd9jBjvq+G/jWoy6yHJup+KGLuXVHGSHuln96uJT6 5Lnbse0CfytT5ymCxd+kgfC7owpDNjo= X-MC-Unique: rtWASSldN8WfFTca-ZwcJg-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 2/3] Use g_autoptr instead of virNetDevIPRouteFree if possible Date: Thu, 25 Feb 2021 12:51:56 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.84 on 10.5.11.22 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" 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 Reviewed-by: Laine Stump --- src/conf/domain_conf.c | 3 +-- src/conf/networkcommon_conf.c | 5 ++--- src/lxc/lxc_native.c | 3 +-- src/vz/vz_sdk.c | 3 +-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b731744f04..2504911931 100644 --- 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 =3D NULL; + g_autoptr(virNetDevIPRoute) route =3D NULL; int nnodes; int ret =3D -1; size_t i; @@ -7511,7 +7511,6 @@ virDomainNetIPInfoParseXML(const char *source, cleanup: if (ret < 0) virNetDevIPInfoClear(def); - virNetDevIPRouteFree(route); return ret; } =20 diff --git a/src/conf/networkcommon_conf.c b/src/conf/networkcommon_conf.c index 430d48a997..db78b85268 100644 --- 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 =3D NULL; + g_autoptr(virNetDevIPRoute) def =3D NULL; virSocketAddr testAddr; =20 def =3D g_new0(virNetDevIPRoute, 1); @@ -209,10 +209,9 @@ virNetDevIPRouteCreate(const char *errorDetail, goto error; } =20 - return def; + return g_steal_pointer(&def); =20 error: - virNetDevIPRouteFree(def); return NULL; } =20 diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index b903dc91d6..d5020dafa7 100644 --- 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 =3D NULL; + g_autoptr(virNetDevIPRoute) route =3D NULL; g_autofree char *familyStr =3D NULL; g_autofree char *zero =3D NULL; =20 @@ -460,7 +460,6 @@ lxcAddNetworkRouteDefinition(const char *address, return 0; =20 error: - virNetDevIPRouteFree(route); return -1; } =20 diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index f49cd983f0..6f712c7a31 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -974,7 +974,7 @@ prlsdkGetRoutes(PRL_HANDLE sdknet, virDomainNetDefPtr n= et) int ret =3D -1; char *gw =3D NULL; char *gw6 =3D NULL; - virNetDevIPRoutePtr route =3D NULL; + g_autoptr(virNetDevIPRoute) route =3D NULL; =20 if (!(gw =3D prlsdkGetStringParamVar(PrlVmDevNet_GetDefaultGateway, sd= knet))) goto cleanup; @@ -1006,7 +1006,6 @@ prlsdkGetRoutes(PRL_HANDLE sdknet, virDomainNetDefPtr= net) ret =3D 0; =20 cleanup: - virNetDevIPRouteFree(route); VIR_FREE(gw); VIR_FREE(gw6); =20 --=20 2.29.2