git: 828e0ee79ff7 - main - libefivar: Prefer EFI_GUID to GUID

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=828e0ee79ff753fbe676ac7a081bc010c038dbdd

commit 828e0ee79ff753fbe676ac7a081bc010c038dbdd
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2025-04-23 21:33:31 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2025-04-23 21:33:31 +0000

    libefivar: Prefer EFI_GUID to GUID
    
    There's more references to EFI_GUID than to GUID, so prefer using
    that. The EFI_GUID is closely relate to UUID, but not quite identical to
    it and those slight differences matter sometimes as well (which is how I
    found these). Since nearly all the EFI code (ours and EDK2) prefers
    EGI_GUID, use that proactively here.
    
    Sponsored by:           Netflix
---
 lib/libefivar/uefi-dplib.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/libefivar/uefi-dplib.h b/lib/libefivar/uefi-dplib.h
index e801b5f26a81..6f76a9763a34 100644
--- a/lib/libefivar/uefi-dplib.h
+++ b/lib/libefivar/uefi-dplib.h
@@ -547,7 +547,7 @@ AllocateCopyPool(size_t l, const void *p)
 }
 
 static inline BOOLEAN
-CompareGuid (const GUID *g1, const GUID *g2)
+CompareGuid (const EFI_GUID *g1, const EFI_GUID *g2)
 {
 	uint32_t ignored_status;
 
@@ -578,7 +578,7 @@ StrHexToBytes(const char *str, size_t len, uint8_t *buf, size_t buflen)
 }
 
 static inline void
-StrToGuid(const char *str, GUID *guid)
+StrToGuid(const char *str, EFI_GUID *guid)
 {
 	uint32_t status;
 
@@ -599,7 +599,7 @@ WriteUnaligned64(void *ptr, uint64_t val)
  * Not to mention it's name.... Also, the error GUID is horrific.
  */
 static inline const char *
-guid_str(const GUID *g)
+guid_str(const EFI_GUID *g)
 {
 	static char buf[36 + 1];
 	char *str = NULL;
@@ -614,7 +614,7 @@ guid_str(const GUID *g)
 	free(str);
 	return buf;
 }
-#define G(x) guid_str((const GUID *)(const void *)x)
+#define G(x) guid_str((const EFI_GUID *)(const void *)x)
 #endif
 
 #undef GLOBAL_REMOVE_IF_UNREFERENCED