conf: misc: 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/conf/capabilities.h b/src/conf/capabilities.h
index a6331b081c4f9baab75fa8f1fbbd96d6a4ee43b9..28b398891ac9e1d48709a02d63c401029f25d804 100644 (file)
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -19,19 +19,18 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_CAPABILITIES_H
-# define LIBVIRT_CAPABILITIES_H
+#pragma once
 
-# include "internal.h"
-# include "virconftypes.h"
-# include "virbuffer.h"
-# include "cpu_conf.h"
-# include "virarch.h"
-# include "virmacaddr.h"
-# include "virobject.h"
-# include "virresctrl.h"
+#include "internal.h"
+#include "virconftypes.h"
+#include "virbuffer.h"
+#include "cpu_conf.h"
+#include "virarch.h"
+#include "virmacaddr.h"
+#include "virobject.h"
+#include "virresctrl.h"
 
-# include <libxml/xpath.h>
+#include <libxml/xpath.h>
 
 struct _virCapsGuestFeature {
     char *name;
@@ -328,5 +327,3 @@ void virCapsHostCacheBankFree(virCapsHostCacheBankPtr ptr);
 int virCapabilitiesInitCaches(virCapsPtr caps);
 
 void virCapabilitiesHostInitIOMMU(virCapsPtr caps);
-
-#endif /* LIBVIRT_CAPABILITIES_H */

diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 51bf744fab145baf2ea6a58f750a7da9eb7f5e16..562e0de531b8e1ba03a11bfe7dc4be163461b5fa 100644 (file)
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -18,19 +18,18 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_CPU_CONF_H
-# define LIBVIRT_CPU_CONF_H
+#pragma once
 
-# include "virutil.h"
-# include "virbuffer.h"
-# include "virxml.h"
-# include "virbitmap.h"
-# include "virarch.h"
-# include "numa_conf.h"
-# include "virenum.h"
-# include "virhostcpu.h"
+#include "virutil.h"
+#include "virbuffer.h"
+#include "virxml.h"
+#include "virbitmap.h"
+#include "virarch.h"
+#include "numa_conf.h"
+#include "virenum.h"
+#include "virhostcpu.h"
 
-# define VIR_CPU_VENDOR_ID_LENGTH 12
+#define VIR_CPU_VENDOR_ID_LENGTH 12
 
 typedef enum {
     VIR_CPU_TYPE_HOST,
@@ -226,5 +225,3 @@ virCPUDefListParse(const char **xmlCPUs,
                    virCPUType cpuType);
 void
 virCPUDefListFree(virCPUDefPtr *cpus);
-
-#endif /* LIBVIRT_CPU_CONF_H */

diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
index b3299ac69dcb80fdae911825e4af4519c57feaf4..06f7f365ada75e795682c2490eb41cb295f5a677 100644 (file)
--- a/src/conf/device_conf.h
+++ b/src/conf/device_conf.h
@@ -18,20 +18,19 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_DEVICE_CONF_H
-# define LIBVIRT_DEVICE_CONF_H
+#pragma once
 
-# include <libxml/parser.h>
-# include <libxml/tree.h>
-# include <libxml/xpath.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xpath.h>
 
-# include "internal.h"
-# include "virutil.h"
-# include "virthread.h"
-# include "virbuffer.h"
-# include "virpci.h"
-# include "virnetdev.h"
-# include "virenum.h"
+#include "internal.h"
+#include "virutil.h"
+#include "virthread.h"
+#include "virbuffer.h"
+#include "virpci.h"
+#include "virnetdev.h"
+#include "virenum.h"
 
 typedef enum {
     VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE,
@@ -69,9 +68,9 @@ struct _virDomainDeviceVirtioSerialAddress {
     unsigned int port;
 };
 
-# define VIR_DOMAIN_DEVICE_CCW_MAX_CSSID    254
-# define VIR_DOMAIN_DEVICE_CCW_MAX_SSID       3
-# define VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO  65535
+#define VIR_DOMAIN_DEVICE_CCW_MAX_CSSID    254
+#define VIR_DOMAIN_DEVICE_CCW_MAX_SSID       3
+#define VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO  65535
 
 typedef struct _virDomainDeviceCCWAddress virDomainDeviceCCWAddress;
 typedef virDomainDeviceCCWAddress *virDomainDeviceCCWAddressPtr;
@@ -89,7 +88,7 @@ struct _virDomainDeviceCcidAddress {
     unsigned int slot;
 };
 
-# define VIR_DOMAIN_DEVICE_USB_MAX_PORT_DEPTH 4
+#define VIR_DOMAIN_DEVICE_USB_MAX_PORT_DEPTH 4
 
 typedef struct _virDomainDeviceUSBAddress virDomainDeviceUSBAddress;
 typedef virDomainDeviceUSBAddress *virDomainDeviceUSBAddressPtr;
@@ -231,5 +230,3 @@ int virInterfaceLinkParseXML(xmlNodePtr node,
 
 int virInterfaceLinkFormat(virBufferPtr buf,
                            const virNetDevIfLink *lnk);
-
-#endif /* LIBVIRT_DEVICE_CONF_H */

diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h
index e56b158b6dd8e87ecc0517f25c0a494907786864..ce405e5b152c6e04611091bf614c3c2d584cc24c 100644 (file)
--- a/src/conf/interface_conf.h
+++ b/src/conf/interface_conf.h
@@ -18,18 +18,17 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_INTERFACE_CONF_H
-# define LIBVIRT_INTERFACE_CONF_H
+#pragma once
 
-# include <libxml/parser.h>
-# include <libxml/tree.h>
-# include <libxml/xpath.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xpath.h>
 
-# include "internal.h"
-# include "virutil.h"
-# include "virthread.h"
-# include "device_conf.h"
-# include "virenum.h"
+#include "internal.h"
+#include "virutil.h"
+#include "virthread.h"
+#include "device_conf.h"
+#include "virenum.h"
 
 /* There is currently 3 types of interfaces */
 
@@ -175,8 +174,6 @@ virInterfaceDefParseNode(xmlDocPtr xml,
 char *
 virInterfaceDefFormat(const virInterfaceDef *def);
 
-# define VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE \
+#define VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE \
                 (VIR_CONNECT_LIST_INTERFACES_ACTIVE | \
                  VIR_CONNECT_LIST_INTERFACES_INACTIVE)
-
-#endif /* LIBVIRT_INTERFACE_CONF_H */

diff --git a/src/conf/moment_conf.h b/src/conf/moment_conf.h
index 00ec1c1904c6cd7b05117ccaa6b6d80e8bfca5f8..9fdbef2172a21a97425945ee31d5b4f9d08ee51a 100644 (file)
--- a/src/conf/moment_conf.h
+++ b/src/conf/moment_conf.h
@@ -20,12 +20,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_MOMENT_CONF_H
-# define LIBVIRT_MOMENT_CONF_H
+#pragma once
 
-# include "internal.h"
-# include "virconftypes.h"
-# include "virobject.h"
+#include "internal.h"
+#include "virconftypes.h"
+#include "virobject.h"
 
 /* Base class for a domain moment */
 struct _virDomainMomentDef {
@@ -43,5 +42,3 @@ struct _virDomainMomentDef {
 virClassPtr virClassForDomainMomentDef(void);
 
 int virDomainMomentDefPostParse(virDomainMomentDefPtr def);
-
-#endif /* LIBVIRT_MOMENT_CONF_H */

diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h
index ae1793a9508f3fb96ad0f1ddd8af8daa97026ae8..e76a09c20cdc19479008e3a990289849c6b5f894 100644 (file)
--- a/src/conf/numa_conf.h
+++ b/src/conf/numa_conf.h
@@ -18,16 +18,15 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_NUMA_CONF_H
-# define LIBVIRT_NUMA_CONF_H
+#pragma once
 
-# include <libxml/xpath.h>
+#include <libxml/xpath.h>
 
-# include "internal.h"
-# include "virutil.h"
-# include "virbitmap.h"
-# include "virbuffer.h"
-# include "virenum.h"
+#include "internal.h"
+#include "virutil.h"
+#include "virbitmap.h"
+#include "virbuffer.h"
+#include "virenum.h"
 
 
 typedef struct _virDomainNuma virDomainNuma;
@@ -185,6 +184,3 @@ int virDomainNumaDefCPUParseXML(virDomainNumaPtr def, xmlXPathContextPtr ctxt);
 int virDomainNumaDefCPUFormatXML(virBufferPtr buf, virDomainNumaPtr def);
 
 unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa);
-
-
-#endif /* LIBVIRT_NUMA_CONF_H */

diff --git a/src/conf/object_event.h b/src/conf/object_event.h
index bbeaa3aae73034c7696d051f088905ebac3b02ab..63b0818613adf4f47ad17eeb404d5fe15493d64a 100644 (file)
--- a/src/conf/object_event.h
+++ b/src/conf/object_event.h
@@ -20,12 +20,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_OBJECT_EVENT_H
-# define LIBVIRT_OBJECT_EVENT_H
+#pragma once
 
-# include "internal.h"
+#include "internal.h"
 
-# include "virobject.h"
+#include "virobject.h"
 
 /**
  * Dispatching domain events that come in while
@@ -54,7 +53,7 @@ typedef void (*virConnectObjectEventGenericCallback)(virConnectPtr conn,
                                                      void *obj,
                                                      void *opaque);
 
-# define VIR_OBJECT_EVENT_CALLBACK(cb) \
+#define VIR_OBJECT_EVENT_CALLBACK(cb) \
     ((virConnectObjectEventGenericCallback)(cb))
 
 void
@@ -88,5 +87,3 @@ virObjectEventStateSetRemote(virConnectPtr conn,
                              int callbackID,
                              int remoteID)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-
-#endif /* LIBVIRT_OBJECT_EVENT_H */

diff --git a/src/conf/object_event_private.h b/src/conf/object_event_private.h
index 5000b99504deba66617afd0cb805e532f3e03567..b31441c53a1d82d8ce2f6c1c10f55a6b15c9fbe7 100644 (file)
--- a/src/conf/object_event_private.h
+++ b/src/conf/object_event_private.h
@@ -20,10 +20,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_OBJECT_EVENT_PRIVATE_H
-# define LIBVIRT_OBJECT_EVENT_PRIVATE_H
+#pragma once
 
-# include "datatypes.h"
+#include "datatypes.h"
 
 struct _virObjectMeta {
     int id;
@@ -105,5 +104,3 @@ virObjectEventNew(virClassPtr klass,
                   const char *key)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5)
     ATTRIBUTE_NONNULL(7);
-
-#endif /* LIBVIRT_OBJECT_EVENT_PRIVATE_H */

diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h
index 1a48f12dd90e51372c68f1ac5fc287291c75b9a2..de1c28e18791abf369d67d1dd872bb2a42e4e3ea 100644 (file)
--- a/src/conf/secret_conf.h
+++ b/src/conf/secret_conf.h
@@ -18,11 +18,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_SECRET_CONF_H
-# define LIBVIRT_SECRET_CONF_H
+#pragma once
 
-# include "internal.h"
-# include "virutil.h"
+#include "internal.h"
+#include "virutil.h"
 
 typedef struct _virSecretDef virSecretDef;
 typedef virSecretDef *virSecretDefPtr;
@@ -40,16 +39,14 @@ virSecretDefPtr virSecretDefParseString(const char *xml);
 virSecretDefPtr virSecretDefParseFile(const char *filename);
 char *virSecretDefFormat(const virSecretDef *def);
 
-# define VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL \
+#define VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL \
                 (VIR_CONNECT_LIST_SECRETS_EPHEMERAL     | \
                  VIR_CONNECT_LIST_SECRETS_NO_EPHEMERAL)
 
-# define VIR_CONNECT_LIST_SECRETS_FILTERS_PRIVATE \
+#define VIR_CONNECT_LIST_SECRETS_FILTERS_PRIVATE \
                 (VIR_CONNECT_LIST_SECRETS_PRIVATE     | \
                  VIR_CONNECT_LIST_SECRETS_NO_PRIVATE)
 
-# define VIR_CONNECT_LIST_SECRETS_FILTERS_ALL \
+#define VIR_CONNECT_LIST_SECRETS_FILTERS_ALL \
                 (VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL  | \
                  VIR_CONNECT_LIST_SECRETS_FILTERS_PRIVATE)
-
-#endif /* LIBVIRT_SECRET_CONF_H */

diff --git a/src/conf/secret_event.h b/src/conf/secret_event.h
index 83a432d5a664d78863f1147a5b73ec9b90ed8475..3fe80521b96911f96ae1c53bafa772aab717e688 100644 (file)
--- a/src/conf/secret_event.h
+++ b/src/conf/secret_event.h
@@ -20,12 +20,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_SECRET_EVENT_H
-# define LIBVIRT_SECRET_EVENT_H
+#pragma once
 
-# include "internal.h"
-# include "object_event.h"
-# include "object_event_private.h"
+#include "internal.h"
+#include "object_event.h"
+#include "object_event_private.h"
 
 int
 virSecretEventStateRegisterID(virConnectPtr conn,
@@ -61,5 +60,3 @@ virObjectEventPtr
 virSecretEventValueChangedNew(const unsigned char *uuid,
                               int usage_type,
                               const char *usage_id);
-
-#endif /* LIBVIRT_SECRET_EVENT_H */

diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h
index 55b7487cfb20d875e648859a3b4dcdfc293e7d2a..08b2a3b955799523965b7075e2f6f164e8123d23 100644 (file)
--- a/src/conf/snapshot_conf.h
+++ b/src/conf/snapshot_conf.h
@@ -19,13 +19,12 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_SNAPSHOT_CONF_H
-# define LIBVIRT_SNAPSHOT_CONF_H
+#pragma once
 
-# include "internal.h"
-# include "domain_conf.h"
-# include "moment_conf.h"
-# include "virenum.h"
+#include "internal.h"
+#include "domain_conf.h"
+#include "moment_conf.h"
+#include "virenum.h"
 
 /* Items related to snapshot state */
 
@@ -143,5 +142,3 @@ int virDomainSnapshotRedefineValidate(virDomainSnapshotDefPtr def,
 
 VIR_ENUM_DECL(virDomainSnapshotLocation);
 VIR_ENUM_DECL(virDomainSnapshotState);
-
-#endif /* LIBVIRT_SNAPSHOT_CONF_H */

diff --git a/src/conf/virchrdev.h b/src/conf/virchrdev.h
index 42306ff93302891796639f7c4fbbfd015483e145..e218ea7203bfc7762913147b500a3655a6260616 100644 (file)
--- a/src/conf/virchrdev.h
+++ b/src/conf/virchrdev.h
@@ -19,11 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRCHRDEV_H
-# define LIBVIRT_VIRCHRDEV_H
+#pragma once
 
-# include "internal.h"
-# include "domain_conf.h"
+#include "internal.h"
+#include "domain_conf.h"
 
 typedef struct _virChrdevs virChrdevs;
 typedef virChrdevs *virChrdevsPtr;
@@ -33,5 +32,3 @@ void virChrdevFree(virChrdevsPtr devs);
 
 int virChrdevOpen(virChrdevsPtr devs, virDomainChrSourceDefPtr source,
                   virStreamPtr st, bool force);
-
-#endif /* LIBVIRT_VIRCHRDEV_H */

diff --git a/src/conf/virconftypes.h b/src/conf/virconftypes.h
index 6a8267c4227883f4944d6a22555889907a6d0e33..b8f553f7fb00f0bc26da48f27c19655878f40a04 100644 (file)
--- a/src/conf/virconftypes.h
+++ b/src/conf/virconftypes.h
@@ -20,8 +20,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRCONFTYPES_H
-# define LIBVIRT_VIRCONFTYPES_H
+#pragma once
 
 /* forward declarations of various types required in src/conf */
 
@@ -345,5 +344,3 @@ typedef virDomainXMLPrivateDataCallbacks *virDomainXMLPrivateDataCallbacksPtr;
 
 typedef struct _virDomainXenbusControllerOpts virDomainXenbusControllerOpts;
 typedef virDomainXenbusControllerOpts *virDomainXenbusControllerOptsPtr;
-
-#endif /* LIBVIRT_VIRCONFTYPES_H */

diff --git a/src/conf/virdomainmomentobjlist.h b/src/conf/virdomainmomentobjlist.h
index 6481c771de5009e49979614aa3e2680d9856df2b..68f00a114fcc1f84cc8d61093ed9bd85d4c5b596 100644 (file)
--- a/src/conf/virdomainmomentobjlist.h
+++ b/src/conf/virdomainmomentobjlist.h
@@ -20,12 +20,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRDOMAINMOMENTOBJLIST_H
-# define LIBVIRT_VIRDOMAINMOMENTOBJLIST_H
+#pragma once
 
-# include "internal.h"
-# include "virconftypes.h"
-# include "virhash.h"
+#include "internal.h"
+#include "virconftypes.h"
+#include "virhash.h"
 
 /* Filter that returns true if a given moment matches the filter flags */
 typedef bool (*virDomainMomentObjListFilter)(virDomainMomentObjPtr obj,
@@ -83,15 +82,15 @@ typedef enum {
     VIR_DOMAIN_MOMENT_LIST_NO_METADATA = (1 << 5),
 } virDomainMomentFilters;
 
-# define VIR_DOMAIN_MOMENT_FILTERS_METADATA \
+#define VIR_DOMAIN_MOMENT_FILTERS_METADATA \
                (VIR_DOMAIN_MOMENT_LIST_METADATA | \
                 VIR_DOMAIN_MOMENT_LIST_NO_METADATA)
 
-# define VIR_DOMAIN_MOMENT_FILTERS_LEAVES \
+#define VIR_DOMAIN_MOMENT_FILTERS_LEAVES \
                (VIR_DOMAIN_MOMENT_LIST_LEAVES | \
                 VIR_DOMAIN_MOMENT_LIST_NO_LEAVES)
 
-# define VIR_DOMAIN_MOMENT_FILTERS_ALL \
+#define VIR_DOMAIN_MOMENT_FILTERS_ALL \
                (VIR_DOMAIN_MOMENT_LIST_ROOTS | \
                 VIR_DOMAIN_MOMENT_LIST_TOPOLOGICAL | \
                 VIR_DOMAIN_MOMENT_FILTERS_METADATA | \
@@ -118,5 +117,3 @@ int virDomainMomentForEach(virDomainMomentObjListPtr moments,
                            virHashIterator iter,
                            void *data);
 int virDomainMomentUpdateRelations(virDomainMomentObjListPtr moments);
-
-#endif /* LIBVIRT_VIRDOMAINMOMENTOBJLIST_H */

diff --git a/src/conf/virdomainobjlist.h b/src/conf/virdomainobjlist.h
index c1ffee76ad7c651afcb654f8f0528204a1f5db91..bf3ab396fad59bf020e31fe212779491d04cdf5e 100644 (file)
--- a/src/conf/virdomainobjlist.h
+++ b/src/conf/virdomainobjlist.h
@@ -20,10 +20,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRDOMAINOBJLIST_H
-# define LIBVIRT_VIRDOMAINOBJLIST_H
+#pragma once
 
-# include "domain_conf.h"
+#include "domain_conf.h"
 
 typedef struct _virDomainObjList virDomainObjList;
 typedef virDomainObjList *virDomainObjListPtr;
@@ -95,33 +94,33 @@ int virDomainObjListForEach(virDomainObjListPtr doms,
                             virDomainObjListIterator callback,
                             void *opaque);
 
-# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE \
+#define VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE \
                 (VIR_CONNECT_LIST_DOMAINS_ACTIVE | \
                  VIR_CONNECT_LIST_DOMAINS_INACTIVE)
 
-# define VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT \
+#define VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT \
                 (VIR_CONNECT_LIST_DOMAINS_PERSISTENT | \
                  VIR_CONNECT_LIST_DOMAINS_TRANSIENT)
 
-# define VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE \
+#define VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE \
                 (VIR_CONNECT_LIST_DOMAINS_RUNNING | \
                  VIR_CONNECT_LIST_DOMAINS_PAUSED  | \
                  VIR_CONNECT_LIST_DOMAINS_SHUTOFF | \
                  VIR_CONNECT_LIST_DOMAINS_OTHER)
 
-# define VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE \
+#define VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE \
                 (VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE | \
                  VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE)
 
-# define VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART \
+#define VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART \
                 (VIR_CONNECT_LIST_DOMAINS_AUTOSTART | \
                  VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART)
 
-# define VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT \
+#define VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT \
                 (VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT | \
                  VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT)
 
-# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL \
+#define VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL \
                 (VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE      | \
                  VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT  | \
                  VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE       | \
@@ -149,5 +148,3 @@ int virDomainObjListConvert(virDomainObjListPtr domlist,
                             virDomainObjListACLFilter filter,
                             unsigned int flags,
                             bool skip_missing);
-
-#endif /* LIBVIRT_VIRDOMAINOBJLIST_H */

diff --git a/src/conf/virdomainsnapshotobjlist.h b/src/conf/virdomainsnapshotobjlist.h
index b83f7a4ba919fa4162f0acd79e692cdf4987bcd4..26fa456730fe6719911f184c1c448dfc46d891d0 100644 (file)
--- a/src/conf/virdomainsnapshotobjlist.h
+++ b/src/conf/virdomainsnapshotobjlist.h
@@ -20,12 +20,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRDOMAINSNAPSHOTOBJLIST_H
-# define LIBVIRT_VIRDOMAINSNAPSHOTOBJLIST_H
+#pragma once
 
-# include "internal.h"
-# include "virdomainmomentobjlist.h"
-# include "virbuffer.h"
+#include "internal.h"
+#include "virdomainmomentobjlist.h"
+#include "virbuffer.h"
 
 virDomainSnapshotObjListPtr virDomainSnapshotObjListNew(void);
 void virDomainSnapshotObjListFree(virDomainSnapshotObjListPtr snapshots);
@@ -54,24 +53,24 @@ int virDomainSnapshotForEach(virDomainSnapshotObjListPtr snapshots,
                              void *data);
 int virDomainSnapshotUpdateRelations(virDomainSnapshotObjListPtr snapshots);
 
-# define VIR_DOMAIN_SNAPSHOT_FILTERS_METADATA \
+#define VIR_DOMAIN_SNAPSHOT_FILTERS_METADATA \
                (VIR_DOMAIN_SNAPSHOT_LIST_METADATA     | \
                 VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA)
 
-# define VIR_DOMAIN_SNAPSHOT_FILTERS_LEAVES \
+#define VIR_DOMAIN_SNAPSHOT_FILTERS_LEAVES \
                (VIR_DOMAIN_SNAPSHOT_LIST_LEAVES       | \
                 VIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES)
 
-# define VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS \
+#define VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS \
                (VIR_DOMAIN_SNAPSHOT_LIST_INACTIVE     | \
                 VIR_DOMAIN_SNAPSHOT_LIST_ACTIVE       | \
                 VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY)
 
-# define VIR_DOMAIN_SNAPSHOT_FILTERS_LOCATION \
+#define VIR_DOMAIN_SNAPSHOT_FILTERS_LOCATION \
                (VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL     | \
                 VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL)
 
-# define VIR_DOMAIN_SNAPSHOT_FILTERS_ALL \
+#define VIR_DOMAIN_SNAPSHOT_FILTERS_ALL \
                (VIR_DOMAIN_SNAPSHOT_FILTERS_METADATA  | \
                 VIR_DOMAIN_SNAPSHOT_FILTERS_LEAVES    | \
                 VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS    | \
@@ -89,5 +88,3 @@ virDomainSnapshotObjGetDef(virDomainMomentObjPtr obj)
 {
     return (virDomainSnapshotDefPtr) obj->def;
 }
-
-#endif /* LIBVIRT_VIRDOMAINSNAPSHOTOBJLIST_H */

diff --git a/src/conf/virinterfaceobj.h b/src/conf/virinterfaceobj.h
index 6ad331af4fc7ac4aa6daa1f3a7d51b8f4136a764..6142fb9f53697e4327a9365b4700e2b3e2d4975a 100644 (file)
--- a/src/conf/virinterfaceobj.h
+++ b/src/conf/virinterfaceobj.h
@@ -17,10 +17,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRINTERFACEOBJ_H
-# define LIBVIRT_VIRINTERFACEOBJ_H
+#pragma once
 
-# include "internal.h"
+#include "internal.h"
 
 typedef struct _virInterfaceObj virInterfaceObj;
 typedef virInterfaceObj *virInterfaceObjPtr;
@@ -88,5 +87,3 @@ virInterfaceObjListExport(virConnectPtr conn,
                           virInterfacePtr **ifaces,
                           virInterfaceObjListFilter filter,
                           unsigned int flags);
-
-#endif /* LIBVIRT_VIRINTERFACEOBJ_H */

diff --git a/src/conf/virsavecookie.h b/src/conf/virsavecookie.h
index a5e41e7acbcfbfee2d5b8b62120bd3414c1bf3c3..eafffbed66e6549bdd998aeada784e7ad2108309 100644 (file)
--- a/src/conf/virsavecookie.h
+++ b/src/conf/virsavecookie.h
@@ -18,14 +18,13 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSAVECOOKIE_H
-# define LIBVIRT_VIRSAVECOOKIE_H
+#pragma once
 
-# include <libxml/xpath.h>
+#include <libxml/xpath.h>
 
-# include "internal.h"
-# include "virobject.h"
-# include "virbuffer.h"
+#include "internal.h"
+#include "virobject.h"
+#include "virbuffer.h"
 
 
 typedef int (*virSaveCookieParseFunc)(xmlXPathContextPtr ctxt,
@@ -59,5 +58,3 @@ virSaveCookieFormatBuf(virBufferPtr buf,
 char *
 virSaveCookieFormat(virObjectPtr obj,
                     virSaveCookieCallbacksPtr saveCookie);
-
-#endif /* LIBVIRT_VIRSAVECOOKIE_H */

diff --git a/src/conf/virsecretobj.h b/src/conf/virsecretobj.h
index 1563fa8ca727759666b50862340280497690d5e0..09ee19f603948b5d7d23bf3a989783af311e7331 100644 (file)
--- a/src/conf/virsecretobj.h
+++ b/src/conf/virsecretobj.h
@@ -18,13 +18,12 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSECRETOBJ_H
-# define LIBVIRT_VIRSECRETOBJ_H
+#pragma once
 
-# include "internal.h"
+#include "internal.h"
 
-# include "secret_conf.h"
-# include "virobject.h"
+#include "secret_conf.h"
+#include "virobject.h"
 
 typedef struct _virSecretObj virSecretObj;
 typedef virSecretObj *virSecretObjPtr;
@@ -117,5 +116,3 @@ virSecretObjSetValueSize(virSecretObjPtr obj,
 int
 virSecretLoadAllConfigs(virSecretObjListPtr secrets,
                         const char *configDir);
-
-#endif /* LIBVIRT_VIRSECRETOBJ_H */