From c4fc5564c0f6445643b1519a03ae1d63aee3c242 Mon Sep 17 00:00:00 2001
From: krw <krw@openbsd.org>
Date: Mon, 25 Oct 2021 13:51:25 +0000
Subject: [PATCH] Nuke a bunch of pointless #ifndef _<.h file>/#endif guards.

---
 sbin/fdisk/cmd.h  | 7 +------
 sbin/fdisk/disk.h | 7 +------
 sbin/fdisk/mbr.h  | 7 +------
 sbin/fdisk/misc.h | 7 +------
 sbin/fdisk/part.h | 7 +------
 sbin/fdisk/user.h | 7 +------
 6 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/sbin/fdisk/cmd.h b/sbin/fdisk/cmd.h
index cb309f6e20e..aeda9578bff 100644
--- a/sbin/fdisk/cmd.h
+++ b/sbin/fdisk/cmd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.h,v 1.25 2021/09/09 15:21:39 krw Exp $	*/
+/*	$OpenBSD: cmd.h,v 1.26 2021/10/25 13:51:25 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -16,9 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _CMD_H
-#define _CMD_H
-
 #define CMD_EXIT	0x0000
 #define CMD_QUIT	0x0001
 #define CMD_CONT	0x0002
@@ -40,5 +37,3 @@ int		Xabort(char *, struct mbr *);
 int		Xhelp(char *, struct mbr *);
 int		Xflag(char *, struct mbr *);
 int		Xupdate(char *, struct mbr *);
-
-#endif /* _CMD_H */
diff --git a/sbin/fdisk/disk.h b/sbin/fdisk/disk.h
index 06913198d83..84de2a33175 100644
--- a/sbin/fdisk/disk.h
+++ b/sbin/fdisk/disk.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disk.h,v 1.31 2021/07/26 13:05:14 krw Exp $	*/
+/*	$OpenBSD: disk.h,v 1.32 2021/10/25 13:51:25 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -16,9 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _DISK_H
-#define _DISK_H
-
 struct disk {
 	struct prt	 dk_bootprt;
 	char		*dk_name;
@@ -40,5 +37,3 @@ int		 DISK_writesectors(const char *, const uint64_t,
 
 extern struct disk		disk;
 extern struct disklabel		dl;
-
-#endif /* _DISK_H */
diff --git a/sbin/fdisk/mbr.h b/sbin/fdisk/mbr.h
index 214c776d1fe..ad449080f5a 100644
--- a/sbin/fdisk/mbr.h
+++ b/sbin/fdisk/mbr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbr.h,v 1.41 2021/08/06 10:41:31 krw Exp $	*/
+/*	$OpenBSD: mbr.h,v 1.42 2021/10/25 13:51:25 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -16,9 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _MBR_H
-#define _MBR_H
-
 struct mbr {
 	uint64_t	mbr_lba_firstembr;
 	uint64_t	mbr_lba_self;
@@ -33,5 +30,3 @@ void		MBR_print(const struct mbr *, const char *);
 void		MBR_init(struct mbr *);
 int		MBR_read(const uint64_t, const uint64_t, struct mbr *);
 int		MBR_write(const struct mbr *);
-
-#endif /* _MBR_H */
diff --git a/sbin/fdisk/misc.h b/sbin/fdisk/misc.h
index e956467d8ee..d4c666eaa2a 100644
--- a/sbin/fdisk/misc.h
+++ b/sbin/fdisk/misc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.h,v 1.46 2021/09/13 15:07:51 krw Exp $	*/
+/*	$OpenBSD: misc.h,v 1.47 2021/10/25 13:51:25 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -16,9 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _MISC_H
-#define _MISC_H
-
 struct unit_type {
 	char		*ut_abbr;
 	int64_t		 ut_conversion;
@@ -41,5 +38,3 @@ int		 hex_octet(char *);
 uint64_t	 getuint64(const char *, uint64_t, const uint64_t, const uint64_t);
 char		*utf16le_to_string(const uint16_t *);
 uint16_t	*string_to_utf16le(const char *);
-
-#endif /* _MISC_H  */
diff --git a/sbin/fdisk/part.h b/sbin/fdisk/part.h
index e28921be125..cfbc48d2e27 100644
--- a/sbin/fdisk/part.h
+++ b/sbin/fdisk/part.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: part.h,v 1.30 2021/09/02 18:07:45 krw Exp $	*/
+/*	$OpenBSD: part.h,v 1.31 2021/10/25 13:51:25 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -16,9 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _PART_H
-#define _PART_H
-
 struct prt {
 	uint64_t	prt_bs;
 	uint64_t	prt_ns;
@@ -45,5 +42,3 @@ void PRT_fix_BN(struct prt *, const int);
 
 /* This does bs/ns -> CHS */
 void PRT_fix_CHS(struct prt *);
-
-#endif /* _PART_H */
diff --git a/sbin/fdisk/user.h b/sbin/fdisk/user.h
index 5944141ac66..5cdf158fa63 100644
--- a/sbin/fdisk/user.h
+++ b/sbin/fdisk/user.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: user.h,v 1.21 2021/08/24 12:55:06 krw Exp $	*/
+/*	$OpenBSD: user.h,v 1.22 2021/10/25 13:51:25 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -16,11 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _USER_H
-#define _USER_H
-
 void		USER_edit(const uint64_t, const uint64_t);
 void		USER_print_disk(const int);
 void		USER_help(void);
-
-#endif /* _USER_H */
-- 
2.20.1