Use consistent idiom/naming convention for the the #include

guards. Spelunkers using grep are easily confused.

13 files changed, 45 insertions, 36 deletions

diff --git a/sys/scsi/cd.h b/sys/scsi/cd.h
index 0833d99c3dc..8e183ad8462 100644
--- a/sys/scsi/cd.h
+++ b/sys/scsi/cd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd.h,v 1.26 2019/09/27 17:22:31 krw Exp $	*/
+/*	$OpenBSD: cd.h,v 1.27 2019/09/27 23:07:42 krw Exp $	*/
 /*	$NetBSD: scsi_cd.h,v 1.6 1996/03/19 03:06:39 mycroft Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  */
 #ifndef	_SCSI_CD_H
-#define _SCSI_CD_H 1
+#define _SCSI_CD_H
 
 /*
  *	Define two bits always in the same place in byte 2 (flag byte)
diff --git a/sys/scsi/iscsi.h b/sys/scsi/iscsi.h
index c1fc1baff87..bda356d2fa1 100644
--- a/sys/scsi/iscsi.h
+++ b/sys/scsi/iscsi.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iscsi.h,v 1.8 2011/04/26 21:30:14 claudio Exp $ */
+/*	$OpenBSD: iscsi.h,v 1.9 2019/09/27 23:07:42 krw Exp $ */
 
 /*
  * Copyright (c) 2008 David Gwynne <dlg@openbsd.org>
@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SYS_SCSI_ISCSI_H
-#define _SYS_SCSI_ISCSI_H
+#ifndef _SCSI_ISCSI_H
+#define _SCSI_ISCSI_H
 
 struct iscsi_pdu {
 	u_int8_t	opcode;
@@ -567,4 +567,4 @@ struct iscsi_pdu_nop_in {
 	u_int8_t	_reserved2[12];
 } __packed;
 
-#endif /* _SYS_SCSI_ISCSI_H */
+#endif /* _SCSI_ISCSI_H */
diff --git a/sys/scsi/mpathvar.h b/sys/scsi/mpathvar.h
index 45fd4c2e00a..ccd1e3f9c5f 100644
--- a/sys/scsi/mpathvar.h
+++ b/sys/scsi/mpathvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpathvar.h,v 1.9 2013/08/27 00:53:10 dlg Exp $ */
+/*	$OpenBSD: mpathvar.h,v 1.10 2019/09/27 23:07:42 krw Exp $ */
 
 /*
  * Copyright (c) 2010 David Gwynne <dlg@openbsd.org>
@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SYS_SCSI_MPATH_H_
-#define _SYS_SCSI_MPATH_H_
+#ifndef _SCSI_MPATHVAR_H
+#define _SCSI_MPATHVAR_H
 
 struct mpath_group;
 
@@ -56,4 +56,4 @@ void			 mpath_start(struct mpath_path *, struct scsi_xfer *);
 
 struct device		*mpath_bootdv(struct device *);
 
-#endif /* _SYS_SCSI_MPATH_H_ */
+#endif /* _SCSI_MPATHVAR_H */
diff --git a/sys/scsi/safte.h b/sys/scsi/safte.h
index b3071ba09f1..f91f2afb339 100644
--- a/sys/scsi/safte.h
+++ b/sys/scsi/safte.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: safte.h,v 1.7 2019/09/27 17:22:31 krw Exp $ */
+/*	$OpenBSD: safte.h,v 1.8 2019/09/27 23:07:42 krw Exp $ */
 
 /*
  * Copyright (c) 2005 David Gwynne <dlg@openbsd.org>
@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SCSI_SAFTE_H_
-#define _SCSI_SAFTE_H_
+#ifndef _SCSI_SAFTE_H
+#define _SCSI_SAFTE_H
 
 #define SAFTE_EXTRA_OFFSET	0x05
 /* scsi_inquiry_data.extra */
@@ -174,4 +174,4 @@ struct safte_slotop {
 	u_int8_t	reserved[61];	/* zero these */
 } __packed;
 
-#endif /* _SCSI_SAFTE_H_ */
+#endif /* _SCSI_SAFTE_H */
diff --git a/sys/scsi/scsi_all.h b/sys/scsi/scsi_all.h
index cad6d221381..7464ebe8f3e 100644
--- a/sys/scsi/scsi_all.h
+++ b/sys/scsi/scsi_all.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi_all.h,v 1.59 2019/09/21 00:12:15 krw Exp $	*/
+/*	$OpenBSD: scsi_all.h,v 1.60 2019/09/27 23:07:42 krw Exp $	*/
 /*	$NetBSD: scsi_all.h,v 1.10 1996/09/12 01:57:17 thorpej Exp $	*/
 
 /*
@@ -23,7 +23,7 @@
  */
 
 #ifndef	_SCSI_SCSI_ALL_H
