util: firewall: use #pragma once in headers

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h
index a0e81a9a46306de5dde551c6adb6cf92242c2dc0..ff4626975bdae2773907d922811ea48b82cdd127 100644 (file)
--- a/src/util/virfirewall.h
+++ b/src/util/virfirewall.h
@@ -18,11 +18,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRFIREWALL_H
-# define LIBVIRT_VIRFIREWALL_H
+#pragma once
 
-# include "internal.h"
-# include "virautoclean.h"
+#include "internal.h"
+#include "virautoclean.h"
 
 typedef struct _virFirewall virFirewall;
 typedef virFirewall *virFirewallPtr;
@@ -52,7 +51,7 @@ void virFirewallFree(virFirewallPtr firewall);
  *
  * Returns the new rule
  */
-# define virFirewallAddRule(firewall, layer, ...) \
+#define virFirewallAddRule(firewall, layer, ...) \
          virFirewallAddRuleFull(firewall, layer, false, NULL, NULL, __VA_ARGS__)
 
 typedef int (*virFirewallQueryCallback)(virFirewallPtr firewall,
@@ -116,5 +115,3 @@ int virFirewallApply(virFirewallPtr firewall);
 void virFirewallSetLockOverride(bool avoid);
 
 VIR_DEFINE_AUTOPTR_FUNC(virFirewall, virFirewallFree);
-
-#endif /* LIBVIRT_VIRFIREWALL_H */

diff --git a/src/util/virfirewalld.h b/src/util/virfirewalld.h
index f05f5f2f08e5f7124e18a94f7cb38f4d478e2988..d2db3b6f47bbc79400c164a5630f00fa6f878b0c 100644 (file)
--- a/src/util/virfirewalld.h
+++ b/src/util/virfirewalld.h
@@ -18,10 +18,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRFIREWALLD_H
-# define LIBVIRT_VIRFIREWALLD_H
+#pragma once
 
-# define VIR_FIREWALL_FIREWALLD_SERVICE "org.fedoraproject.FirewallD1"
+#define VIR_FIREWALL_FIREWALLD_SERVICE "org.fedoraproject.FirewallD1"
 
 typedef enum {
     VIR_FIREWALLD_BACKEND_NONE,
@@ -42,5 +41,3 @@ int virFirewallDApplyRule(virFirewallLayer layer,
 
 int virFirewallDInterfaceSetZone(const char *iface,
                                  const char *zone);
-
-#endif /* LIBVIRT_VIRFIREWALLD_H */

diff --git a/src/util/virfirewalldpriv.h b/src/util/virfirewalldpriv.h
index 6c03b467c9ae48f457d18f25811c115e7fbb336c..4500a452eb89202e7e75421a8bbae2bcd40d997f 100644 (file)
--- a/src/util/virfirewalldpriv.h
+++ b/src/util/virfirewalldpriv.h
@@ -22,9 +22,6 @@
 # error "virfirewalldpriv.h may only be included by virfirewalld.c or test suites"
 #endif /* LIBVIRT_VIRFIREWALLDPRIV_H_ALLOW */
 
-#ifndef LIBVIRT_VIRFIREWALLDPRIV_H
-# define LIBVIRT_VIRFIREWALLDPRIV_H
+#pragma once
 
-# define VIR_FIREWALL_FIREWALLD_SERVICE "org.fedoraproject.FirewallD1"
-
-#endif /* LIBVIRT_VIRFIREWALLDPRIV_H */
+#define VIR_FIREWALL_FIREWALLD_SERVICE "org.fedoraproject.FirewallD1"

diff --git a/src/util/virfirewallpriv.h b/src/util/virfirewallpriv.h
index 7c31d0680d1eca0a751c0150719943568ec507a8..b846f8799cff8f99a94bec32834a350d93f55e62 100644 (file)
--- a/src/util/virfirewallpriv.h
+++ b/src/util/virfirewallpriv.h
@@ -22,10 +22,9 @@
 # error "virfirewallpriv.h may only be included by virfirewall.c or test suites"
 #endif /* LIBVIRT_VIRFIREWALLPRIV_H_ALLOW */
 
-#ifndef LIBVIRT_VIRFIREWALLPRIV_H
-# define LIBVIRT_VIRFIREWALLPRIV_H
+#pragma once
 
-# include "virfirewall.h"
+#include "virfirewall.h"
 
 typedef enum {
     VIR_FIREWALL_BACKEND_AUTOMATIC,
@@ -36,5 +35,3 @@ typedef enum {
 } virFirewallBackend;
 
 int virFirewallSetBackend(virFirewallBackend backend);
-
-#endif /* LIBVIRT_VIRFIREWALLPRIV_H */