[libvirt] [PATCH 24/46] util: cgroup: use #pragma once in headers

Jonathon Jongsma jjongsma at redhat.com
Tue Jun 18 16:12:54 UTC 2019


Signed-off-by: Jonathon Jongsma <jjongsma at redhat.com>
---
 src/util/vircgroup.h        | 10 ++++------
 src/util/vircgroupbackend.h | 15 ++++++---------
 src/util/vircgroupv1.h      |  5 +----
 src/util/vircgroupv2.h      |  5 +----
 4 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
index 377e0fd870..2f68fdb685 100644
--- a/src/util/vircgroup.h
+++ b/src/util/vircgroup.h
@@ -19,12 +19,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRCGROUP_H
-# define LIBVIRT_VIRCGROUP_H
+#pragma once
 
-# include "virutil.h"
-# include "virbitmap.h"
-# include "virenum.h"
+#include "virutil.h"
+#include "virbitmap.h"
+#include "virenum.h"
 
 struct _virCgroup;
 typedef struct _virCgroup virCgroup;
@@ -285,4 +284,3 @@ int virCgroupSetOwner(virCgroupPtr cgroup,
 int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller);
 
 bool virCgroupControllerAvailable(int controller);
-#endif /* LIBVIRT_VIRCGROUP_H */
diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
index 24b45be9bb..e58e327c68 100644
--- a/src/util/vircgroupbackend.h
+++ b/src/util/vircgroupbackend.h
@@ -18,15 +18,14 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRCGROUPBACKEND_H
-# define LIBVIRT_VIRCGROUPBACKEND_H
+#pragma once
 
-# include "internal.h"
+#include "internal.h"
 
-# include "vircgroup.h"
-# include "virhash.h"
+#include "vircgroup.h"
+#include "virhash.h"
 
-# define CGROUP_MAX_VAL 512
+#define CGROUP_MAX_VAL 512
 
 typedef enum {
     VIR_CGROUP_NONE = 0, /* create subdir under each cgroup if possible. */
@@ -447,7 +446,7 @@ virCgroupBackendPtr
 virCgroupBackendForController(virCgroupPtr group,
                               unsigned int controller);
 
-# define VIR_CGROUP_BACKEND_CALL(group, controller, func, ret, ...) \
+#define VIR_CGROUP_BACKEND_CALL(group, controller, func, ret, ...) \
     virCgroupBackendPtr backend = virCgroupBackendForController(group, controller); \
     if (!backend) { \
         virReportError(VIR_ERR_INTERNAL_ERROR, \
@@ -460,5 +459,3 @@ virCgroupBackendForController(virCgroupPtr group,
         return ret; \
     } \
     return backend->func(group, ##__VA_ARGS__);
-
-#endif /* LIBVIRT_VIRCGROUPBACKEND_H */
diff --git a/src/util/vircgroupv1.h b/src/util/vircgroupv1.h
index b1f86b5492..dbef9c7864 100644
--- a/src/util/vircgroupv1.h
+++ b/src/util/vircgroupv1.h
@@ -18,10 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRCGROUPV1_H
-# define LIBVIRT_VIRCGROUPV1_H
+#pragma once
 
 void
 virCgroupV1Register(void);
-
-#endif /* LIBVIRT_VIRCGROUPV1_H */
diff --git a/src/util/vircgroupv2.h b/src/util/vircgroupv2.h
index a877d36a01..1566154597 100644
--- a/src/util/vircgroupv2.h
+++ b/src/util/vircgroupv2.h
@@ -18,10 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRCGROUPV2_H
-# define LIBVIRT_VIRCGROUPV2_H
+#pragma once
 
 void
 virCgroupV2Register(void);
-
-#endif /* LIBVIRT_VIRCGROUPV2_H */
-- 
2.20.1




More information about the libvir-list mailing list