-#define _SCSI_SCSI_ALL_H 1
+#define _SCSI_SCSI_ALL_H
 
 /*
  * SCSI command format
diff --git a/sys/scsi/scsi_changer.h b/sys/scsi/scsi_changer.h
index 65ca57cc0c4..9322ce3799b 100644
--- a/sys/scsi/scsi_changer.h
+++ b/sys/scsi/scsi_changer.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi_changer.h,v 1.6 2015/06/07 19:13:27 krw Exp $	*/
+/*	$OpenBSD: scsi_changer.h,v 1.7 2019/09/27 23:07:42 krw Exp $	*/
 /*	$NetBSD: scsi_changer.h,v 1.7 1996/04/03 00:25:48 thorpej Exp $	*/
 
 /*
@@ -61,7 +61,7 @@
  */
 
 #ifndef _SCSI_SCSI_CHANGER_H
-#define _SCSI_SCSI_CHANGER_H 1
+#define _SCSI_SCSI_CHANGER_H
 
 /*
  * SCSI command format
diff --git a/sys/scsi/scsi_debug.h b/sys/scsi/scsi_debug.h
index 988a874e05d..3274692d869 100644
--- a/sys/scsi/scsi_debug.h
+++ b/sys/scsi/scsi_debug.h
@@ -1,11 +1,11 @@
-/*	$OpenBSD: scsi_debug.h,v 1.15 2019/09/27 17:22:31 krw Exp $	*/
+/*	$OpenBSD: scsi_debug.h,v 1.16 2019/09/27 23:07:42 krw Exp $	*/
 /*	$NetBSD: scsi_debug.h,v 1.7 1996/10/12 23:23:16 christos Exp $	*/
 
 /*
  * Written by Julian Elischer (julian@tfs.com)
  */
 #ifndef	_SCSI_SCSI_DEBUG_H
-#define _SCSI_SCSI_DEBUG_H 1
+#define _SCSI_SCSI_DEBUG_H
 #ifdef _KERNEL
 
 /*
diff --git a/sys/scsi/scsi_disk.h b/sys/scsi/scsi_disk.h
index a74a852bfd1..706217b3511 100644
--- a/sys/scsi/scsi_disk.h
+++ b/sys/scsi/scsi_disk.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi_disk.h,v 1.37 2019/09/27 17:22:31 krw Exp $	*/
+/*	$OpenBSD: scsi_disk.h,v 1.38 2019/09/27 23:07:42 krw Exp $	*/
 /*	$NetBSD: scsi_disk.h,v 1.10 1996/07/05 16:19:05 christos Exp $	*/
 
 /*
@@ -55,7 +55,7 @@
  */
 
 #ifndef	_SCSI_SCSI_DISK_H
-#define _SCSI_SCSI_DISK_H 1
+#define _SCSI_SCSI_DISK_H
 
 /*
  * XXX Is this also used by ATAPI?
diff --git a/sys/scsi/scsi_message.h b/sys/scsi/scsi_message.h
index 6c49879eb21..93fbc87c4a6 100644
--- a/sys/scsi/scsi_message.h
+++ b/sys/scsi/scsi_message.h
@@ -1,4 +1,7 @@
-/*	$OpenBSD: scsi_message.h,v 1.9 2009/11/01 23:06:03 fgsch Exp $	*/
+/*	$OpenBSD: scsi_message.h,v 1.10 2019/09/27 23:07:42 krw Exp $	*/
+
+#ifndef _SCSI_SCSI_MESSAGE_H
+#define _SCSI_SCSI_MESSAGE_H
 
 #define IS1BYTEMSG(m)	(((m) != 0x01 && (m) < 0x20) || (m) >= 0x80)
 #define IS2BYTEMSG(m)	(((m) & 0xf0) == 0x20)
@@ -60,3 +63,5 @@
 #define MSG_EXT_PPR_PROT_QAS	0x04
 #define MSG_EXT_PPR_PROT_DT	0x02
 #define MSG_EXT_PPR_PROT_IUS	0x01
