From: Jonathon Jongsma <jjongsma@redhat.com>
Date: Fri, 7 Jun 2019 20:20:30 +0000 (-0500)
Subject: src/logging: use #pragma once in headers
X-Git-Tag: v5.5.0-rc1~266
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64ac2b77865e29981179628486bf1b03548a5383;p=thirdparty%2Flibvirt.git

src/logging: 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/logging/log_daemon.h b/src/logging/log_daemon.h
index 27f6af72cf..fa661e1793 100644
--- a/src/logging/log_daemon.h
+++ b/src/logging/log_daemon.h
@@ -18,11 +18,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_LOG_DAEMON_H
-# define LIBVIRT_LOG_DAEMON_H
+#pragma once
 
-# include "virthread.h"
-# include "log_handler.h"
+#include "virthread.h"
+#include "log_handler.h"
 
 typedef struct _virLogDaemon virLogDaemon;
 typedef virLogDaemon *virLogDaemonPtr;
@@ -39,5 +38,3 @@ struct _virLogDaemonClient {
 extern virLogDaemonPtr logDaemon;
 
 virLogHandlerPtr virLogDaemonGetHandler(virLogDaemonPtr dmn);
-
-#endif /* LIBVIRT_LOG_DAEMON_H */
diff --git a/src/logging/log_daemon_config.h b/src/logging/log_daemon_config.h
index 2508e4c918..957c20c893 100644
--- a/src/logging/log_daemon_config.h
+++ b/src/logging/log_daemon_config.h
@@ -19,10 +19,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_LOG_DAEMON_CONFIG_H
-# define LIBVIRT_LOG_DAEMON_CONFIG_H
+#pragma once
 
-# include "internal.h"
+#include "internal.h"
 
 typedef struct _virLogDaemonConfig virLogDaemonConfig;
 typedef virLogDaemonConfig *virLogDaemonConfigPtr;
@@ -45,5 +44,3 @@ void virLogDaemonConfigFree(virLogDaemonConfigPtr data);
 int virLogDaemonConfigLoadFile(virLogDaemonConfigPtr data,
                                const char *filename,
                                bool allow_missing);
-
-#endif /* LIBVIRT_LOG_DAEMON_CONFIG_H */
diff --git a/src/logging/log_daemon_dispatch.h b/src/logging/log_daemon_dispatch.h
index 8471d6798f..7738f62c70 100644
--- a/src/logging/log_daemon_dispatch.h
+++ b/src/logging/log_daemon_dispatch.h
@@ -18,12 +18,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_LOG_DAEMON_DISPATCH_H
-# define LIBVIRT_LOG_DAEMON_DISPATCH_H
+#pragma once
 
-# include "rpc/virnetserverprogram.h"
+#include "rpc/virnetserverprogram.h"
 
 extern virNetServerProgramProc virLogManagerProtocolProcs[];
 extern size_t virLogManagerProtocolNProcs;
-
-#endif /* LIBVIRT_LOG_DAEMON_DISPATCH_H */
diff --git a/src/logging/log_handler.h b/src/logging/log_handler.h
index db202f7091..8c8562e0c5 100644
--- a/src/logging/log_handler.h
+++ b/src/logging/log_handler.h
@@ -18,11 +18,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_LOG_HANDLER_H
-# define LIBVIRT_LOG_HANDLER_H
+#pragma once
 
-# include "internal.h"
-# include "virjson.h"
+#include "internal.h"
+#include "virjson.h"
 
 typedef struct _virLogHandler virLogHandler;
 typedef virLogHandler *virLogHandlerPtr;
@@ -76,5 +75,3 @@ int virLogHandlerDomainAppendLogFile(virLogHandlerPtr handler,
                                      unsigned int flags);
 
 virJSONValuePtr virLogHandlerPreExecRestart(virLogHandlerPtr handler);
-
-#endif /* LIBVIRT_LOG_HANDLER_H */
diff --git a/src/logging/log_manager.h b/src/logging/log_manager.h
index d796971ef8..cca1573841 100644
--- a/src/logging/log_manager.h
+++ b/src/logging/log_manager.h
@@ -18,12 +18,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_LOG_MANAGER_H
-# define LIBVIRT_LOG_MANAGER_H
+#pragma once
 
-# include "internal.h"
+#include "internal.h"
 
-# include "logging/log_protocol.h"
+#include "logging/log_protocol.h"
 
 typedef struct _virLogManager virLogManager;
 typedef virLogManager *virLogManagerPtr;
@@ -61,5 +60,3 @@ int virLogManagerDomainAppendMessage(virLogManagerPtr mgr,
                                      const char *path,
                                      const char *message,
                                      unsigned int flags);
-
-#endif /* LIBVIRT_LOG_MANAGER_H */