From nobody Sun Feb 8 05:54:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1532806889115398.88830318195323; Sat, 28 Jul 2018 12:41:29 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ECE31308FBA2; Sat, 28 Jul 2018 19:41:26 +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 9C12C782D2; Sat, 28 Jul 2018 19:41:26 +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 2D51F3F67F; Sat, 28 Jul 2018 19:41:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6SJewQf020476 for ; Sat, 28 Jul 2018 15:40:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id EA0DB89DFA; Sat, 28 Jul 2018 19:40:58 +0000 (UTC) Received: from mx1.redhat.com (ext-mx18.extmail.prod.ext.phx2.redhat.com [10.5.110.47]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E1BF645B4 for ; Sat, 28 Jul 2018 19:40:57 +0000 (UTC) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BCB8230820CA for ; Sat, 28 Jul 2018 19:40:55 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id n7-v6so5080583pgq.4 for ; Sat, 28 Jul 2018 12:40:55 -0700 (PDT) Received: from centos.localdomain ([49.32.98.239]) by smtp.gmail.com with ESMTPSA id m26-v6sm20270426pfi.102.2018.07.28.12.40.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Jul 2018 12:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=jo6IbHFgR2KEYmjFBw68raT6AiYgtkxVu7mZ91M6ODg=; b=tcLotwbJ4+tErIlc+QgMZQY+A+Bx/anXOJ7AsHbB2iuAqHx9ZXlmHB3i/l1aCHdwhh wpG8vFzsXpBXBUDQeYZOL0E5RtFRjW9zeTBukEytkMddt8nnYjswTjtm3msNZ75aFhcQ oF5435uzDbs77q1K1Y0vCGIVV74hwTsQ1vhOWsFrI5O897gJqm22ddWgd8h6J9phZJ96 CQ1bRUmjxEPiiEm9vY3sITQ1I+meS5ROlwTWZbbLPgMt54FX+WfwljHe5tFTjkpUIIDW gHTtqY94kz6Ft4cWSlhYQKoMw/msB0XmxOXvEMWmCqn2z01ZxKFpuDvxp4InhfOv/g9k wsJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=jo6IbHFgR2KEYmjFBw68raT6AiYgtkxVu7mZ91M6ODg=; b=FYZp/LYeDgmZknmRtYKrnTE7kocsFG7Ms3dNWB7UUjGgftoE/z06g9TKw1MJR2JAG/ kwiTu3VjxbVjnwhgXA3pZIrKnBNXgrdQ0umEe3l1MKjwTcpqaAzt5OU8EVgEmhhpqYzX ueQJ7dFIbhdCXN0D4Smo5tryRnNO4NJMfyhAmcnp+kg/H3+thNVflB89cZjrZrIu6nso WekICWubunhlvNHPLbs8Y4E8I8R1fPCIT81qzvSWJXDC7sf+US6+cj9Xf/5m/jY4d4NI 8aX0RR0ZRKA0aYHdbcbZ7lTLPQSAEPp+fbzAZpPlUGuha+GZBWepK56z69UtT8N7j51X j5sw== X-Gm-Message-State: AOUpUlFJJ9jVGAAJK0zHlfnd0dv8eZQ6V4eqmALSJfUmcOjXGPzjwiMt 4dzvw8yR7EF85B3Ml6+A69INj2uh X-Google-Smtp-Source: AAOMgpfjzjUEvP6sIuyZia4pbsXkWrBQgI1D5lft5Bd3WrQq2FB7Ciyq+JSmObJavT7pcJ66zNQxcA== X-Received: by 2002:a63:d20e:: with SMTP id a14-v6mr10653500pgg.226.1532806855061; Sat, 28 Jul 2018 12:40:55 -0700 (PDT) From: Sukrit Bhatnagar To: libvir-list@redhat.com Date: Sat, 28 Jul 2018 23:31:26 +0530 Message-Id: <1532800907-29115-12-git-send-email-skrtbhtngr@gmail.com> In-Reply-To: <1532800907-29115-1-git-send-email-skrtbhtngr@gmail.com> References: <1532800907-29115-1-git-send-email-skrtbhtngr@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Sat, 28 Jul 2018 19:40:55 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Sat, 28 Jul 2018 19:40:55 +0000 (UTC) for IP:'209.85.215.195' DOMAIN:'mail-pg1-f195.google.com' HELO:'mail-pg1-f195.google.com' FROM:'skrtbhtngr@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.13 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 209.85.215.195 mail-pg1-f195.google.com 209.85.215.195 mail-pg1-f195.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.47 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v1 11/32] util: netdevip: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Sat, 28 Jul 2018 19:41:27 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Using the new VIR_DEFINE_AUTOPTR_FUNC macro defined in src/util/viralloc.h, define a new wrapper around an existing cleanup function which will be called when a variable declared with VIR_AUTOPTR macro goes out of scope. Also, drop the redundant viralloc.h include, since that has moved from the source module into the header. When variables of type virNetDevIPAddrPtr and virNetDevIPRoutePtr are declared using VIR_AUTOPTR, the functions virNetDevIPAddrFree and virNetDevIPRouteFree, respectively, will be run automatically on them when they go out of scope. Signed-off-by: Sukrit Bhatnagar Reviewed-by: Erik Skultety --- src/util/virnetdevip.c | 7 ++++++- src/util/virnetdevip.h | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index bf98ed8..fdb0b74 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -27,7 +27,6 @@ #include "virnetlink.h" #include "virfile.h" #include "virerror.h" -#include "viralloc.h" #include "virlog.h" #include "virstring.h" #include "virutil.h" @@ -1129,3 +1128,9 @@ virNetDevIPInfoAddToDev(const char *ifname, cleanup: return ret; } + +void +virNetDevIPAddrFree(virNetDevIPAddrPtr ip) +{ + VIR_FREE(ip); +} diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h index 6b509ea..5608c37 100644 --- a/src/util/virnetdevip.h +++ b/src/util/virnetdevip.h @@ -84,6 +84,7 @@ int virNetDevIPAddrGet(const char *ifname, virSocketAddrP= tr addr) int virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_t count) ATTRIBUTE_NONNULL(1); bool virNetDevIPCheckIPv6Forwarding(void); +void virNetDevIPAddrFree(virNetDevIPAddrPtr ip); =20 /* virNetDevIPRoute object */ void virNetDevIPRouteFree(virNetDevIPRoutePtr def); @@ -97,4 +98,7 @@ void virNetDevIPInfoClear(virNetDevIPInfoPtr ip); int virNetDevIPInfoAddToDev(const char *ifname, virNetDevIPInfo const *ipInfo); =20 +VIR_DEFINE_AUTOPTR_FUNC(virNetDevIPAddr, virNetDevIPAddrFree) +VIR_DEFINE_AUTOPTR_FUNC(virNetDevIPRoute, virNetDevIPRouteFree) + #endif /* __VIR_NETDEVIP_H__ */ --=20 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list