src/security: 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/security/security_apparmor.h b/src/security/security_apparmor.h
index 730f72ff987d6225d48c233a5115d1eab3ae4df7..7b54eefd8d1b60a5c15bd06699d7b41c14e1d7e2 100644 (file)
--- a/src/security/security_apparmor.h
+++ b/src/security/security_apparmor.h
@@ -16,15 +16,12 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_SECURITY_APPARMOR_H
-# define LIBVIRT_SECURITY_APPARMOR_H
+#pragma once
 
-# include "security_driver.h"
+#include "security_driver.h"
 
 extern virSecurityDriver virAppArmorSecurityDriver;
 
-# define AA_PREFIX  "libvirt-"
-# define PROFILE_NAME_SIZE  8 + VIR_UUID_STRING_BUFLEN /* AA_PREFIX + uuid */
-# define MAX_FILE_LEN       (1024*1024*10)  /* 10MB limit for sanity check */
-
-#endif /* LIBVIRT_SECURITY_APPARMOR_H */
+#define AA_PREFIX  "libvirt-"
+#define PROFILE_NAME_SIZE  8 + VIR_UUID_STRING_BUFLEN /* AA_PREFIX + uuid */
+#define MAX_FILE_LEN       (1024*1024*10)  /* 10MB limit for sanity check */

diff --git a/src/security/security_dac.h b/src/security/security_dac.h
index 318ca06d755490d1f52575afa127a1007222364e..444e5dcf89c6d2fea8ef32c6584a73c73b62c9ec 100644 (file)
--- a/src/security/security_dac.h
+++ b/src/security/security_dac.h
@@ -18,10 +18,9 @@
  * POSIX DAC security driver
  */
 
-#ifndef LIBVIRT_SECURITY_DAC_H
-# define LIBVIRT_SECURITY_DAC_H
+#pragma once
 
-# include "security_driver.h"
+#include "security_driver.h"
 
 extern virSecurityDriver virSecurityDriverDAC;
 
