From b8464fd1ac0e783621fb415f7922223b0d73c4fb Mon Sep 17 00:00:00 2001
From: krw <krw@openbsd.org>
Date: Fri, 14 May 2021 21:11:15 +0000
Subject: [PATCH] Whitespace tweaks and a couple of stray u_int* in
 gpt_chk_mbr().

No intentional functional change.
---
 sbin/fdisk/mbr.c     |  6 +++---
 sys/kern/subr_disk.c | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sbin/fdisk/mbr.c b/sbin/fdisk/mbr.c
index e833989422d..16e21da15a1 100644
--- a/sbin/fdisk/mbr.c
+++ b/sbin/fdisk/mbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbr.c,v 1.69 2021/05/14 15:31:01 krw Exp $	*/
+/*	$OpenBSD: mbr.c,v 1.70 2021/05/14 21:11:15 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -300,10 +300,10 @@ gpt_chk_mbr(struct dos_partition *dp, u_int64_t dsize)
 {
 	struct dos_partition *dp2;
 	int efi, eficnt, found, i;
-	u_int32_t psize;
+	uint32_t psize;
 
 	found = efi = eficnt = 0;
-	for (dp2=dp, i=0; i < NDOSPART; i++, dp2++) {
+	for (dp2 = dp, i = 0; i < NDOSPART; i++, dp2++) {
 		if (dp2->dp_typ == DOSPTYP_UNUSED)
 			continue;
 		found++;
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 21c61e7074b..a6d512ec322 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_disk.c,v 1.240 2021/05/14 15:31:01 krw Exp $	*/
+/*	$OpenBSD: subr_disk.c,v 1.241 2021/05/14 21:11:15 krw Exp $	*/
 /*	$NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $	*/
 
 /*
@@ -105,7 +105,7 @@ void disk_attach_callback(void *);
 
 int spoofgptlabel(struct buf *, void (*)(struct buf *), struct disklabel *);
 
-int gpt_chk_mbr(struct dos_partition *, u_int64_t);
+int gpt_chk_mbr(struct dos_partition *, uint64_t);
 int gpt_chk_hdr(struct gpt_header *, struct disklabel *);
 int gpt_chk_parts(struct gpt_header *, struct gpt_partition *);
 int gpt_get_fstype(struct uuid *);
@@ -591,14 +591,14 @@ notfat:
  * Copied into sbin/fdisk/mbr.c.
  */
 int
-gpt_chk_mbr(struct dos_partition *dp, u_int64_t dsize)
+gpt_chk_mbr(struct dos_partition *dp, uint64_t dsize)
 {
 	struct dos_partition *dp2;
 	int efi, eficnt, found, i;
-	u_int32_t psize;
+	uint32_t psize;
 
 	found = efi = eficnt = 0;
-	for (dp2=dp, i=0; i < NDOSPART; i++, dp2++) {
+	for (dp2 = dp, i = 0; i < NDOSPART; i++, dp2++) {
 		if (dp2->dp_typ == DOSPTYP_UNUSED)
 			continue;
 		found++;
-- 
2.20.1