The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=7e791e2de6d5182b102ec46f48f750ac54ebac80
commit 7e791e2de6d5182b102ec46f48f750ac54ebac80
Author: Warner Losh <i...@freebsd.org>
AuthorDate: 2025-04-11 21:48:52 +0000
Commit: Warner Losh <i...@freebsd.org>
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);
