The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=7d48a56205224cfa969c32b47496dc8ac6a6a637
commit 7d48a56205224cfa969c32b47496dc8ac6a6a637 Author: Ahmad Khalifa <vexed...@freebsd.org> AuthorDate: 2025-09-09 17:19:24 +0000 Commit: Ahmad Khalifa <vexed...@freebsd.org> CommitDate: 2025-09-09 17:19:24 +0000 stand: remove unused variables --- stand/common/gfx_fb.c | 1 - stand/efi/loader/arch/amd64/multiboot2.c | 2 -- stand/efi/loader/arch/amd64/trap.c | 1 - stand/efi/loader/bootinfo.c | 3 +-- stand/efi/loader/copy.c | 2 +- stand/efi/loader/main.c | 7 ++----- 6 files changed, 4 insertions(+), 12 deletions(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index 659bf8540422..3de0a8b631ee 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -276,7 +276,6 @@ void gfx_fb_setcolors(teken_attr_t *attr, ev_sethook_t sethook, ev_unsethook_t unsethook) { - const char *ptr; bool need_setattr = false; /* diff --git a/stand/efi/loader/arch/amd64/multiboot2.c b/stand/efi/loader/arch/amd64/multiboot2.c index eb7362293406..6216fac42e4a 100644 --- a/stand/efi/loader/arch/amd64/multiboot2.c +++ b/stand/efi/loader/arch/amd64/multiboot2.c @@ -79,7 +79,6 @@ loadfile(char *filename, uint64_t dest, struct preloaded_file **result) void *multiboot = NULL; ssize_t search_size; struct multiboot_header *header; - char *cmdline; struct mb2hdr hdr; bool keep_bs = false; @@ -495,7 +494,6 @@ static int obj_loadfile(char *filename, uint64_t dest, struct preloaded_file **result) { struct preloaded_file *mfp, *kfp, *rfp; - struct kernel_module *kmp; int error; /* See if there's a multiboot kernel loaded */ diff --git a/stand/efi/loader/arch/amd64/trap.c b/stand/efi/loader/arch/amd64/trap.c index 61feb76e2dca..37e7e9d263a7 100644 --- a/stand/efi/loader/arch/amd64/trap.c +++ b/stand/efi/loader/arch/amd64/trap.c @@ -87,7 +87,6 @@ report_exc(struct trapframe *tf) struct frame *fp; uintptr_t pc, base; char buf[80]; - int ret; base = (uintptr_t)boot_img->ImageBase; /* diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index b8f1a2ffd56c..3230200e9be5 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -68,8 +68,7 @@ static int bi_getboothowto(char *kargs) { #ifdef EFI - const char *sw, *tmp; - char *opts; + const char *tmp; int speed, port; char buf[50]; #endif diff --git a/stand/efi/loader/copy.c b/stand/efi/loader/copy.c index e4ad865a4acd..bf1a7a075400 100644 --- a/stand/efi/loader/copy.c +++ b/stand/efi/loader/copy.c @@ -248,7 +248,7 @@ static int command_staging_slop(int argc, char *argv[]) { char *endp; - u_long new, prev; + u_long new; if (argc > 2) { goto err; diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 436676368447..4251e6f25ce8 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -864,7 +864,7 @@ static int check_acpi_spcr(void) { ACPI_TABLE_SPCR *spcr; - int br, db, io, rs, rw, sb, xo, pv, pd; + int br, db, io, rs, rw, xo, pv, pd; uintmax_t mm; const char *dt, *pa; char *val = NULL; @@ -896,7 +896,6 @@ check_acpi_spcr(void) /* Uart settings */ pa = acpi_uart_parity(spcr->Parity); - sb = spcr->StopBits; db = 8; /* @@ -1206,7 +1205,7 @@ main(int argc, CHAR16 *argv[]) EFI_DEVICE_PATH *imgpath; CHAR16 *text; EFI_STATUS rv; - size_t sz, bosz = 0, bisz = 0; + size_t sz, bisz = 0; UINT16 boot_order[100]; char boot_info[4096]; char buf[32]; @@ -1405,14 +1404,12 @@ main(int argc, CHAR16 *argv[]) boot_order[i] == boot_current ? "[*]" : ""); printf("\n"); is_last = boot_order[(sz / sizeof(boot_order[0])) - 1] == boot_current; - bosz = sz; } else if (uefi_boot_mgr) { /* * u-boot doesn't set BootOrder, but otherwise participates in the * boot manager protocol. So we fake it here and don't consider it * a failure. */ - bosz = sizeof(boot_order[0]); boot_order[0] = boot_current; is_last = true; }