+
+#endif /* _SCSI_SCSI_MESSAGE_H */
diff --git a/sys/scsi/scsi_scanner.h b/sys/scsi/scsi_scanner.h
index d1ed7d7cd64..61876f2d362 100644
--- a/sys/scsi/scsi_scanner.h
+++ b/sys/scsi/scsi_scanner.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi_scanner.h,v 1.10 2005/12/10 01:30:13 deraadt Exp $	*/
+/*	$OpenBSD: scsi_scanner.h,v 1.11 2019/09/27 23:07:42 krw Exp $	*/
 
 /*
  * Copyright (c) 1995 Kenneth Stailey.  All rights reserved.
@@ -34,8 +34,8 @@
  * SCSI scanner interface description
  */
 
-#ifndef	_SCSI_SCANNER_H_
-#define _SCSI_SCANNER_H_
+#ifndef	_SCSI_SCSI_SCANNER_H
+#define _SCSI_SCSI_SCANNER_H
 
 /* SCSI scanner commands */
 #define GET_IMAGE_STATUS	0x0f
@@ -132,4 +132,4 @@ struct scsi_window_data {
 #define MUSTEK_ADF		0x10	/* ADF and backtracking selection */
 #define MUSTEK_LUT		0x55	/* look up table download */
 
-#endif /* _SCSI_SCANNER_H_ */
+#endif /* _SCSI_SCSI_SCANNER_H */
diff --git a/sys/scsi/scsi_tape.h b/sys/scsi/scsi_tape.h
index 56617a0da8c..c0e172e84b0 100644
--- a/sys/scsi/scsi_tape.h
+++ b/sys/scsi/scsi_tape.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi_tape.h,v 1.10 2019/09/05 13:22:31 krw Exp $	*/
+/*	$OpenBSD: scsi_tape.h,v 1.11 2019/09/27 23:07:42 krw Exp $	*/
 /*	$NetBSD: scsi_tape.h,v 1.9 1996/05/24 02:04:47 thorpej Exp $	*/
 
 /*
@@ -51,8 +51,8 @@
  * SCSI tape interface description
  */
 
-#ifndef	_SCSI_TAPE_H_
-#define _SCSI_TAPE_H_ 1
+#ifndef	_SCSI_SCSI_TAPE_H
+#define _SCSI_SCSI_TAPE_H
 
 /*
  * SCSI command formats
@@ -237,4 +237,4 @@ struct scsi_tape_dev_conf_page {
 #define QIC_3080	0x29
 #define QIC_3095	0x45
 
-#endif /* _SCSI_TAPE_H_ */
+#endif /* _SCSI_SCSI_TAPE_H */
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index e7fb5e7008a..189af7712fb 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsiconf.h,v 1.175 2019/09/27 16:03:45 krw Exp $	*/
+/*	$OpenBSD: scsiconf.h,v 1.176 2019/09/27 23:07:42 krw Exp $	*/
 /*	$NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $	*/
 
 /*
@@ -47,8 +47,8 @@
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  */
 
-#ifndef	SCSI_SCSICONF_H
-#define SCSI_SCSICONF_H
+#ifndef	_SCSI_SCSICONF_H
+#define _SCSI_SCSICONF_H
 
 #include <sys/queue.h>
 #include <sys/timeout.h>
@@ -582,4 +582,4 @@ int	scsi_pending_finish(struct mutex *, u_int *);
 void	scsi_cmd_rw_decode(struct scsi_generic *, u_int64_t *, u_int32_t *);
 
 #endif /* _KERNEL */
-#endif /* SCSI_SCSICONF_H */
+#endif /* _SCSI_SCSICONF_H */
diff --git a/sys/scsi/sdvar.h b/sys/scsi/sdvar.h
index bf8b1cef03f..333239d5774 100644
--- a/sys/scsi/sdvar.h
+++ b/sys/scsi/sdvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdvar.h,v 1.42 2013/10/02 18:59:04 krw Exp $	*/
+/*	$OpenBSD: sdvar.h,v 1.43 2019/09/27 23:07:42 krw Exp $	*/
 /*	$NetBSD: sdvar.h,v 1.7 1998/08/17 00:49:03 mycroft Exp $	*/
 
 /*-
@@ -47,6 +47,9 @@
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  */
 
+#ifndef _SCSI_SDVAR_H
+#define _SCSI_SDVAR_H
+
 #ifdef _KERNEL
 struct sd_softc {
 	struct device		sc_dev;
@@ -79,3 +82,4 @@ struct sd_softc {
 #define	SDGP_RESULT_OFFLINE	1	/* no media, or otherwise losing */
 
 #endif /* _KERNEL */
+#endif /* _SCSI_SDVAR_H */