From nobody Wed Apr 23 21:35:59 2025 X-Original-To: dev-commits-src-main@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 4ZjXTr4b1wz5swWR; Wed, 23 Apr 2025 21:36:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZjXTr0GPNz458G; Wed, 23 Apr 2025 21:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745444160; 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=CCno/PvJzCchwyBoCE9HyDTa8feA65RYt+nQ0SqRwXc=; b=AA+3vt+JAvCoz+pDhcUGDqOMTJ5N0LE7XstCsifWEYze5fDqBbrXQ35i9G9ELuoYwacn7q n1eFhqdBBsjdUDe5qOBRpgb3T7DPYrdRpA+bWwdC6kkMUqeFj2idZUyZ/vgZi2koj02xxT poYaWkmWqG5NzgViFX0cdr3+pzyui9emYJih3VPfO9QoEKtypM94LSdLQfhvhs4OEdhNEu 2bSUqfxAk+z4BmY4qeaFNT5ipTT4NRAFeTHxC4X7psnfDmKV3dTEj4uGKZPCC3fU6BPYxZ gvupUjCT/Sk3ZKjiPkQvHNM7zbU1L2TSNxdG6X1vniMTAnP6A3mX4gOvhVswCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745444160; a=rsa-sha256; cv=none; b=Qq8gCvHQdkx+v6OxzLluOESGtj7TTZeX59oOZUeiDzEuCfF5eZez+ELSv3+lJaiTkCd3Qa 17++7FyhnHS1IKgDM0K1MHueymKEHCFQG736MYl9RhbYBwIuiu9msCq9zQVAl2rxddCl8P RdR/nyIlqRLPDrENLY4IPXHJN+I7zvI0yRZWs2I7ST2fuj/NMaglsU9YcI09vir7FayDJK MvPVR9g8lnLfl7nr9zYvaKX9e71+iSuzg64Y9F7RNmAV7xhEoCB8Zz1B01+LNeNcXmdIt+ CQdB7jJzKt0z8bNUgbKC0rHPFXVtyx28WgOvX9DzHskPJuzl3/f4gtfAZ/vfPg== 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=1745444160; 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=CCno/PvJzCchwyBoCE9HyDTa8feA65RYt+nQ0SqRwXc=; b=IgZgSPl5gHCRFVe+NirO2MK4VLP7nMwUtcckJaZ0YVcDHINBMPXhazxWdlfPnq9Cve/SEa qXfbyyXdvTamuL8j7u9OQirLB04WuoyPOEiPkPR8JNV8grnzAYb2BxF6T4ElPeeTyZgOeD 5koIL56m/JH+VFSXgPbV7q1o18xuJ9Irc30NysoCyKEPuq5mmLwpbGhC/4n79M++rJ0TI9 Q9Q80Ay5PHhF5UzZQQosm8oDdLAlygeOTtWJNEC+N7r7icybJxwhhL45bYhO0yz+d8ESp2 3u+rS2Hrc91xgw71LKoa6vPBieYYzycjWD7J0s9zr/YU+NpsF2WhMxVcnxa5Bw== 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 4ZjXTq6zV3z5W8; Wed, 23 Apr 2025 21:35:59 +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 53NLZx2L064040; Wed, 23 Apr 2025 21:35:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53NLZx5K064037; Wed, 23 Apr 2025 21:35:59 GMT (envelope-from git) Date: Wed, 23 Apr 2025 21:35:59 GMT Message-Id: <202504232135.53NLZx5K064037@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: 828e0ee79ff7 - main - libefivar: Prefer EFI_GUID to GUID List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 828e0ee79ff753fbe676ac7a081bc010c038dbdd Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=828e0ee79ff753fbe676ac7a081bc010c038dbdd commit 828e0ee79ff753fbe676ac7a081bc010c038dbdd Author: Warner Losh AuthorDate: 2025-04-23 21:33:31 +0000 Commit: Warner Losh 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