with empty body loops, put final semicolon on a new line for readability

ok bluhm@ jca@

9 files changed, 35 insertions, 22 deletions

diff --git a/sys/arch/amd64/stand/libsa/biosdev.c b/sys/arch/amd64/stand/libsa/biosdev.c
index f669d169fd7..c4f6da905e6 100644
--- a/sys/arch/amd64/stand/libsa/biosdev.c
+++ b/sys/arch/amd64/stand/libsa/biosdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.c,v 1.36 2023/04/25 10:06:12 kn Exp $	*/
+/*	$OpenBSD: biosdev.c,v 1.37 2024/04/14 03:26:25 jsg Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -724,7 +724,8 @@ biosdisk_errno(u_int error)
 	if (error == 0)
 		return 0;
 
-	for (p = tab; p->error && p->error != error; p++);
+	for (p = tab; p->error && p->error != error; p++)
+		;
 
 	return p->errno;
 }
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index d84f1d83000..2241bb37366 100644
--- a/sys/arch/hppa/hppa/machdep.c
+++ b/sys/arch/hppa/hppa/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.268 2023/01/06 19:10:18 miod Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.269 2024/04/14 03:26:25 jsg Exp $	*/
 
 /*
  * Copyright (c) 1999-2003 Michael Shalayeff
@@ -508,7 +508,8 @@ cpuid()
 	}
 
 	if (cpu_type)
-		for (p = cpu_types; p->name[0] && p->cpuid != cpu_type; p++);
+		for (p = cpu_types; p->name[0] && p->cpuid != cpu_type; p++)
+			;
 	else
 		for (p = cpu_types;
 		    p->name[0] && p->features != cpu_features; p++);
@@ -831,7 +832,8 @@ btlb_insert(pa_space_t space, vaddr_t va, paddr_t pa, vsize_t *lenp, u_int prot)
 	}
 
 	/* align size */
