3:20 p.m.
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/access/viraccessdriver.h | 10 +++-------
src/access/viraccessdrivernop.h | 7 ++-----
src/access/viraccessdriverpolkit.h | 7 ++-----
src/access/viraccessdriverstack.h | 7 ++-----
src/access/viraccessmanager.h | 26 +++++++++++---------------
src/access/viraccessperm.h | 11 ++++-------
6 files changed, 24 insertions(+), 44 deletions(-)
diff --git a/src/access/viraccessdriver.h b/src/access/viraccessdriver.h
index 2cc3950f60..9fe7428e0e 100644
--- a/src/access/viraccessdriver.h
+++ b/src/access/viraccessdriver.h
@@ -18,11 +18,10 @@
* <http://www.gnu.org/licenses/>;.
*/
-#ifndef LIBVIRT_VIRACCESSDRIVER_H
-# define LIBVIRT_VIRACCESSDRIVER_H
+#pragma once
-# include "conf/domain_conf.h"
-# include "access/viraccessmanager.h"
+#include "conf/domain_conf.h"
+#include "access/viraccessmanager.h"
typedef int (*virAccessDriverCheckConnectDrv)(virAccessManagerPtr manager,
const char *driverName,
@@ -89,6 +88,3 @@ struct _virAccessDriver {
virAccessDriverCheckStoragePoolDrv checkStoragePool;
virAccessDriverCheckStorageVolDrv checkStorageVol;
};
-
-
-#endif /* LIBVIRT_VIRACCESSDRIVER_H */
diff --git a/src/access/viraccessdrivernop.h b/src/access/viraccessdrivernop.h
index d383c6f3ef..60f4cac0b7 100644
--- a/src/access/viraccessdrivernop.h
+++ b/src/access/viraccessdrivernop.h
@@ -18,11 +18,8 @@
* <http://www.gnu.org/licenses/>;.
*/
-#ifndef LIBVIRT_VIRACCESSDRIVERNOP_H
-# define LIBVIRT_VIRACCESSDRIVERNOP_H
+#pragma once
-# include "access/viraccessdriver.h"
+#include "access/viraccessdriver.h"
extern virAccessDriver accessDriverNop;
-
-#endif /* LIBVIRT_VIRACCESSDRIVERNOP_H */
diff --git a/src/access/viraccessdriverpolkit.h b/src/access/viraccessdriverpolkit.h
index 4c71889824..0e52606c99 100644
--- a/src/access/viraccessdriverpolkit.h
+++ b/src/access/viraccessdriverpolkit.h
@@ -18,11 +18,8 @@
* <http://www.gnu.org/licenses/>;.
*/
-#ifndef LIBVIRT_VIRACCESSDRIVERPOLKIT_H
-# define LIBVIRT_VIRACCESSDRIVERPOLKIT_H
+#pragma once
-# include "viraccessdriver.h"
+#include "viraccessdriver.h"
extern virAccessDriver accessDriverPolkit;
-
-#endif /* LIBVIRT_VIRACCESSDRIVERPOLKIT_H */
diff --git a/src/access/viraccessdriverstack.h b/src/access/viraccessdriverstack.h
index 0984b21914..078da697e8 100644
--- a/src/access/viraccessdriverstack.h
+++ b/src/access/viraccessdriverstack.h
@@ -18,15 +18,12 @@
* <http://www.gnu.org/licenses/>;.
*/
-#ifndef LIBVIRT_VIRACCESSDRIVERSTACK_H
-# define LIBVIRT_VIRACCESSDRIVERSTACK_H
+#pragma once
-# include "access/viraccessdriver.h"
+#include "access/viraccessdriver.h"
int virAccessDriverStackAppend(virAccessManagerPtr manager,
virAccessManagerPtr child);
extern virAccessDriver accessDriverStack;
-
-#endif /* LIBVIRT_VIRACCESSDRIVERSTACK_H */
diff --git a/src/access/viraccessmanager.h b/src/access/viraccessmanager.h
index ab5ef87585..6da41b0823 100644
--- a/src/access/viraccessmanager.h
+++ b/src/access/viraccessmanager.h
@@ -18,19 +18,18 @@
* <http://www.gnu.org/licenses/>;.
*/
-#ifndef LIBVIRT_VIRACCESSMANAGER_H
-# define LIBVIRT_VIRACCESSMANAGER_H
+#pragma once
-# include "viridentity.h"
-# include "conf/domain_conf.h"
-# include "conf/network_conf.h"
-# include "conf/nwfilter_conf.h"
-# include "conf/node_device_conf.h"
-# include "conf/storage_conf.h"
-# include "conf/secret_conf.h"
-# include "conf/interface_conf.h"
-# include "conf/virnwfilterbindingdef.h"
-# include "access/viraccessperm.h"
+#include "viridentity.h"
+#include "conf/domain_conf.h"
+#include "conf/network_conf.h"
+#include "conf/nwfilter_conf.h"
+#include "conf/node_device_conf.h"
+#include "conf/storage_conf.h"
+#include "conf/secret_conf.h"
+#include "conf/interface_conf.h"
+#include "conf/virnwfilterbindingdef.h"
+#include "access/viraccessperm.h"
typedef struct _virAccessManager virAccessManager;
typedef virAccessManager *virAccessManagerPtr;
@@ -91,6 +90,3 @@ int virAccessManagerCheckStorageVol(virAccessManagerPtr manager,
virStoragePoolDefPtr pool,
virStorageVolDefPtr vol,
virAccessPermStorageVol perm);
-
-
-#endif /* LIBVIRT_VIRACCESSMANAGER_H */
diff --git a/src/access/viraccessperm.h b/src/access/viraccessperm.h
index ed1f7168ca..8b63d75cf7 100644
--- a/src/access/viraccessperm.h
+++ b/src/access/viraccessperm.h
@@ -18,12 +18,11 @@
* <http://www.gnu.org/licenses/>;.
*/
-#ifndef LIBVIRT_VIRACCESSPERM_H
-# define LIBVIRT_VIRACCESSPERM_H
+#pragma once
-# include "internal.h"
-# include "virutil.h"
-# include "virenum.h"
+#include "internal.h"
+#include "virutil.h"
+#include "virenum.h"
typedef enum {
/**
@@ -699,5 +698,3 @@ VIR_ENUM_DECL(virAccessPermNWFilterBinding);
VIR_ENUM_DECL(virAccessPermSecret);
VIR_ENUM_DECL(virAccessPermStoragePool);
VIR_ENUM_DECL(virAccessPermStorageVol);
-
-#endif /* LIBVIRT_VIRACCESSPERM_H */
--
2.20.1