From: krw <krw@openbsd.org>
Date: Thu, 10 Jun 2021 15:09:16 +0000 (+0000)
Subject: 'i' is a silly name for a daddr_t variable, and could be needed
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=08d013265b5755d9d80443e9cd2081ab08023b1e;p=openbsd

'i' is a silly name for a daddr_t variable, and could be needed
for a future 'for'. Use 'daddr' instead.

No functional change.
---

diff --git a/sbin/fdisk/mbr.c b/sbin/fdisk/mbr.c
index 69479fdfda0..41e7478d5ef 100644
--- a/sbin/fdisk/mbr.c
+++ b/sbin/fdisk/mbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbr.c,v 1.73 2021/06/02 22:44:26 krw Exp $	*/
+/*	$OpenBSD: mbr.c,v 1.74 2021/06/10 15:09:16 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -79,7 +79,7 @@ MBR_init(struct mbr *mbr)
 {
 	extern uint32_t b_arg;
 	uint64_t adj;
-	daddr_t i;
+	daddr_t daddr;
 
 	/*
 	 * XXX Do *NOT* zap all MBR parts! Some archs still read initmbr
@@ -148,10 +148,10 @@ MBR_init(struct mbr *mbr)
 #endif
 
 	/* Start OpenBSD MBR partition on a power of 2 block number. */
-	i = 1;
-	while (i < DL_SECTOBLK(&dl, mbr->part[3].bs))
-		i *= 2;
-	adj = DL_BLKTOSEC(&dl, i) - mbr->part[3].bs;
+	daddr = 1;
+	while (daddr < DL_SECTOBLK(&dl, mbr->part[3].bs))
+		daddr *= 2;
+	adj = DL_BLKTOSEC(&dl, daddr) - mbr->part[3].bs;
 	mbr->part[3].bs += adj;
 	mbr->part[3].ns -= adj;
 	PRT_fix_CHS(&mbr->part[3]);