From nobody Fri Oct 08 06:10:47 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 126D712D36A8; Fri, 8 Oct 2021 06:10:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HQd996JbLz3Kwy; Fri, 8 Oct 2021 06:10:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 46E6F21DA0; Fri, 8 Oct 2021 06:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1986AlWE007175; Fri, 8 Oct 2021 06:10:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1986AloM007174; Fri, 8 Oct 2021 06:10:47 GMT (envelope-from git) Date: Fri, 8 Oct 2021 06:10:47 GMT Message-Id: <202110080610.1986AloM007174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: fa6918f70475 - stable/12 - loader: variable i is unused without MBR/GPT support built in List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: fa6918f704754dc1bc3451c6e637103c7ffcce37 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=fa6918f704754dc1bc3451c6e637103c7ffcce37 commit fa6918f704754dc1bc3451c6e637103c7ffcce37 Author: Toomas Soome AuthorDate: 2020-06-16 07:05:03 +0000 Commit: Kyle Evans 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));