util: scsi: 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/util/virscsi.h b/src/util/virscsi.h
index 907948455e2f3827f00cc29570936be8fe054bf5..6cc68835b75faacf32a684861939830fed1dc061 100644 (file)
--- a/src/util/virscsi.h
+++ b/src/util/virscsi.h
@@ -18,12 +18,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSCSI_H
-# define LIBVIRT_VIRSCSI_H
+#pragma once
 
-# include "internal.h"
-# include "virobject.h"
-# include "virautoclean.h"
+#include "internal.h"
+#include "virobject.h"
+#include "virautoclean.h"
 
 typedef struct _virSCSIDevice virSCSIDevice;
 typedef virSCSIDevice *virSCSIDevicePtr;
@@ -94,5 +93,3 @@ virSCSIDevicePtr virSCSIDeviceListFind(virSCSIDeviceListPtr list,
                                        virSCSIDevicePtr dev);
 
 VIR_DEFINE_AUTOPTR_FUNC(virSCSIDevice, virSCSIDeviceFree);
-
-#endif /* LIBVIRT_VIRSCSI_H */

diff --git a/src/util/virscsihost.h b/src/util/virscsihost.h
index 1e8b8803ced5ba4f06d6eea3becd620e9a2668b9..ccc10f772d2a39993fa58638c575ffb90f7e679f 100644 (file)
--- a/src/util/virscsihost.h
+++ b/src/util/virscsihost.h
@@ -16,10 +16,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSCSIHOST_H
-# define LIBVIRT_VIRSCSIHOST_H
+#pragma once
 
-# include "internal.h"
+#include "internal.h"
 
 int virSCSIHostGetUniqueId(const char *sysfs_prefix, int host);
 
@@ -36,5 +35,3 @@ char *virSCSIHostGetNameByParentaddr(unsigned int domain,
                                      unsigned int slot,
                                      unsigned int function,
                                      unsigned int unique_id);
-
-#endif /* LIBVIRT_VIRSCSIHOST_H */

diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h
index 7349db378ec5288a2b69c132b46f048e8a724a53..a1a0ea561866c5585986c1cae89f9ae9ea587403 100644 (file)
--- a/src/util/virscsivhost.h
+++ b/src/util/virscsivhost.h
@@ -18,13 +18,12 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_VIRSCSIVHOST_H
-# define LIBVIRT_VIRSCSIVHOST_H
+#pragma once
 
-# include "internal.h"
-# include "virobject.h"
-# include "virutil.h"
-# include "virautoclean.h"
+#include "internal.h"
+#include "virobject.h"
+#include "virutil.h"
+#include "virautoclean.h"
 
 typedef struct _virSCSIVHostDevice virSCSIVHostDevice;
 typedef virSCSIVHostDevice *virSCSIVHostDevicePtr;
@@ -62,5 +61,3 @@ void virSCSIVHostDeviceFree(virSCSIVHostDevicePtr dev);
 int virSCSIVHostOpenVhostSCSI(int *vhostfd) ATTRIBUTE_NOINLINE;
 
 VIR_DEFINE_AUTOPTR_FUNC(virSCSIVHostDevice, virSCSIVHostDeviceFree);
-
-#endif /* LIBVIRT_VIRSCSIVHOST_H */