tools: 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>

tools/nss/libvirt_nss.h

@@ -23,8 +23,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_NSS_H
+#pragma once
-# define LIBVIRT_NSS_H
 
 #include <nss.h>
 #include <netdb.h>
@@ -60,5 +59,3 @@ ns_mtab*
 nss_module_register(const char *name, unsigned int *size,
                     nss_module_unregister_fn *unregister);
 #endif /* HAVE_BSD_NSS */
-
-#endif /* LIBVIRT_NSS_H */

tools/virsh-completer.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSH_COMPLETER_H
+#pragma once
-# define LIBVIRT_VIRSH_COMPLETER_H
 
 #include "vsh.h"
 
@@ -118,4 +117,3 @@ char ** virshCellnoCompleter(vshControl *ctl,
 char ** virshDomainShutdownModeCompleter(vshControl *ctl,
                                          const vshCmd *cmd,
                                          unsigned int flags);
-#endif /* LIBVIRT_VIRSH_COMPLETER_H */

tools/virsh-console.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSH_CONSOLE_H
+#pragma once
-# define LIBVIRT_VIRSH_CONSOLE_H
 
 #ifndef WIN32
 
@@ -31,5 +30,3 @@ int virshRunConsole(vshControl *ctl,
                     unsigned int flags);
 
 #endif /* !WIN32 */
-
-#endif /* LIBVIRT_VIRSH_CONSOLE_H */

tools/virsh-domain-monitor.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSH_DOMAIN_MONITOR_H
+#pragma once
-# define LIBVIRT_VIRSH_DOMAIN_MONITOR_H
 
 #include "virsh.h"
 
@@ -28,5 +27,3 @@ char *virshGetDomainDescription(vshControl *ctl, virDomainPtr dom,
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
 
 extern const vshCmdDef domMonitoringCmds[];
-
-#endif /* LIBVIRT_VIRSH_DOMAIN_MONITOR_H */

tools/virsh-domain.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSH_DOMAIN_H
+#pragma once
-# define LIBVIRT_VIRSH_DOMAIN_H
 
 #include "virsh.h"
 
@@ -32,5 +31,3 @@ typedef struct virshDomainEventCallback virshDomainEventCallback;
 extern virshDomainEventCallback virshDomainEventCallbacks[];
 
 extern const vshCmdDef domManagementCmds[];
-
-#endif /* LIBVIRT_VIRSH_DOMAIN_H */

tools/virsh-host.h

@@ -18,11 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSH_HOST_H
+#pragma once
-# define LIBVIRT_VIRSH_HOST_H
 
 #include "virsh.h"
 
 extern const vshCmdDef hostAndHypervisorCmds[];
-
-#endif /* LIBVIRT_VIRSH_HOST_H */

tools/virsh-interface.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSH_INTERFACE_H
+#pragma once
-# define LIBVIRT_VIRSH_INTERFACE_H
 
 #include "virsh.h"
 
@@ -33,5 +32,3 @@ virInterfacePtr virshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd,
                                VIRSH_BYMAC | VIRSH_BYNAME)
 
 extern const vshCmdDef ifaceCmds[];
-
-#endif /* LIBVIRT_VIRSH_INTERFACE_H */

tools/virsh-network.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSH_NETWORK_H
+#pragma once
-# define LIBVIRT_VIRSH_NETWORK_H
 
 #include "virsh.h"
 
@@ -46,5 +45,3 @@ typedef struct virshNetworkEventCallback virshNetworkEventCallback;
 extern virshNetworkEventCallback virshNetworkEventCallbacks[];
 
 extern const vshCmdDef networkCmds[];
-
-#endif /* LIBVIRT_VIRSH_NETWORK_H */

tools/virsh-nodedev.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSH_NODEDEV_H
+#pragma once
-# define LIBVIRT_VIRSH_NODEDEV_H
 
 #include "virsh.h"
 
@@ -32,5 +31,3 @@ typedef struct virshNodedevEventCallback virshNodedevEventCallback;
 extern virshNodedevEventCallback virshNodedevEventCallbacks[];
 
 extern const vshCmdDef nodedevCmds[];
-
-#endif /* LIBVIRT_VIRSH_NODEDEV_H */

tools/virsh-nwfilter.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSH_NWFILTER_H
+#pragma once
-# define LIBVIRT_VIRSH_NWFILTER_H
 
 #include "virsh.h"
 
@@ -41,5 +40,3 @@ virshCommandOptNWFilterBindingBy(vshControl *ctl, const vshCmd *cmd,
     virshCommandOptNWFilterBindingBy(_ctl, _cmd, _name, 0)
 
 extern const vshCmdDef nwfilterCmds[];
-
-#endif /* LIBVIRT_VIRSH_NWFILTER_H */

tools/virsh-pool.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSH_POOL_H
+#pragma once
-# define LIBVIRT_VIRSH_POOL_H
 
 #include "virsh.h"
 
@@ -41,5 +40,3 @@ typedef struct virshPoolEventCallback virshPoolEventCallback;
 extern virshPoolEventCallback virshPoolEventCallbacks[];
 
 extern const vshCmdDef storagePoolCmds[];
-
-#endif /* LIBVIRT_VIRSH_POOL_H */

tools/virsh-secret.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSH_SECRET_H
+#pragma once
-# define LIBVIRT_VIRSH_SECRET_H
 
 #include "virsh.h"
 
@@ -32,5 +31,3 @@ typedef struct virshSecretEventCallback virshSecretEventCallback;
 extern virshSecretEventCallback virshSecretEventCallbacks[];
 
 extern const vshCmdDef secretCmds[];
-
-#endif /* LIBVIRT_VIRSH_SECRET_H */

tools/virsh-snapshot.h

@@ -18,11 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSH_SNAPSHOT_H
+#pragma once
-# define LIBVIRT_VIRSH_SNAPSHOT_H
 
 #include "virsh.h"
 
 extern const vshCmdDef snapshotCmds[];
-
-#endif /* LIBVIRT_VIRSH_SNAPSHOT_H */

tools/virsh-util.h

@@ -16,8 +16,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSH_UTIL_H
+#pragma once
-# define LIBVIRT_VIRSH_UTIL_H
 
 #include "virsh.h"
 
@@ -103,5 +102,3 @@ virshDomainGetXML(vshControl *ctl,
                   xmlXPathContextPtr *ctxt)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4)
     ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK;
-
-#endif /* LIBVIRT_VIRSH_UTIL_H */

tools/virsh-volume.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSH_VOLUME_H
+#pragma once
-# define LIBVIRT_VIRSH_VOLUME_H
 
 #include "virsh.h"
 
@@ -34,5 +33,3 @@ virStorageVolPtr virshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd,
                          VIRSH_BYUUID | VIRSH_BYNAME)
 
 extern const vshCmdDef storageVolCmds[];
