From nobody Tue Sep 9 17:30:34 2025 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 4cLrSW3JThz67ClZ; Tue, 09 Sep 2025 17:30:35 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cLrSV6tdYz3XGm; Tue, 09 Sep 2025 17:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757439035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0MnmYhQf8Nse2ZVryVyGYV12nEMCcCZ0O0smI81Kp9E=; b=Pa47eIMbxfkHar+esBJkimR/mjohSW5A/62t7UFitm0wGQAJKOcD75LExRqN9lJkMBNW97 nSxFTmAUWbVL0SLxE/B0xkcXo/U3hqjXVQ++US1EJC8JLt2ajOwEkzgHUPBqEVtjnq1I6M uy1ECGUtV82MW1+QtlD52RwsRysSfvhG25AwVEitN+y8oznEvscdgMqR5VrKv8nGRmHio5 tgJhq6A4DQLWN90MGgr5jg+DutVCLCj75qoWnRXuf+305Yh7saYHyP0LllnhqHPxDUXvZZ BNAZLRPdelyub82Y+BxtKedu3pqG8m1xGar9zkHbT1i9PBcbvfHHCKUDuxiPtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757439035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0MnmYhQf8Nse2ZVryVyGYV12nEMCcCZ0O0smI81Kp9E=; b=D7Y1ZEbFlZAGzOl+MfimA9Yp1ZWzVdYswFCgztuTh67NjCxBOi8XUE2aUNvlpl/ecncp2+ tFEu4+x4FKqrTO0zEYDMfuiIqjQOYJ0YmnsGLQZ4wvTJbVWI+I6o1XkTXSVPHDUvvmqLow TH3Iglw1CVwHs5YDEP0ubCSNh3yBbTkXje/17ArfcnXxLQqb6XYNE2eWtm/4nVSexQTV0q 8eUWneMH6PSISg69EN1iyb0PAlbRt98VJliPWsm9WzeViKRjJsFoUh4HOuWS8OM4RBlbqz gPQFrIdcPhODbrkc3uIwCHR3UaqekWyXvCczuMbq5f4moF6j8sqlB0PD4lrQww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757439035; a=rsa-sha256; cv=none; b=eK7qw0bbYPT02jjHFX4F98VChBayRojGcrLLVd+AicpSD26z9Htxa/u/NLHsi8FXFVZD0J A2XqEzqnrVINxx+nwd1RQbh6OMDsbVcZ0YcAN2crR2aaKlzeRlbSUnF18ylMKRZ8e8hZ61 wMIjd+w0ZjfiJId2r35513zeclOGJaOBiKdHGFivXHlU925nqmVN/Vk3drbOC52KGr0Hjr WxWqRKKcW952tSyaH4NzaxZPxPnE1Z0k9IKh7oP/YbH7o68VeMFmPylzeiS348rACZqA4c mzFHQZgHVD1oh9ys6rtV7a9+YKC3k1LpHOXPS2SeRiA8zSBEDMC28UpykQN1EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cLrSV6Q5Szm1j; Tue, 09 Sep 2025 17:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 589HUY0x019273; Tue, 9 Sep 2025 17:30:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 589HUYd9019269; Tue, 9 Sep 2025 17:30:34 GMT (envelope-from git) Date: Tue, 9 Sep 2025 17:30:34 GMT Message-Id: <202509091730.589HUYd9019269@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 18141961df8c - main - loader/efi: remove is_last parameter from find_currdev 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18141961df8ce00d44da83989d06a789e8415491 Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=18141961df8ce00d44da83989d06a789e8415491 commit 18141961df8ce00d44da83989d06a789e8415491 Author: Ahmad Khalifa AuthorDate: 2025-09-09 17:19:55 +0000 Commit: Ahmad Khalifa CommitDate: 2025-09-09 17:19:55 +0000 loader/efi: remove is_last parameter from find_currdev It is unused. Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D52434 --- stand/efi/loader/main.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index d05e11f8eadd..208b8b424e60 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -505,8 +505,7 @@ match_boot_info(char *boot_info, size_t bisz) * a drop to the OK boot loader prompt is possible. */ static int -find_currdev(bool do_bootmgr, bool is_last, - char *boot_info, size_t boot_info_sz) +find_currdev(bool do_bootmgr, char *boot_info, size_t boot_info_sz) { pdinfo_t *dp, *pp; EFI_DEVICE_PATH *devpath, *copy; @@ -1202,7 +1201,7 @@ EFI_STATUS main(int argc, CHAR16 *argv[]) { int howto, i, uhowto; - bool has_kbd, is_last; + bool has_kbd; char *s; EFI_DEVICE_PATH *imgpath; CHAR16 *text; @@ -1405,7 +1404,6 @@ main(int argc, CHAR16 *argv[]) printf(" %04x%s", boot_order[i], boot_order[i] == boot_current ? "[*]" : ""); printf("\n"); - is_last = boot_order[(sz / sizeof(boot_order[0])) - 1] == boot_current; } else if (uefi_boot_mgr) { /* * u-boot doesn't set BootOrder, but otherwise participates in the @@ -1413,7 +1411,6 @@ main(int argc, CHAR16 *argv[]) * a failure. */ boot_order[0] = boot_current; - is_last = true; } } @@ -1462,7 +1459,7 @@ main(int argc, CHAR16 *argv[]) * the boot protocol and also allow an escape hatch for users wishing * to try something different. */ - if (find_currdev(uefi_boot_mgr, is_last, boot_info, bisz) != 0) + if (find_currdev(uefi_boot_mgr, boot_info, bisz) != 0) if (uefi_boot_mgr && !interactive_interrupt("Failed to find bootable partition")) return (EFI_NOT_FOUND);