11:12 a.m.
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
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_dhcpsnoop.h
index 38606bdd41..2b9a87fb79 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.h
+++ b/src/nwfilter/nwfilter_dhcpsnoop.h
@@ -20,10 +20,9 @@
* <http://www.gnu.org/licenses/>;.
*/
-#ifndef LIBVIRT_NWFILTER_DHCPSNOOP_H
-# define LIBVIRT_NWFILTER_DHCPSNOOP_H
+#pragma once
-# include "nwfilter_tech_driver.h"
+#include "nwfilter_tech_driver.h"
int virNWFilterDHCPSnoopInit(void);
void virNWFilterDHCPSnoopShutdown(void);
@@ -31,4 +30,3 @@ int virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr techdriver,
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 @@
* <http://www.gnu.org/licenses/>;.
*/
-#ifndef LIBVIRT_NWFILTER_DRIVER_H
-# define LIBVIRT_NWFILTER_DRIVER_H
+#pragma once
-# include "nwfilter_params.h"
-# include "nwfilter_conf.h"
+#include "nwfilter_params.h"
+#include "nwfilter_conf.h"
int nwfilterRegister(void);
-
-#endif /* LIBVIRT_NWFILTER_DRIVER_H */
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.h
b/src/nwfilter/nwfilter_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 @@
* <http://www.gnu.org/licenses/>;.
*/
-#ifndef LIBVIRT_NWFILTER_EBIPTABLES_DRIVER_H
-# define LIBVIRT_NWFILTER_EBIPTABLES_DRIVER_H
+#pragma once
-# include "nwfilter_tech_driver.h"
+#include "nwfilter_tech_driver.h"
-# define MAX_CHAINNAME_LENGTH 32 /* see linux/netfilter_bridge/ebtables.h */
+#define MAX_CHAINNAME_LENGTH 32 /* see linux/netfilter_bridge/ebtables.h */
extern virNWFilterTechDriver ebiptables_driver;
-# define EBIPTABLES_DRIVER_ID "ebiptables"
+#define EBIPTABLES_DRIVER_ID "ebiptables"
-# 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 @@
* <http://www.gnu.org/licenses/>;.
*/
-#ifndef LIBVIRT_NWFILTER_GENTECH_DRIVER_H
-# define LIBVIRT_NWFILTER_GENTECH_DRIVER_H
+#pragma once
-# include "virnwfilterobj.h"
-# include "virnwfilterbindingdef.h"
-# include "nwfilter_tech_driver.h"
+#include "virnwfilterobj.h"
+#include "virnwfilterbindingdef.h"
+#include "nwfilter_tech_driver.h"
virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name);
@@ -55,5 +54,3 @@ virHashTablePtr virNWFilterCreateVarHashmap(const char *macaddr,
int virNWFilterBuildAll(virNWFilterDriverStatePtr driver,
bool newFilters);
-
-#endif /* LIBVIRT_NWFILTER_GENTECH_DRIVER_H */
diff --git a/src/nwfilter/nwfilter_learnipaddr.h b/src/nwfilter/nwfilter_learnipaddr.h
index 117d69f4d4..5b9294327f 100644
--- a/src/nwfilter/nwfilter_learnipaddr.h
+++ b/src/nwfilter/nwfilter_learnipaddr.h
@@ -21,13 +21,12 @@
* <http://www.gnu.org/licenses/>;.
*/
-#ifndef LIBVIRT_NWFILTER_LEARNIPADDR_H
-# define LIBVIRT_NWFILTER_LEARNIPADDR_H
+#pragma once
-# include "conf/nwfilter_params.h"
-# include "nwfilter_tech_driver.h"
-# include "virnwfilterbindingdef.h"
-# include <net/if.h>
+#include "conf/nwfilter_params.h"
+#include "nwfilter_tech_driver.h"
+#include "virnwfilterbindingdef.h"
+#include <net/if.h>
enum howDetect {
DETECT_DHCP = 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_tech_driver.h
index f37a0e7d5c..9e1e9332f9 100644
--- a/src/nwfilter/nwfilter_tech_driver.h
+++ b/src/nwfilter/nwfilter_tech_driver.h
@@ -21,10 +21,9 @@
* <http://www.gnu.org/licenses/>;.
*/
-#ifndef LIBVIRT_NWFILTER_TECH_DRIVER_H
-# define LIBVIRT_NWFILTER_TECH_DRIVER_H
+#pragma once
-# include "virnwfilterobj.h"
+#include "virnwfilterobj.h"
typedef struct _virNWFilterTechDriver virNWFilterTechDriver;
typedef virNWFilterTechDriver *virNWFilterTechDriverPtr;
@@ -90,5 +89,3 @@ struct _virNWFilterTechDriver {
virNWFilterDropAllRules applyDropAllRules;
virNWFilterRemoveBasicRules removeBasicRules;
};
-
-#endif /* LIBVIRT_NWFILTER_TECH_DRIVER_H */
--
2.20.1