-
-#endif /* LIBVIRT_VIRSH_VOLUME_H */

tools/virsh.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSH_H
+#pragma once
-# define LIBVIRT_VIRSH_H
 
 #include <stdarg.h>
 #include <unistd.h>
@@ -171,5 +170,3 @@ typedef enum {
 } virshLookupByFlags;
 
 virConnectPtr virshConnect(vshControl *ctl, const char *uri, bool readonly);
-
-#endif /* LIBVIRT_VIRSH_H */

tools/virt-admin-completer.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRT_ADMIN_COMPLETER_H
+#pragma once
-# define LIBVIRT_VIRT_ADMIN_COMPLETER_H
 
 #include "vsh.h"
 
@@ -27,4 +26,3 @@ char **
 vshAdmServerCompleter(vshControl *ctl,
                       const vshCmd *cmd,
                       unsigned int flags);
-#endif /* LIBVIRT_VIRT_ADMIN_COMPLETER_H */

tools/virt-admin.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRT_ADMIN_H
+#pragma once
-# define LIBVIRT_VIRT_ADMIN_H
 
 #include "internal.h"
 #include "vsh.h"
@@ -40,5 +39,3 @@ struct _vshAdmControl {
     virAdmConnectPtr conn;      /* connection to a daemon's admin server */
     bool wantReconnect;
 };
