src/hyperv: 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/hyperv/hyperv_driver.h b/src/hyperv/hyperv_driver.h
index f333fba3e15c856d92b7cbfb74aca6b7e92673a0..8099b5714b7ed9d4df95dfe2b0376c258bf58202 100644 (file)
--- a/src/hyperv/hyperv_driver.h
+++ b/src/hyperv/hyperv_driver.h
@@ -20,9 +20,6 @@
  *
  */
 
-#ifndef LIBVIRT_HYPERV_DRIVER_H
-# define LIBVIRT_HYPERV_DRIVER_H
+#pragma once
 
 int hypervRegister(void);
-
-#endif /* LIBVIRT_HYPERV_DRIVER_H */

diff --git a/src/hyperv/hyperv_private.h b/src/hyperv/hyperv_private.h
index f8d8f7deff686eb613e96cf3edf0216faa24fcb4..b502e71d83bd3f6837562f7c7823d0433c3af8b8 100644 (file)
--- a/src/hyperv/hyperv_private.h
+++ b/src/hyperv/hyperv_private.h
@@ -20,13 +20,12 @@
  *
  */
 
-#ifndef LIBVIRT_HYPERV_PRIVATE_H
-# define LIBVIRT_HYPERV_PRIVATE_H
+#pragma once
 
