The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0e614a4afe48f602fafad128e6a053c89f7445cd
commit 0e614a4afe48f602fafad128e6a053c89f7445cd Author: Jose Luis Duran <[email protected]> AuthorDate: 2025-11-15 17:25:32 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2025-11-25 18:17:23 +0000 libefivar: Fix (some) typos Fix typos in the files that are owned by the project. Bring back a "duplicate word" removal (node node), which should have been "node Node", the second "node" is not capitalized in the reference file (yet). We'll bring it back capitalized to avoid it from triggering automated checking scripts and possibly reverting this change again. A few other typos were not fixed, as we strive to keep as close to the reference files as possible, these fixes should be submitted to the reference project (tianocore/edk2) in the not so distant future. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1894 --- lib/libefivar/FreeBSD-update | 2 +- lib/libefivar/efivar-dp-xlate.c | 10 +++++----- lib/libefivar/efivar.h | 2 +- lib/libefivar/uefi-dputil.c | 2 +- sys/sys/efi-edk2.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/libefivar/FreeBSD-update b/lib/libefivar/FreeBSD-update index 52d0db4021ef..53b8f0dfff1a 100644 --- a/lib/libefivar/FreeBSD-update +++ b/lib/libefivar/FreeBSD-update @@ -8,7 +8,7 @@ These files are first mechnaically processed with sed -e "s/L'/'/g;"'s/L"/"/g;s/%g/%36s/g;s/%a/%s/g;s/^VOID/static VOID/g;s/ *$//g' -for several reasons. We're moving from wide rotuines to narrow routines. The +for several reasons. We're moving from wide routines to narrow routines. The UTC-2 this code is written for is a bad match for wchar_t which is an int. It's a much better match for plain narrow characters on FreeBSD. So we pretend that CHAR16 for these files is really char * (ASCII). diff --git a/lib/libefivar/efivar-dp-xlate.c b/lib/libefivar/efivar-dp-xlate.c index 78d82ba4bce0..2012842b6f80 100644 --- a/lib/libefivar/efivar-dp-xlate.c +++ b/lib/libefivar/efivar-dp-xlate.c @@ -221,7 +221,7 @@ efi_hd_to_unix(struct gmesh *mesh, const_efidp dp, char **dev, char **relpath, c provider = pp; for (i = 0; i < n; i++) { /* - * Skip all pseudo filesystems. This also skips the real filesytsem + * Skip all pseudo filesystems. This also skips the real filesystem * of ZFS. There's no EFI designator for ZFS in the standard, so * we'll need to invent one, but its decoding will be handled in * a separate function. @@ -328,7 +328,7 @@ errout: * * Extract the path from the File path node(s). translate any \ file separators * to /. Append the result to the mount point. Copy the resulting path into - * *path. Stat that path. If it is not found, return the errorr from stat. + * *path. Stat that path. If it is not found, return the error from stat. * * Finally, check to make sure the resulting path is still on the same * device. If not, return ENODEV. @@ -433,7 +433,7 @@ efivar_device_path_to_unix_path(const_efidp dp, char **dev, char **relpath, char * For paths of the first form: * find where the filesystem is mount (either the file directly, or * its parent directory). - * translate any logical device name (eg lable) to a physical one + * translate any logical device name (eg label) to a physical one * If not possible, return ENXIO * If the physical path is unsupported (Eg not on a GPT or MBR disk), * return ENXIO @@ -442,7 +442,7 @@ efivar_device_path_to_unix_path(const_efidp dp, char **dev, char **relpath, char * as a file path. * * For paths matching the second form: - * find the EFI partition corresponding to the root fileystem. + * find the EFI partition corresponding to the root filesystem. * If none found, return ENXIO * Create a media device path node for the found partition * Append a File Path to the end for the rest of the file. @@ -553,7 +553,7 @@ find_geom_efimedia(struct gmesh *mesh, const char *dev) efimedia = geom_pp_attr(mesh, pp, "efimedia"); /* - * If this device doesn't hav an efimedia attribute, see if it is a + * If this device doesn't have an efimedia attribute, see if it is a * glabel node, and if so look for the underlying provider to get the * efimedia attribute from. */ diff --git a/lib/libefivar/efivar.h b/lib/libefivar/efivar.h index e159f4cccd3d..238b23a8b2b8 100644 --- a/lib/libefivar/efivar.h +++ b/lib/libefivar/efivar.h @@ -31,7 +31,7 @@ #include <sys/endian.h> #include <stdint.h> -/* Shoud these be elsewhere ? */ +/* Should these be elsewhere ? */ #define EFI_VARIABLE_NON_VOLATILE 0x00000001 #define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002 #define EFI_VARIABLE_RUNTIME_ACCESS 0x00000004 diff --git a/lib/libefivar/uefi-dputil.c b/lib/libefivar/uefi-dputil.c index c31da14eed2d..1f6a051ce600 100644 --- a/lib/libefivar/uefi-dputil.c +++ b/lib/libefivar/uefi-dputil.c @@ -127,7 +127,7 @@ GetDevicePathSize ( @param MaxSize The maximum size of the device path data structure. @retval TRUE DevicePath is valid. - @retval FALSE The length of any node in the DevicePath is less + @retval FALSE The length of any node Node in the DevicePath is less than sizeof (EFI_DEVICE_PATH_PROTOCOL). @retval FALSE If MaxSize is not zero, the size of the DevicePath exceeds MaxSize. diff --git a/sys/sys/efi-edk2.h b/sys/sys/efi-edk2.h index b27b26bd613c..d591c253a3e0 100644 --- a/sys/sys/efi-edk2.h +++ b/sys/sys/efi-edk2.h @@ -72,7 +72,7 @@ typedef void VOID; /* * Note: the EDK2 code assumed #pragma packed works and PACKED is a * workaround for some old toolchain issues for EDK2 that aren't - * relevent to FreeBSD. + * relevant to FreeBSD. */ #define PACKED