-
-#endif /* LIBVIRT_VIRT_ADMIN_H */

tools/virt-host-validate-bhyve.h

@@ -19,9 +19,6 @@
  *
  */
 
-#ifndef LIBVIRT_VIRT_HOST_VALIDATE_BHYVE_H
+#pragma once
-# define LIBVIRT_VIRT_HOST_VALIDATE_BHYVE_H
 
 int virHostValidateBhyve(void);
-
-#endif /* LIBVIRT_VIRT_HOST_VALIDATE_BHYVE_H */

tools/virt-host-validate-common.h

@@ -19,8 +19,7 @@
  *
  */
 
-#ifndef LIBVIRT_VIRT_HOST_VALIDATE_COMMON_H
+#pragma once
-# define LIBVIRT_VIRT_HOST_VALIDATE_COMMON_H
 
 #include "internal.h"
 #include "virutil.h"
@@ -84,5 +83,3 @@ int virHostValidateCGroupControllers(const char *hvname,
 
 int virHostValidateIOMMU(const char *hvname,
                          virHostValidateLevel level);
-
-#endif /* LIBVIRT_VIRT_HOST_VALIDATE_COMMON_H */

tools/virt-host-validate-lxc.h

@@ -19,9 +19,6 @@
  *
  */
 
-#ifndef LIBVIRT_VIRT_HOST_VALIDATE_LXC_H
+#pragma once
-# define LIBVIRT_VIRT_HOST_VALIDATE_LXC_H
 
 int virHostValidateLXC(void);
-
-#endif /* LIBVIRT_VIRT_HOST_VALIDATE_LXC_H */

tools/virt-host-validate-qemu.h

@@ -19,9 +19,6 @@
  *
  */
 
-#ifndef LIBVIRT_VIRT_HOST_VALIDATE_QEMU_H
+#pragma once
-# define LIBVIRT_VIRT_HOST_VALIDATE_QEMU_H
 
 int virHostValidateQEMU(void);
-
-#endif /* LIBVIRT_VIRT_HOST_VALIDATE_QEMU_H */

tools/vsh-table.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VSH_TABLE_H
+#pragma once
-# define LIBVIRT_VSH_TABLE_H
 
 #include "vsh.h"
 
@@ -33,5 +32,3 @@ vshTablePtr vshTableNew(const char *format, ...);
 int vshTableRowAppend(vshTablePtr table, const char *arg, ...);
 void vshTablePrintToStdout(vshTablePtr table, vshControl *ctl);
 char *vshTablePrintToString(vshTablePtr table, bool header);
-
-#endif /* LIBVIRT_VSH_TABLE_H */

tools/vsh.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VSH_H
+#pragma once
-# define LIBVIRT_VSH_H
 
 #include <stdarg.h>
 #include <unistd.h>
@@ -582,5 +581,3 @@ char *_vshStrdup(vshControl *ctl, const char *s, const char *filename,
  */
 #define VSH_REQUIRE_OPTION_VAR(VARNAME1, VARNAME2) \
     VSH_REQUIRE_OPTION_EXPR(#VARNAME1, VARNAME1, #VARNAME2, VARNAME2)
-
-#endif /* LIBVIRT_VSH_H */

tools/wireshark/src/packet-libvirt.h

@@ -17,10 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_PACKET_LIBVIRT_H
+#pragma once
-# define LIBVIRT_PACKET_LIBVIRT_H
 
 void proto_register_libvirt(void);
 void proto_reg_handoff_libvirt(void);
-
-#endif /* LIBVIRT_PACKET_LIBVIRT_H */