From nobody Wed Feb 23 16:21:13 2022 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 3ABE519D6DA7; Wed, 23 Feb 2022 16:21:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K3h9k1CBBz4kqf; Wed, 23 Feb 2022 16:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645633274; 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=YSHFSaqYqCSEeFBbUQ+KPVXbm/Ldr4nee2dSxJ89HJc=; b=rXwhnAaJyDjQqwn7WnEFsv9JkmvYznZgK43wE9dM/hs5nu7ys+Z4OaHLz8/nVOggVzaojc rsJYQhF5J851Att5eml67KjjnBg4p2dBHr10koe7+cvZrZTFLkGbIlllyYE92FTWVnkqRL 3jpIXj9bUGFZYCxGnMCmCzoG+j/xlxs3/z6OBFceDIkJ1GIRTGjQtHHS72sWtaZ+gu+lZV jPcOApy/zrg6d4Y9fGV7aomubHFVaXqVyb4Uh/D6A+vhSVmIxeSUO0tga0CRAPMb2hZpXO FJbSr04hIGWsQEwWJZ4LLsklFzu09V3nbUx+ZdMNp3rldx8nMD4CcxidKwQsQw== 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 0AE981B82B; Wed, 23 Feb 2022 16:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21NGLDYs076131; Wed, 23 Feb 2022 16:21:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21NGLDm2076130; Wed, 23 Feb 2022 16:21:13 GMT (envelope-from git) Date: Wed, 23 Feb 2022 16:21:13 GMT Message-Id: <202202231621.21NGLDm2076130@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: 91a35e5803be - main - libefivar: Correct the string expression of UTF8 vendor device path 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 91a35e5803bef59b8ca67b0621216124cc2e42f8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645633274; 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=YSHFSaqYqCSEeFBbUQ+KPVXbm/Ldr4nee2dSxJ89HJc=; b=p6/tNKM9dTJJnkdaEIu7h8EWyOX0Z1cHdXco/tWcP7bulz4tKleBnvnaCRPC/c+oe+/ckJ gkbHy/zlSx/90xQoWpO6dZvGiNeD4r4DHDBeAloi65H/ubabl7NFlikUV9c/qWZM09wepG vQY8H4YCQjSb7UZEh+MVXMVQAEL0pjNy4yTpivArI0zVrQddQaHox6VJeb4deYaV1OTHfH EE80e+SdqGltBq5ObIwbjQbpWib67mN9WU7acBS1FMBIOb8rgDwnjleL6MFgZqP9jmbG6m jq3rlI0B+e24ExWkKk9zCqDtLI1YhJ1wAsmRXsDDZA+IiY61Uwnx8oESWYJebg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645633274; a=rsa-sha256; cv=none; b=SxX4qyOp4AdXkx5FxxpbgdYvXYLjqFgsjhC4KS7/dhtoTiVR6gEyaeoEzpiNhDQh1Xz1fa ynWigZehZm/QEMSsADJIejXII85DotAEhO7/wN6j+/lNzblD748U82jIwJKveKhSucw9rH 90uu4my6UQ0jeVtwbxDn3rnS53TIH7Bs9qvEHCSxYM/uSpL01l9BGfAIq6tZoudoUKl93b iciRoGTQiDC0Oy58FdxjQxu42jTKkN6laiBMBU08e3yLjpGqwtDLeO9AqGp/rpeSRrID/y haA8LlwyPL7/fh6IYgfBj3AOocPVQabyAlz20Vx609jEAbSQTJA3V+fLeV+Kng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=91a35e5803bef59b8ca67b0621216124cc2e42f8 commit 91a35e5803bef59b8ca67b0621216124cc2e42f8 Author: Jose Luis Duran AuthorDate: 2022-02-22 11:39:03 +0000 Commit: Warner Losh CommitDate: 2022-02-23 16:20:26 +0000 libefivar: Correct the string expression of UTF8 vendor device path According to UEFI spec, the string expression of UTF8 vendor device node should be displayed as: VenUtf8(). Current code display it as: VenUft8() by mistake when convert device path node to text. This commit is to fix this bug. Upstream Bug: https://bugzilla.tianocore.org/show_bug.cgi?id=1225 Obtained from: https://github.com/tianocore/edk2/commit/959be180e185869b71db9dad34c3f4bba660d724 Pull Request: https://github.com/freebsd/freebsd-src/pull/580 --- lib/libefivar/efivar-dp-format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libefivar/efivar-dp-format.c b/lib/libefivar/efivar-dp-format.c index aa875dc45e70..14f6adc2fd98 100644 --- a/lib/libefivar/efivar-dp-format.c +++ b/lib/libefivar/efivar-dp-format.c @@ -255,7 +255,7 @@ DevPathToTextVendor ( UefiDevicePathLibCatPrint (Str, "VenVt100Plus()"); return ; } else if (CompareGuid (&Vendor->Guid, &gEfiVTUTF8Guid)) { - UefiDevicePathLibCatPrint (Str, "VenUft8()"); + UefiDevicePathLibCatPrint (Str, "VenUtf8()"); return ; } else if (CompareGuid (&Vendor->Guid, &gEfiUartDevicePathGuid)) { FlowControlMap = (((UART_FLOW_CONTROL_DEVICE_PATH *) Vendor)->FlowControlMap);