[Spice-devel] [PATCH spice-gtk v4 10/29] fixup! usb-redir: add files for SCSI and USB MSC implementation

Frediano Ziglio fziglio at redhat.com
Tue Aug 27 09:22:27 UTC 2019


Update guard style
---
 src/cd-scsi-dev-params.h | 5 +----
 src/cd-scsi.h            | 5 +----
 src/cd-usb-bulk-msd.h    | 5 +----
 src/scsi-constants.h     | 5 +----
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/cd-scsi-dev-params.h b/src/cd-scsi-dev-params.h
index b480bcdc..344f720c 100644
--- a/src/cd-scsi-dev-params.h
+++ b/src/cd-scsi-dev-params.h
@@ -21,8 +21,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef SPICE_GTK_CD_SCSI_DEV_PARAMS_H_
-#define SPICE_GTK_CD_SCSI_DEV_PARAMS_H_
+#pragma once
 
 #include <gio/gio.h>
 
@@ -45,5 +44,3 @@ typedef struct CdScsiMediaParameters {
     uint64_t size;
     uint32_t block_size;
 } CdScsiMediaParameters;
-
-#endif /* SPICE_GTK_CD_SCSI_DEV_PARAMS_H_ */
diff --git a/src/cd-scsi.h b/src/cd-scsi.h
index c058a66e..86e951b8 100644
--- a/src/cd-scsi.h
+++ b/src/cd-scsi.h
@@ -21,8 +21,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef SPICE_GTK_CD_SCSI_H__
-#define SPICE_GTK_CD_SCSI_H__
+#pragma once
 
 #include "cd-scsi-dev-params.h"
 #include "cd-usb-bulk-msd.h"
@@ -116,5 +115,3 @@ void cd_scsi_dev_request_complete(void *target_user_data, CdScsiRequest *request
 void cd_scsi_dev_changed(void *target_user_data, uint32_t lun);
 void cd_scsi_dev_reset_complete(void *target_user_data, uint32_t lun);
 void cd_scsi_target_reset_complete(void *target_user_data);
-
-#endif /* SPICE_GTK_CD_SCSI_H__ */
diff --git a/src/cd-usb-bulk-msd.h b/src/cd-usb-bulk-msd.h
index 492a49b8..85661165 100644
--- a/src/cd-usb-bulk-msd.h
+++ b/src/cd-usb-bulk-msd.h
@@ -19,8 +19,7 @@
     License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef SPICE_GTK_CD_USB_BULK_MSD_H__
-#define SPICE_GTK_CD_USB_BULK_MSD_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -130,5 +129,3 @@ int cd_usb_bulk_msd_read(UsbCdBulkMsdDevice *device, uint32_t max_len);
 int cd_usb_bulk_msd_cancel_read(UsbCdBulkMsdDevice *device);
 
 G_END_DECLS
-
-#endif /* SPICE_GTK_CD_USB_BULK_MSD_H__ */
diff --git a/src/scsi-constants.h b/src/scsi-constants.h
index cf8a8825..a6d34a65 100644
--- a/src/scsi-constants.h
+++ b/src/scsi-constants.h
@@ -17,8 +17,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef SPICE_GTK_SCSI_CONSTANTS_H__
-#define SPICE_GTK_SCSI_CONSTANTS_H__
+#pragma once
 
 /*
  *      SCSI opcodes
@@ -320,5 +319,3 @@
 #define MMC_PROFILE_HDDVD_R_DL          0x0058
 #define MMC_PROFILE_HDDVD_RW_DL         0x005A
 #define MMC_PROFILE_INVALID             0xFFFF
-
-#endif
-- 
2.20.1



More information about the Spice-devel mailing list