git: fa6918f70475 - stable/12 - loader: variable i is unused without MBR/GPT support built in
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 08 Oct 2021 06:10:47 UTC
The branch stable/12 has been updated by kevans:
URL: https://cgit.FreeBSD.org/src/commit/?id=fa6918f704754dc1bc3451c6e637103c7ffcce37
commit fa6918f704754dc1bc3451c6e637103c7ffcce37
Author: Toomas Soome <tsoome@FreeBSD.org>
AuthorDate: 2020-06-16 07:05:03 +0000
Commit: Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2021-10-08 02:42:48 +0000
loader: variable i is unused without MBR/GPT support built in
Because i is only used as index in for loop, declare it in for statement.
(cherry picked from commit f44c441ee680e1456fba0e8c52f93a49e6f6695b)
---
stand/common/part.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/stand/common/part.c b/stand/common/part.c
index b13db2abd35a..8baa029c1606 100644
--- a/stand/common/part.c
+++ b/stand/common/part.c
@@ -655,7 +655,6 @@ ptable_open(void *dev, uint64_t sectors, uint16_t sectorsize,
struct dos_partition *dp;
struct ptable *table;
uint8_t *buf;
- int i;
#ifdef LOADER_MBR_SUPPORT
struct pentry *entry;
uint32_t start, end;
@@ -728,7 +727,7 @@ ptable_open(void *dev, uint64_t sectors, uint16_t sectorsize,
* start sector 1. After DOSPTYP_PMBR, there may be other partitions.
* UEFI compliant PMBR has no other partitions.
*/
- for (i = 0; i < NDOSPART; i++) {
+ for (int i = 0; i < NDOSPART; i++) {
if (dp[i].dp_flag != 0 && dp[i].dp_flag != 0x80) {
DPRINTF("invalid partition flag %x", dp[i].dp_flag);
goto out;
@@ -750,7 +749,7 @@ ptable_open(void *dev, uint64_t sectors, uint16_t sectorsize,
/* Read MBR. */
DPRINTF("MBR detected");
table->type = PTABLE_MBR;
- for (i = has_ext = 0; i < NDOSPART; i++) {
+ for (int i = has_ext = 0; i < NDOSPART; i++) {
if (dp[i].dp_typ == 0)
continue;
start = le32dec(&(dp[i].dp_start));