@@ -37,5 +36,3 @@ void virSecurityDACSetMountNamespace(virSecurityManagerPtr mgr,
 
 void virSecurityDACSetChownCallback(virSecurityManagerPtr mgr,
                                     virSecurityManagerDACChownCallback chownCallback);
-
-#endif /* LIBVIRT_SECURITY_DAC_H */

diff --git a/src/security/security_driver.h b/src/security/security_driver.h
index 36cf9da0373bbebe9efd43b38cff5516b4d8e789..9d0ab4e14a3162030c2849987e55601f80eaba7c 100644 (file)
--- a/src/security/security_driver.h
+++ b/src/security/security_driver.h
@@ -16,13 +16,12 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_SECURITY_DRIVER_H
-# define LIBVIRT_SECURITY_DRIVER_H
+#pragma once
 
-# include "internal.h"
-# include "domain_conf.h"
+#include "internal.h"
+#include "domain_conf.h"
 
-# include "security_manager.h"
+#include "security_manager.h"
 
 /*
  * Return values for security driver probing: the driver will determine
@@ -216,5 +215,3 @@ struct _virSecurityDriver {
 
 virSecurityDriverPtr virSecurityDriverLookup(const char *name,
                                              const char *virtDriver);
-
-#endif /* LIBVIRT_SECURITY_DRIVER_H */

diff --git a/src/security/security_manager.h b/src/security/security_manager.h
index 7e174a33ee47cd390dc352735a74107e34593824..88ed9919a24d08e71b61fdefadc438a8a1543c34 100644 (file)
--- a/src/security/security_manager.h
+++ b/src/security/security_manager.h
@@ -18,12 +18,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_SECURITY_MANAGER_H
-# define LIBVIRT_SECURITY_MANAGER_H
+#pragma once
 
-# include "domain_conf.h"
-# include "vircommand.h"
-# include "virstoragefile.h"
+#include "domain_conf.h"
+#include "vircommand.h"
+#include "virstoragefile.h"
 
 typedef struct _virSecurityManager virSecurityManager;
 typedef virSecurityManager *virSecurityManagerPtr;
@@ -36,7 +35,7 @@ typedef enum {
     VIR_SECURITY_MANAGER_MOUNT_NAMESPACE    = 1 << 5,
 } virSecurityManagerNewFlags;
 
-# define VIR_SECURITY_MANAGER_NEW_MASK \
+#define VIR_SECURITY_MANAGER_NEW_MASK \
     (VIR_SECURITY_MANAGER_DEFAULT_CONFINED  | \
      VIR_SECURITY_MANAGER_REQUIRE_CONFINED  | \
      VIR_SECURITY_MANAGER_PRIVILEGED)
@@ -207,5 +206,3 @@ virSecurityManagerMetadataLock(virSecurityManagerPtr mgr,
 void
 virSecurityManagerMetadataUnlock(virSecurityManagerPtr mgr,
                                  virSecurityManagerMetadataLockStatePtr *state);
-
-#endif /* LIBVIRT_SECURITY_MANAGER_H */

diff --git a/src/security/security_nop.h b/src/security/security_nop.h
index 31e46420b1070081cdf7e53e97281920fe60ad77..94ced9802ca524a4e5d8174b95d5351f51f1b5e1 100644 (file)
--- a/src/security/security_nop.h
+++ b/src/security/security_nop.h
@@ -17,11 +17,8 @@
  *
  */
 
-#ifndef LIBVIRT_SECURITY_NOP_H
-# define LIBVIRT_SECURITY_NOP_H
+#pragma once
 
-# include "security_driver.h"
+#include "security_driver.h"
 
 extern virSecurityDriver virSecurityDriverNop;
-
-#endif /* LIBVIRT_SECURITY_NOP_H */

diff --git a/src/security/security_selinux.h b/src/security/security_selinux.h
index dfd2b73baada27ac4e60e5d197114d35a1a87dc2..eb992bd53b0c9d35f5c7a08bbcd2b3cc5c5790cf 100644 (file)
--- a/src/security/security_selinux.h
+++ b/src/security/security_selinux.h
@@ -16,9 +16,6 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_SECURITY_SELINUX_H
-# define LIBVIRT_SECURITY_SELINUX_H
+#pragma once
 
 extern virSecurityDriver virSecurityDriverSELinux;
-
-#endif /* LIBVIRT_SECURITY_SELINUX_H */

diff --git a/src/security/security_stack.h b/src/security/security_stack.h
index 8c264d967a0cf9c5834af3d4679d80b0d4c6a71d..e35f149bedeb9c0c054084bc14c583e01533f2f6 100644 (file)
--- a/src/security/security_stack.h
+++ b/src/security/security_stack.h
@@ -18,10 +18,9 @@
  * Stacked security driver
  */
 
-#ifndef LIBVIRT_SECURITY_STACK_H
-# define LIBVIRT_SECURITY_STACK_H
+#pragma once
 
-# include "security_driver.h"
+#include "security_driver.h"
 
 extern virSecurityDriver virSecurityDriverStack;
 
@@ -34,5 +33,3 @@ virSecurityStackGetPrimary(virSecurityManagerPtr mgr);
 
 virSecurityManagerPtr*
 virSecurityStackGetNested(virSecurityManagerPtr mgr);
-
-#endif /* LIBVIRT_SECURITY_STACK_H */

diff --git a/src/security/security_util.h b/src/security/security_util.h
index bc977ed65d832bbabdd3a27b611c1956155ffebe..aacac5c64c71b1a0811901b5ddc85726389c8a9b 100644 (file)
--- a/src/security/security_util.h
+++ b/src/security/security_util.h
@@ -16,8 +16,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_SECURITY_UTIL_H
-# define LIBVIRT_SECURITY_UTIL_H
+#pragma once
 
 int
 virSecurityGetRememberedLabel(const char *name,
@@ -28,5 +27,3 @@ int
 virSecuritySetRememberedLabel(const char *name,
                               const char *path,
                               const char *label);
-
-#endif /* LIBVIRT_SECURITY_UTIL_H */