Use #pragma once in driver 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>

src/driver-hypervisor.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_DRIVER_HYPERVISOR_H
+#pragma once
-# define LIBVIRT_DRIVER_HYPERVISOR_H
 
 #ifndef __VIR_DRIVER_H_INCLUDES___
 # error "Don't include this file directly, only use driver.h"
@@ -1581,6 +1580,3 @@ struct _virHypervisorDriver {
     virDrvNodeGetSEVInfo nodeGetSEVInfo;
     virDrvDomainGetLaunchSecurityInfo domainGetLaunchSecurityInfo;
 };
-
-
-#endif /* LIBVIRT_DRIVER_HYPERVISOR_H */

src/driver-interface.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_DRIVER_INTERFACE_H
+#pragma once
-# define LIBVIRT_DRIVER_INTERFACE_H
 
 #ifndef __VIR_DRIVER_H_INCLUDES___
 # error "Don't include this file directly, only use driver.h"
@@ -117,6 +116,3 @@ struct _virInterfaceDriver {
     virDrvInterfaceChangeCommit interfaceChangeCommit;
     virDrvInterfaceChangeRollback interfaceChangeRollback;
 };
-
-
-#endif /* LIBVIRT_DRIVER_INTERFACE_H */

src/driver-network.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_DRIVER_NETWORK_H
+#pragma once
-# define LIBVIRT_DRIVER_NETWORK_H
 
 #ifndef __VIR_DRIVER_H_INCLUDES___
 # error "Don't include this file directly, only use driver.h"
@@ -152,6 +151,3 @@ struct _virNetworkDriver {
     virDrvNetworkIsPersistent networkIsPersistent;
     virDrvNetworkGetDHCPLeases networkGetDHCPLeases;
 };
-
-
-#endif /* LIBVIRT_DRIVER_NETWORK_H */

src/driver-nodedev.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_DRIVER_NODEDEV_H
+#pragma once
-# define LIBVIRT_DRIVER_NODEDEV_H
 
 #ifndef __VIR_DRIVER_H_INCLUDES___
 # error "Don't include this file directly, only use driver.h"
@@ -115,6 +114,3 @@ struct _virNodeDeviceDriver {
     virDrvNodeDeviceCreateXML nodeDeviceCreateXML;
     virDrvNodeDeviceDestroy nodeDeviceDestroy;
 };
-
-
-#endif /* LIBVIRT_DRIVER_NODEDEV_H */

src/driver-nwfilter.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_DRIVER_NWFILTER_H
+#pragma once
-# define LIBVIRT_DRIVER_NWFILTER_H
 
 #ifndef __VIR_DRIVER_H_INCLUDES___
 # error "Don't include this file directly, only use driver.h"
@@ -108,6 +107,3 @@ struct _virNWFilterDriver {
     virDrvNWFilterBindingDelete nwfilterBindingDelete;
     virDrvNWFilterBindingGetXMLDesc nwfilterBindingGetXMLDesc;
 };
-
-
-#endif /* LIBVIRT_DRIVER_NWFILTER_H */

src/driver-secret.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_DRIVER_SECRET_H
+#pragma once
-# define LIBVIRT_DRIVER_SECRET_H
 
 #ifndef __VIR_DRIVER_H_INCLUDES___
 # error "Don't include this file directly, only use driver.h"
@@ -113,6 +112,3 @@ struct _virSecretDriver {
     virDrvConnectSecretEventRegisterAny connectSecretEventRegisterAny;
     virDrvConnectSecretEventDeregisterAny connectSecretEventDeregisterAny;
 };
-
-
-#endif /* LIBVIRT_DRIVER_SECRET_H */

src/driver-state.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_DRIVER_STATE_H
+#pragma once
-# define LIBVIRT_DRIVER_STATE_H
 
 #ifndef __VIR_DRIVER_H_INCLUDES___
 # error "Don't include this file directly, only use driver.h"
@@ -49,6 +48,3 @@ struct _virStateDriver {
     virDrvStateReload stateReload;
     virDrvStateStop stateStop;
 };
-
-
-#endif /* LIBVIRT_DRIVER_STATE_H */

src/driver-storage.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_DRIVER_STORAGE_H
+#pragma once
-# define LIBVIRT_DRIVER_STORAGE_H
 
 #ifndef __VIR_DRIVER_H_INCLUDES___
 # error "Don't include this file directly, only use driver.h"
@@ -279,6 +278,3 @@ struct _virStorageDriver {
     virDrvStoragePoolIsActive storagePoolIsActive;
     virDrvStoragePoolIsPersistent storagePoolIsPersistent;
 };
-
-
-#endif /* LIBVIRT_DRIVER_STORAGE_H */

src/driver-stream.h

@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_DRIVER_STREAM_H
+#pragma once
-# define LIBVIRT_DRIVER_STREAM_H
 
 #ifndef __VIR_DRIVER_H_INCLUDES___
 # error "Don't include this file directly, only use driver.h"
@@ -92,6 +91,3 @@ struct _virStreamDriver {
     virDrvStreamFinish streamFinish;
     virDrvStreamAbort streamAbort;
 };
-
-
-#endif /* LIBVIRT_DRIVER_STREAM_H */

src/driver.h

@@ -19,8 +19,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBVIRT_DRIVER_H
+#pragma once
-# define LIBVIRT_DRIVER_H
 
 #include <unistd.h>
 
@@ -126,5 +125,3 @@ int virSetConnectNWFilter(virConnectPtr conn);
 int virSetConnectNodeDev(virConnectPtr conn);
 int virSetConnectSecret(virConnectPtr conn);
 int virSetConnectStorage(virConnectPtr conn);
-
-#endif /* LIBVIRT_DRIVER_H */