-	for (len = pdc_btlb.min_size << PGSHIFT; len < *lenp; len <<= 1);
+	for (len = pdc_btlb.min_size << PGSHIFT; len < *lenp; len <<= 1)
+		;
 	len >>= PGSHIFT;
 	i = ffs(~mask) - 1;
 	if (len > pdc_btlb.max_size || i < 0 || i >= btlb_max) {
diff --git a/sys/arch/hppa/hppa/trap.c b/sys/arch/hppa/hppa/trap.c
index 036779495f3..a2bb4640d69 100644
--- a/sys/arch/hppa/hppa/trap.c
+++ b/sys/arch/hppa/hppa/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.165 2024/01/05 19:34:19 miod Exp $	*/
+/*	$OpenBSD: trap.c,v 1.166 2024/04/14 03:26:25 jsg Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -298,7 +298,8 @@ trap(int type, struct trapframe *frame)
 		fpp = (u_int64_t *)&hfp->hfp_regs;
 
 		pex = (u_int32_t *)&fpp[0];
-		for (i = 0, pex++; i < 7 && !*pex; i++, pex++);
+		for (i = 0, pex++; i < 7 && !*pex; i++, pex++)
+			;
 		flt = 0;
 		if (i < 7) {
 			u_int32_t stat = HPPA_FPU_OP(*pex);
diff --git a/sys/arch/hppa/stand/libsa/dev_hppa.c b/sys/arch/hppa/stand/libsa/dev_hppa.c
index 8ed4b5212ec..49fd6a605a6 100644
--- a/sys/arch/hppa/stand/libsa/dev_hppa.c
+++ b/sys/arch/hppa/stand/libsa/dev_hppa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_hppa.c,v 1.17 2014/07/13 09:26:08 jasper Exp $	*/
+/*	$OpenBSD: dev_hppa.c,v 1.18 2024/04/14 03:26:25 jsg Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -156,7 +156,8 @@ devboot(dev, p)
 	*p++ = 'r';
 #endif
 	/* quick copy device name */
-	for (q = pdc_devs[B_TYPE(dev)].name; (*p++ = *q++););
+	for (q = pdc_devs[B_TYPE(dev)].name; (*p++ = *q++);)
+		;
 	unit = B_UNIT(dev);
 	if (unit >= 10) {
 		p[-1] = '0' + unit / 10;
diff --git a/sys/arch/i386/stand/libsa/biosdev.c b/sys/arch/i386/stand/libsa/biosdev.c
index 03f689d6271..87f63885656 100644
--- a/sys/arch/i386/stand/libsa/biosdev.c
+++ b/sys/arch/i386/stand/libsa/biosdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.c,v 1.101 2023/04/25 14:48:17 kn Exp $	*/
+/*	$OpenBSD: biosdev.c,v 1.102 2024/04/14 03:26:25 jsg Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -723,7 +723,8 @@ biosdisk_errno(u_int error)
 	if (error == 0)
 		return 0;
 
-	for (p = tab; p->error && p->error != error; p++);
+	for (p = tab; p->error && p->error != error; p++)
+		;
 
 	return p->errno;
 }
diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c
index 8d1e309b4b6..baf7e4707b9 100644
--- a/sys/arch/macppc/dev/adb.c
+++ b/sys/arch/macppc/dev/adb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adb.c,v 1.51 2023/11/22 18:14:35 tobhe Exp $	*/
+/*	$OpenBSD: adb.c,v 1.52 2024/04/14 03:26:25 jsg Exp $	*/
 /*	$NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $	*/
 /*	$NetBSD: adb_direct.c,v 1.14 2000/06/08 22:10:45 tsubai Exp $	*/
 
@@ -1526,7 +1526,8 @@ adb_poweroff(void)
 		pmu_fileserver_mode(0);
 		pm_adb_poweroff();
 
-		for (;;);		/* wait for power off */
+		for (;;)	/* wait for power off */
+			;
 
 		return 0;
 
@@ -1539,7 +1540,8 @@ adb_poweroff(void)
 		if (result != 0)	/* exit if not sent */
 			return -1;
 
-		for (;;);		/* wait for power off */
+		for (;;)		/* wait for power off */
+			;
 
 		return 0;
 
diff --git a/sys/arch/macppc/dev/awacs.c b/sys/arch/macppc/dev/awacs.c
index 3791ee2de2b..a41f15366a2 100644
--- a/sys/arch/macppc/dev/awacs.c
+++ b/sys/arch/macppc/dev/awacs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: awacs.c,v 1.41 2024/03/03 02:40:10 gkoehler Exp $	*/
+/*	$OpenBSD: awacs.c,v 1.42 2024/04/14 03:26:25 jsg Exp $	*/
 /*	$NetBSD: awacs.c,v 1.4 2001/02/26 21:07:51 wiz Exp $	*/
 
 /*-
@@ -956,7 +956,8 @@ awacs_trigger_output(void *h, void *start, void *end, int bsize,
 
 	DPRINTF("trigger_output %p %p 0x%x\n", start, end, bsize);
 
-	for (p = sc->sc_dmas; p && p->addr != start; p = p->next);
+	for (p = sc->sc_dmas; p && p->addr != start; p = p->next)
+		;
 	if (!p)
 		return -1;
 
@@ -999,7 +1000,8 @@ awacs_trigger_input(void *h, void *start, void *end, int bsize,
 
 	DPRINTF("trigger_input %p %p 0x%x\n", start, end, bsize);
 
-	for (p = sc->sc_dmas; p && p->addr != start; p = p->next);
+	for (p = sc->sc_dmas; p && p->addr != start; p = p->next)
+		;
 	if (!p)
 		return -1;
 
diff --git a/sys/arch/macppc/dev/i2s.c b/sys/arch/macppc/dev/i2s.c
index a7b998296b2..8501ff7f46f 100644
--- a/sys/arch/macppc/dev/i2s.c
+++ b/sys/arch/macppc/dev/i2s.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i2s.c,v 1.37 2022/10/26 20:19:07 kn Exp $	*/
+/*	$OpenBSD: i2s.c,v 1.38 2024/04/14 03:26:25 jsg Exp $	*/
 /*	$NetBSD: i2s.c,v 1.1 2003/12/27 02:19:34 grant Exp $	*/
 
 /*-
@@ -592,7 +592,8 @@ i2s_trigger_output(void *h, void *start, void *end, int bsize,
 
 	DPRINTF(("trigger_output %p %p 0x%x\n", start, end, bsize));
 
-	for (p = sc->sc_dmas; p && p->addr != start; p = p->next);
+	for (p = sc->sc_dmas; p && p->addr != start; p = p->next)
+		;
 	if (!p)
 		return -1;
 
@@ -633,7 +634,8 @@ i2s_trigger_input(void *h, void *start, void *end, int bsize,
 
 	DPRINTF(("trigger_input %p %p 0x%x\n", start, end, bsize));
 
-	for (p = sc->sc_dmas; p && p->addr != start; p = p->next);
+	for (p = sc->sc_dmas; p && p->addr != start; p = p->next)
+		;
 	if (!p)
 		return -1;
 
diff --git a/sys/arch/sparc64/stand/ofwboot/ofdev.c b/sys/arch/sparc64/stand/ofwboot/ofdev.c
index ef9c7ffa204..6d887f7a3f9 100644
--- a/sys/arch/sparc64/stand/ofwboot/ofdev.c
+++ b/sys/arch/sparc64/stand/ofwboot/ofdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ofdev.c,v 1.39 2023/06/03 21:37:53 krw Exp $	*/
+/*	$OpenBSD: ofdev.c,v 1.40 2024/04/14 03:26:25 jsg Exp $	*/
 /*	$NetBSD: ofdev.c,v 1.1 2000/08/20 14:58:41 mrg Exp $	*/
 
 /*
@@ -105,7 +105,8 @@ filename(char *str, char *ppart)
 				if (cp >= str && *cp == '-') {
 					/* found arguments, make firmware ignore them */
 					*cp = 0;
-					for (cp = lp; *--cp && *cp != ',';);
+					for (cp = lp; *--cp && *cp != ',';)
+						;
 					if (*++cp >= 'a' && *cp <= 'a' + MAXPARTITIONS)
 						*ppart = *cp;
 				}