-# include "internal.h"
-# include "virerror.h"
-# include "hyperv_util.h"
-# include "openwsman.h"
+#include "internal.h"
+#include "virerror.h"
+#include "hyperv_util.h"
+#include "openwsman.h"
 
 typedef enum _hypervWmiVersion hypervWmiVersion;
 enum _hypervWmiVersion {
@@ -40,5 +39,3 @@ struct _hypervPrivate {
     WsManClient *client;
     hypervWmiVersion wmiVersion;
 };
-
-#endif /* LIBVIRT_HYPERV_PRIVATE_H */

diff --git a/src/hyperv/hyperv_util.h b/src/hyperv/hyperv_util.h
index c72a308da93313a8f8ae3787d35f0788b1a3b383..67d698450d95b69c46548ab2489f646d170b5828 100644 (file)
--- a/src/hyperv/hyperv_util.h
+++ b/src/hyperv/hyperv_util.h
@@ -19,11 +19,10 @@
  *
  */
 
-#ifndef LIBVIRT_HYPERV_UTIL_H
-# define LIBVIRT_HYPERV_UTIL_H
+#pragma once
 
-# include "internal.h"
-# include "viruri.h"
+#include "internal.h"
+#include "viruri.h"
 
 typedef struct _hypervParsedUri hypervParsedUri;
 
@@ -34,5 +33,3 @@ struct _hypervParsedUri {
 int hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri);
 
 void hypervFreeParsedUri(hypervParsedUri **parsedUri);
-
-#endif /* LIBVIRT_HYPERV_UTIL_H */

diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h
index e3ace011318781e3d2b873be901f4d2f54b5fb9f..74a74e0e097ecd3245074b2bacd87a217a687a65 100644 (file)
--- a/src/hyperv/hyperv_wmi.h
+++ b/src/hyperv/hyperv_wmi.h
@@ -21,21 +21,20 @@
  *
  */
 
-#ifndef LIBVIRT_HYPERV_WMI_H
-# define LIBVIRT_HYPERV_WMI_H
+#pragma once
 
-# include "virbuffer.h"
-# include "hyperv_private.h"
-# include "hyperv_wmi_classes.h"
-# include "openwsman.h"
-# include "virhash.h"
+#include "virbuffer.h"
+#include "hyperv_private.h"
+#include "hyperv_wmi_classes.h"
+#include "openwsman.h"
+#include "virhash.h"
 
 
-# define HYPERV_WQL_QUERY_INITIALIZER { NULL, NULL }
+#define HYPERV_WQL_QUERY_INITIALIZER { NULL, NULL }
 
-# define HYPERV_DEFAULT_PARAM_COUNT 5
+#define HYPERV_DEFAULT_PARAM_COUNT 5
 
-# define MSVM_VIRTUALSYSTEMMANAGEMENTSERVICE_SELECTOR \
+#define MSVM_VIRTUALSYSTEMMANAGEMENTSERVICE_SELECTOR \
     "CreationClassName=Msvm_VirtualSystemManagementService"
 
 int hypervVerifyResponse(WsManClient *client, WsXmlDocH response,
@@ -252,5 +251,3 @@ int hypervMsvmComputerSystemToDomain(virConnectPtr conn,
 
 int hypervMsvmComputerSystemFromDomain(virDomainPtr domain,
                                        Msvm_ComputerSystem **computerSystem);
-
-#endif /* LIBVIRT_HYPERV_WMI_H */

diff --git a/src/hyperv/hyperv_wmi_classes.h b/src/hyperv/hyperv_wmi_classes.h
index cf2ae754476d53324c47baeb40911ce00ccfe802..a19b6a656df869f4ab85cf967a851388e8f3e2fe 100644 (file)
--- a/src/hyperv/hyperv_wmi_classes.h
+++ b/src/hyperv/hyperv_wmi_classes.h
@@ -21,21 +21,20 @@
  *
  */
 
-#ifndef LIBVIRT_HYPERV_WMI_CLASSES_H
-# define LIBVIRT_HYPERV_WMI_CLASSES_H
+#pragma once
 
-# include "internal.h"
-# include "openwsman.h"
+#include "internal.h"
+#include "openwsman.h"
 
-# include "hyperv_wmi_classes.generated.typedef"
+#include "hyperv_wmi_classes.generated.typedef"
 
-# define ROOT_CIMV2 \
+#define ROOT_CIMV2 \
     "http://schemas.microsoft.com/wbem/wsman/1/wmi/root/cimv2/*"
 
-# define ROOT_VIRTUALIZATION \
+#define ROOT_VIRTUALIZATION \
     "http://schemas.microsoft.com/wbem/wsman/1/wmi/root/virtualization/*"
 
-# define ROOT_VIRTUALIZATION_V2 \
+#define ROOT_VIRTUALIZATION_V2 \
     "http://schemas.microsoft.com/wbem/wsman/1/wmi/root/virtualization/v2/*"
 
 
@@ -44,16 +43,16 @@
  * Msvm_ComputerSystem
  */
 
-# define MSVM_COMPUTERSYSTEM_WQL_VIRTUAL \
+#define MSVM_COMPUTERSYSTEM_WQL_VIRTUAL \
     "Description = \"Microsoft Virtual Machine\" "
 
-# define MSVM_COMPUTERSYSTEM_WQL_PHYSICAL \
+#define MSVM_COMPUTERSYSTEM_WQL_PHYSICAL \
     "Description = \"Microsoft Hosting Computer System\" "
 
-# define MSVM_COMPUTERSYSTEM_WQL_ACTIVE \
+#define MSVM_COMPUTERSYSTEM_WQL_ACTIVE \
     "(EnabledState != 0 and EnabledState != 3 and EnabledState != 32769) "
 
-# define MSVM_COMPUTERSYSTEM_WQL_INACTIVE \
+#define MSVM_COMPUTERSYSTEM_WQL_INACTIVE \
     "(EnabledState = 0 or EnabledState = 3 or EnabledState = 32769) "
 
 enum _Msvm_ComputerSystem_EnabledState {
@@ -138,6 +137,4 @@ struct _hypervWmiClassInfoList {
     hypervWmiClassInfoPtr *objs;
 };
 
-# include "hyperv_wmi_classes.generated.h"
-
-#endif /* LIBVIRT_HYPERV_WMI_CLASSES_H */
+#include "hyperv_wmi_classes.generated.h"

diff --git a/src/hyperv/openwsman.h b/src/hyperv/openwsman.h
index 3f19a8f890951c18ca05b39cada3c437e0a8e7c0..cd7660ac2e7c74c7f6c7dcad02d7b053e05c0c35 100644 (file)
--- a/src/hyperv/openwsman.h
+++ b/src/hyperv/openwsman.h
@@ -19,32 +19,29 @@
  *
  */
 
-#ifndef LIBVIRT_OPENWSMAN_H
-# define LIBVIRT_OPENWSMAN_H
+#pragma once
 
 /* Workaround openwsman <= 2.2.6 unconditionally defining optarg. Just pretend
  * that u/os.h was already included. Need to explicitly include time.h because
  * wsman-xml-serializer.h needs it and u/os.h would have included it. */
-# include <time.h>
-# define _LIBU_OS_H_
-# include <wsman-api.h>
+#include <time.h>
+#define _LIBU_OS_H_
+#include <wsman-api.h>
 
 /* wsman-xml-serializer.h in openwsman <= 2.2.6 is missing this defines */
-# ifndef SER_NS_INT8
-#  define SER_NS_INT8(ns, n, x) SER_NS_INT8_FLAGS(ns, n, x, 0)
-# endif
-# ifndef SER_NS_INT16
-#  define SER_NS_INT16(ns, n, x) SER_NS_INT16_FLAGS(ns, n, x, 0)
-# endif
-# ifndef SER_NS_INT32
-#  define SER_NS_INT32(ns, n, x) SER_NS_INT32_FLAGS(ns, n, x, 0)
-# endif
-# ifndef SER_NS_INT64
-#  define SER_NS_INT64(ns, n, x) SER_NS_INT64_FLAGS(ns, n, x, 0)
-# endif
+#ifndef SER_NS_INT8
+# define SER_NS_INT8(ns, n, x) SER_NS_INT8_FLAGS(ns, n, x, 0)
+#endif
+#ifndef SER_NS_INT16
+# define SER_NS_INT16(ns, n, x) SER_NS_INT16_FLAGS(ns, n, x, 0)
+#endif
+#ifndef SER_NS_INT32
+# define SER_NS_INT32(ns, n, x) SER_NS_INT32_FLAGS(ns, n, x, 0)
+#endif
+#ifndef SER_NS_INT64
+# define SER_NS_INT64(ns, n, x) SER_NS_INT64_FLAGS(ns, n, x, 0)
+#endif
 
 /* wsman-xml.h */
 WsXmlDocH ws_xml_create_doc(const char *rootNsUri, const char *rootName);
 WsXmlNodeH xml_parser_get_root(WsXmlDocH doc);
-
-#endif /* LIBVIRT_OPENWSMAN_H */