From nobody Fri Apr 11 22:04:58 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 4ZZ9hq07wZz5slVT; Fri, 11 Apr 2025 22:04:59 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZZ9hp5mtwz44Rw; Fri, 11 Apr 2025 22:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744409098; 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=8SGVHOjdZRekpvmHVreHoKRohjz3Gn9EXYsW0oiKQHs=; b=wrcT5j/gSSpPSZdzBxy4R3Do6CEdrzrekVbhyf6u3+4ZgO0hgbuZbEGAsa1XEOtQeUe14l q4a2L6/s+70KXPm4rs8OYgfEtsipi8z/WHswzrPExJpq9Vy26LebYr0DLtbqV7ulqJyp8k SMx+0aPhKHGr4r0p5j7wv9paJo4A2W3L79rQzU/Oyt72psYdgKZWEXSA6eh6gqMiSF37si 2o/FcW4sl08KmxxberLGmKKUds2BLwr6t+wzOYxKARVQRK68ulN29vUiziPkq1LGPg0dh+ f11TLnq8CAlRkh3QcVgfUphC93JsYci5+vBSiqyGtSZnXo1lMZcpqcwns7RWEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744409098; a=rsa-sha256; cv=none; b=NYjGArI8XdXRulEVEzo8CoNmJZ8gxUK+l6bl/iC4ps9tV8C1axAijNIHYyB+Z0QHX2Im/m tnz32nLezQVDFvkhH9buMwu0/BuWnoeDKmNHbkf1NCLunlqs0ov3u2eHVokryDl7m53/1a elY9b6SPFlj6PVkLK+BNGJOHUaJDvLQ7CHdlnWT4LBR/X9i5rrD6xf7EhFggmcDdEL5kQK uB+fR8WThDSlev5joU1Vh+L3YNcTJVTiVn3Y28FINMhcLnypmHDzqu3cjFXbXChx/PWt46 DDtJjud0Az14QKX8OCb5e+zJjCZN9i9APJArJISfcGiljy2w0yD69P/oieZNUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744409098; 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=8SGVHOjdZRekpvmHVreHoKRohjz3Gn9EXYsW0oiKQHs=; b=f/ZEQhMIK4EtLhHeUxaLRbyByW3uYpxFAtEER86/muYlVg0/wdGnD608yzU3xhZWkIZ+66 j0G+SBYQLBgiXHVZpB1POfaJnysnNt7hN0mlxuqlj4g+r16aoFEc2vggFmYH0SsO3Aa1xW WEXreozh0Rg8hP/08ZVA2OzLeTkl2wmLZ5MA9PH6v/cm4An5sPEhaZbCpB3jsRMY3r4IGc xD/dRxtK7i3TXjaZ0TFsVZIn44k+VvkynMve8lMW/lLWlaxztbLbeUM2YmgfMBEjQr5/m2 usKp5AV1qR5BiZN+iNc39rGjhKDERwth/m5ePA6FlpVM5WTBwKV3s1a4o+FoAQ== 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 4ZZ9hp5Mf8zrDj; Fri, 11 Apr 2025 22:04:58 +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 53BM4wL6053856; Fri, 11 Apr 2025 22:04:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53BM4wwx053853; Fri, 11 Apr 2025 22:04:58 GMT (envelope-from git) Date: Fri, 11 Apr 2025 22:04:58 GMT Message-Id: <202504112204.53BM4wwx053853@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7e791e2de6d5 - main - loader/libefi: Fix trivial trailing whitespace 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e791e2de6d5182b102ec46f48f750ac54ebac80 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7e791e2de6d5182b102ec46f48f750ac54ebac80 commit 7e791e2de6d5182b102ec46f48f750ac54ebac80 Author: Warner Losh AuthorDate: 2025-04-11 21:48:52 +0000 Commit: Warner Losh CommitDate: 2025-04-11 21:48:52 +0000 loader/libefi: Fix trivial trailing whitespace Sponsored by: Netflix --- stand/efi/libefi/devpath.c | 2 +- stand/efi/libefi/efi_console.c | 12 ++++++------ stand/efi/libefi/eficom.c | 6 +++--- stand/efi/libefi/efinet.c | 6 +++--- stand/efi/libefi/time.c | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/stand/efi/libefi/devpath.c b/stand/efi/libefi/devpath.c index 85a5459c7d6b..db152f8eb9ad 100644 --- a/stand/efi/libefi/devpath.c +++ b/stand/efi/libefi/devpath.c @@ -491,7 +491,7 @@ efi_devpath_to_name(EFI_DEVICE_PATH *devpath) free(ptr); ptr = out; } - + return (ptr); } diff --git a/stand/efi/libefi/efi_console.c b/stand/efi/libefi/efi_console.c index 5813e2d20aef..cbb4dd01d1fb 100644 --- a/stand/efi/libefi/efi_console.c +++ b/stand/efi/libefi/efi_console.c @@ -552,7 +552,7 @@ curs_move(int *_x, int *_y, int x, int y) if (_y != NULL) *_y = conout->Mode->CursorRow; } - + /* Clear internal state of the terminal emulation code. */ void end_term(void) @@ -687,7 +687,7 @@ HO(void) args[0] = args[1] = 1; CM(); } - + /* Clear line from current position to end of line */ static void CL(int direction) @@ -710,7 +710,7 @@ CL(int direction) default: /* NOTREACHED */ __unreachable(); } - + if (cury == y - 1) len--; @@ -725,7 +725,7 @@ CL(int direction) if (direction != 0) curs_move(NULL, NULL, 0, cury); - + conout->OutputString(conout, line); /* restore cursor position */ curs_move(NULL, NULL, curx, cury); @@ -742,7 +742,7 @@ get_arg(int c) args[argc] += c - '0'; } #endif - + /* Emulate basic capabilities of cons25 terminal */ static void efi_term_emu(int c) @@ -755,7 +755,7 @@ efi_term_emu(int c) }; int t, i; EFI_STATUS status; - + switch (esc) { case 0: switch (c) { diff --git a/stand/efi/libefi/eficom.c b/stand/efi/libefi/eficom.c index f1ce14eb50f8..2aa592da47f4 100644 --- a/stand/efi/libefi/eficom.c +++ b/stand/efi/libefi/eficom.c @@ -336,7 +336,7 @@ comc_probe(struct console *sc) return; } - if (env != NULL) + if (env != NULL) unsetenv("efi_com_port"); snprintf(value, sizeof (value), "%u", comc_port->ioaddr); env_setenv("efi_com_port", EV_VOLATILE, value, @@ -497,7 +497,7 @@ comc_port_set(struct env_var *ev, int flags, const void *value) if (value == NULL || comc_port == NULL) return (CMD_ERROR); - if (comc_parse_intval(value, &port) != CMD_OK) + if (comc_parse_intval(value, &port) != CMD_OK) return (CMD_ERROR); handle = efi_serial_get_handle(port, NULL); @@ -532,7 +532,7 @@ comc_speed_set(struct env_var *ev, int flags, const void *value) if (value == NULL || comc_port == NULL) return (CMD_ERROR); - if (comc_parse_intval(value, &speed) != CMD_OK) + if (comc_parse_intval(value, &speed) != CMD_OK) return (CMD_ERROR); comc_port->newbaudrate = speed; diff --git a/stand/efi/libefi/efinet.c b/stand/efi/libefi/efinet.c index 97890c9d9b43..186d816cd323 100644 --- a/stand/efi/libefi/efinet.c +++ b/stand/efi/libefi/efinet.c @@ -48,7 +48,7 @@ static int efinet_match(struct netif *, void *); static int efinet_probe(struct netif *, void *); static ssize_t efinet_put(struct iodesc *, void *, size_t); -struct netif_driver efinetif = { +struct netif_driver efinetif = { .netif_bname = "efinet", .netif_match = efinet_match, .netif_probe = efinet_probe, @@ -150,7 +150,7 @@ efinet_put(struct iodesc *desc, void *pkt, size_t len) buf = NULL; /* XXX Is this needed? */ status = net->GetStatus(net, NULL, &buf); /* - * XXX EFI1.1 and the E1000 card returns a different + * XXX EFI1.1 and the E1000 card returns a different * address than we gave. Sigh. */ } while (status == EFI_SUCCESS && buf == NULL); @@ -328,7 +328,7 @@ efinet_init(struct iodesc *desc, void *machdep_hint) static void efinet_end(struct netif *nif) { - EFI_SIMPLE_NETWORK *net = nif->nif_devdata; + EFI_SIMPLE_NETWORK *net = nif->nif_devdata; if (net == NULL) return; diff --git a/stand/efi/libefi/time.c b/stand/efi/libefi/time.c index 99d86e30ee96..aa8508879b20 100644 --- a/stand/efi/libefi/time.c +++ b/stand/efi/libefi/time.c @@ -175,7 +175,7 @@ from_efi_time(EFI_TIME *ETime) /* * UTime should now be set to 00:00:00 on Jan 1 of the file's year. * - * Months + * Months */ UTime += (CumulativeDays[isleap(ETime->Year)][ETime->Month] * SECSPERDAY);