From nobody Mon Feb 9 21:37:19 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; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1560874494; cv=none; d=zoho.com; s=zohoarc; b=TzOJ84Q6QwaYCbRdrkQhSAQsTI03PcM3m6/t0fjfqF1zc9bPr/njufmA3CAu6nOgosDJf5sJcunqCP4DLgzbu9I6YFmI4mIYkdEM8LSIw6kub91zH3OlzS9ZsulTX97vdzAc57xTUa+cJ0xUFV+C9dsgqppN3+haw6k+1bosH10= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560874494; 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:ARC-Authentication-Results; bh=f+SKHO3JVacDLkj30Hn155F/Defkv5OyY5e3FaSrI0o=; b=d/DIK3SisXt/4Ez9O6TSTTsU37sII8OYSNDv0IbeBUeltMtHEkS24zezYPd9NVWN5cSvb0cO9QSRs6MTyZx4V1wNLq0YoLaIQAqkHv8kAv/txreqdHmylnnTWH0Xp6j7GltlSdoZgm8GWiF9APV1BpyilG73xoJGnpqcPqwbEG4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 156087449430758.79969455348589; Tue, 18 Jun 2019 09:14:54 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D93297FDE9; Tue, 18 Jun 2019 16:14:47 +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 A71EA608C2; Tue, 18 Jun 2019 16:14:43 +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 32AAC8E1F; Tue, 18 Jun 2019 16:14:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5IGDPIo024134 for ; Tue, 18 Jun 2019 12:13:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6699860FAB; Tue, 18 Jun 2019 16:13:25 +0000 (UTC) Received: from aegolius.redhat.com (ovpn-117-198.phx2.redhat.com [10.3.117.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3592F84EF for ; Tue, 18 Jun 2019 16:13:25 +0000 (UTC) From: Jonathon Jongsma To: libvir-list@redhat.com Date: Tue, 18 Jun 2019 11:12:34 -0500 Message-Id: <20190618161316.1722-5-jjongsma@redhat.com> In-Reply-To: <20190618161316.1722-1-jjongsma@redhat.com> References: <20190618161316.1722-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/46] src/nwfilter: use #pragma once in headers 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: , 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 18 Jun 2019 16:14:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jonathon Jongsma Reviewed-by: J=C3=A1n Tomko --- src/nwfilter/nwfilter_dhcpsnoop.h | 6 ++---- src/nwfilter/nwfilter_driver.h | 9 +++------ src/nwfilter/nwfilter_ebiptables_driver.h | 13 +++++-------- src/nwfilter/nwfilter_gentech_driver.h | 11 ++++------- src/nwfilter/nwfilter_learnipaddr.h | 13 +++++-------- src/nwfilter/nwfilter_tech_driver.h | 7 ++----- 6 files changed, 21 insertions(+), 38 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.h b/src/nwfilter/nwfilter_dhcp= snoop.h index 38606bdd41..2b9a87fb79 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.h +++ b/src/nwfilter/nwfilter_dhcpsnoop.h @@ -20,10 +20,9 @@ * . */ =20 -#ifndef LIBVIRT_NWFILTER_DHCPSNOOP_H -# define LIBVIRT_NWFILTER_DHCPSNOOP_H +#pragma once =20 -# include "nwfilter_tech_driver.h" +#include "nwfilter_tech_driver.h" =20 int virNWFilterDHCPSnoopInit(void); void virNWFilterDHCPSnoopShutdown(void); @@ -31,4 +30,3 @@ int virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr tech= driver, virNWFilterBindingDefPtr binding, virNWFilterDriverStatePtr driver); void virNWFilterDHCPSnoopEnd(const char *ifname); -#endif /* LIBVIRT_NWFILTER_DHCPSNOOP_H */ diff --git a/src/nwfilter/nwfilter_driver.h b/src/nwfilter/nwfilter_driver.h index c315a40649..6c864dd2e3 100644 --- a/src/nwfilter/nwfilter_driver.h +++ b/src/nwfilter/nwfilter_driver.h @@ -22,12 +22,9 @@ * . */ =20 -#ifndef LIBVIRT_NWFILTER_DRIVER_H -# define LIBVIRT_NWFILTER_DRIVER_H +#pragma once =20 -# include "nwfilter_params.h" -# include "nwfilter_conf.h" +#include "nwfilter_params.h" +#include "nwfilter_conf.h" =20 int nwfilterRegister(void); - -#endif /* LIBVIRT_NWFILTER_DRIVER_H */ diff --git a/src/nwfilter/nwfilter_ebiptables_driver.h b/src/nwfilter/nwfil= ter_ebiptables_driver.h index f740856496..cb146f9f97 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.h +++ b/src/nwfilter/nwfilter_ebiptables_driver.h @@ -19,17 +19,14 @@ * . */ =20 -#ifndef LIBVIRT_NWFILTER_EBIPTABLES_DRIVER_H -# define LIBVIRT_NWFILTER_EBIPTABLES_DRIVER_H +#pragma once =20 -# include "nwfilter_tech_driver.h" +#include "nwfilter_tech_driver.h" =20 -# define MAX_CHAINNAME_LENGTH 32 /* see linux/netfilter_bridge/ebtables.h= */ +#define MAX_CHAINNAME_LENGTH 32 /* see linux/netfilter_bridge/ebtables.h = */ =20 extern virNWFilterTechDriver ebiptables_driver; =20 -# define EBIPTABLES_DRIVER_ID "ebiptables" +#define EBIPTABLES_DRIVER_ID "ebiptables" =20 -# define IPTABLES_MAX_COMMENT_LENGTH 256 - -#endif /* LIBVIRT_NWFILTER_EBIPTABLES_DRIVER_H */ +#define IPTABLES_MAX_COMMENT_LENGTH 256 diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter= _gentech_driver.h index 945060cd22..cf0560a10a 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -20,12 +20,11 @@ * . */ =20 -#ifndef LIBVIRT_NWFILTER_GENTECH_DRIVER_H -# define LIBVIRT_NWFILTER_GENTECH_DRIVER_H +#pragma once =20 -# include "virnwfilterobj.h" -# include "virnwfilterbindingdef.h" -# include "nwfilter_tech_driver.h" +#include "virnwfilterobj.h" +#include "virnwfilterbindingdef.h" +#include "nwfilter_tech_driver.h" =20 virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name); =20 @@ -55,5 +54,3 @@ virHashTablePtr virNWFilterCreateVarHashmap(const char *m= acaddr, =20 int virNWFilterBuildAll(virNWFilterDriverStatePtr driver, bool newFilters); - -#endif /* LIBVIRT_NWFILTER_GENTECH_DRIVER_H */ diff --git a/src/nwfilter/nwfilter_learnipaddr.h b/src/nwfilter/nwfilter_le= arnipaddr.h index 117d69f4d4..5b9294327f 100644 --- a/src/nwfilter/nwfilter_learnipaddr.h +++ b/src/nwfilter/nwfilter_learnipaddr.h @@ -21,13 +21,12 @@ * . */ =20 -#ifndef LIBVIRT_NWFILTER_LEARNIPADDR_H -# define LIBVIRT_NWFILTER_LEARNIPADDR_H +#pragma once =20 -# include "conf/nwfilter_params.h" -# include "nwfilter_tech_driver.h" -# include "virnwfilterbindingdef.h" -# include +#include "conf/nwfilter_params.h" +#include "nwfilter_tech_driver.h" +#include "virnwfilterbindingdef.h" +#include =20 enum howDetect { DETECT_DHCP =3D 1, @@ -49,5 +48,3 @@ void virNWFilterUnlockIface(const char *ifname); int virNWFilterLearnInit(void); void virNWFilterLearnShutdown(void); void virNWFilterLearnThreadsTerminate(bool allowNewThreads); - -#endif /* LIBVIRT_NWFILTER_LEARNIPADDR_H */ diff --git a/src/nwfilter/nwfilter_tech_driver.h b/src/nwfilter/nwfilter_te= ch_driver.h index f37a0e7d5c..9e1e9332f9 100644 --- a/src/nwfilter/nwfilter_tech_driver.h +++ b/src/nwfilter/nwfilter_tech_driver.h @@ -21,10 +21,9 @@ * . */ =20 -#ifndef LIBVIRT_NWFILTER_TECH_DRIVER_H -# define LIBVIRT_NWFILTER_TECH_DRIVER_H +#pragma once =20 -# include "virnwfilterobj.h" +#include "virnwfilterobj.h" =20 typedef struct _virNWFilterTechDriver virNWFilterTechDriver; typedef virNWFilterTechDriver *virNWFilterTechDriverPtr; @@ -90,5 +89,3 @@ struct _virNWFilterTechDriver { virNWFilterDropAllRules applyDropAllRules; virNWFilterRemoveBasicRules removeBasicRules; }; - -#endif /* LIBVIRT_NWFILTER_TECH_DRIVER_H */ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list