From nobody Fri Jul 24 15:46:18 2026 X-Original-To: dev-commits-src-branches@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 4h6C5R0RY8z6mKkB for ; Fri, 24 Jul 2026 15:46:19 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h6C5Q5b3Nz3YVV for ; Fri, 24 Jul 2026 15:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784907978; 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=QLmOPc4nojczC6AucT0NaVVATD0nL6yMbwdyPnQyV14=; b=CdodpVGoNWjxfzu9h/4YT+FIadeMHrnHDMkgG+0YXPS3p/gd83n+skG8S2ylgewNK4l5xB b9baRrR4B1bgQf4xorJHf1YF4NqJmAInDad/+BIJ3RdJOwV/PQnmwDSaPaTJ+vmC82g1YD UuD8eOzHjc7WrAmbVit9oxZQ2x1cw3VQIEJlDat3w3pY851qdxcbhK9KoY+2q7TBbA4cvO GS+UEjmxCam6BNKSGoTsZp3cyfOgbxbxxTfP+Ds6qzZQgQOxUgJCZmZlAlhsGU/9Me54H1 zxtROPOAsRZHKcqXJbjiSbXkhoWXaFdRd0TT5eMY1h+NacHy3xtuaOz48NE4rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784907978; a=rsa-sha256; cv=none; b=Q6vyj9Ev2tZOjUU4eyl6XQ+V0tYgJMAHMte592oK/HzVA4H/VWe7+6ebRaN74Gecwsqcso 2bBmNsC0nx3y7lR41sEgnI2tXNdYxbXALecCrQXoV680tE0FKmVnaiy4I4D33iO+TH0jwQ Sn0Dmx8AfjdG4YRO+Eyz/2HQ2MGmyrm6PmU6SHCuLqkDOb/Q6QMM/6gwKPoj9zoEyIczDq UTqvrID2TNEfZXkZquRr4aU0ywcWpyln+YO6wnDWiLPDmWeYg++17Ns4pte3s6Rlyqivh1 3VM0NAZ0JsGdZlVjNZhRDbGX4Q4lbPmO8yE+zFMnd9ENQkQYELKkAfBmzI9VrA== 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=1784907978; 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=QLmOPc4nojczC6AucT0NaVVATD0nL6yMbwdyPnQyV14=; b=khLuwPlMBH20KdF5M04LbfrktCkEUHwaK1aoQWc9UMDBXC/f1JysmSsdmoZakw1paksv9j DGANEZH16aziI2BScMsJGVi21yA2G4e/AvLUq7al+WnF1KEjSjw5TM0TH82YpEcq7F5HuY rdWHEZMkRgfteQwUq6J0KdayLz16SxUFAhkROFNaNvSkite/hYG7fBB8Kq5C9LNLokJqz9 eJtd3Gbi3QcPVUSj+bfH6zYOJNdVXOQ4vapOUvQzRdf7b1+jxZ+b9K62o9Hdo4Kv6yKAE9 1xsw7OxcIR+8lFA2XHTnYsrRDzmTK9q4LjlkLJInt/DFogfQ79Xme30H9R2B6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6C5Q4WPHzxL0 for ; Fri, 24 Jul 2026 15:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ae99 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Jul 2026 15:46:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: cff985d49b4b - stable/15 - vtfontcvt: Avoid dead store in add_char List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cff985d49b4bc3b9bb33653557ca5956fa070ce4 Auto-Submitted: auto-generated Date: Fri, 24 Jul 2026 15:46:18 +0000 Message-Id: <6a6388ca.3ae99.423a26e@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cff985d49b4bc3b9bb33653557ca5956fa070ce4 commit cff985d49b4bc3b9bb33653557ca5956fa070ce4 Author: Ed Maste AuthorDate: 2026-05-22 18:08:58 +0000 Commit: Ed Maste CommitDate: 2026-07-24 15:45:58 +0000 vtfontcvt: Avoid dead store in add_char The fallback glyph is stored at index 0, and does not need to be inserted into a mapping. Previously there was a dead store of add_glyph's return value for the fallback case, which upset Clang's static analyzer. Now, cast the return value to (void) to make it clear this is intentional. Also change add_glyph's fallback parameter to a c99 bool to make its use more clear. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57174 (cherry picked from commit b273481f2a840a05e4039655be99528e1fa9388c) --- usr.bin/vtfontcvt/vtfontcvt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/vtfontcvt/vtfontcvt.c b/usr.bin/vtfontcvt/vtfontcvt.c index f39076b09be6..29294f589fb5 100644 --- a/usr.bin/vtfontcvt/vtfontcvt.c +++ b/usr.bin/vtfontcvt/vtfontcvt.c @@ -254,7 +254,7 @@ dedup_mapping(unsigned int map_idx) } static struct glyph * -add_glyph(const uint8_t *bytes, unsigned int map_idx, int fallback) +add_glyph(const uint8_t *bytes, unsigned int map_idx, bool fallback) { struct glyph *gl; int hash; @@ -321,13 +321,13 @@ add_char(unsigned curchar, unsigned map_idx, uint8_t *bytes, uint8_t *bytes_r) /* Prevent adding two glyphs for 0xFFFD */ if (curchar == 0xFFFD) { if (map_idx < VFNT_MAP_BOLD) - gl = add_glyph(bytes, 0, 1); + (void)add_glyph(bytes, 0, true); } else if (filter == false || curchar >= 0x20) { - gl = add_glyph(bytes, map_idx, 0); + gl = add_glyph(bytes, map_idx, false); if (add_mapping(gl, curchar, map_idx) != 0) return (1); if (bytes_r != NULL) { - gl = add_glyph(bytes_r, map_idx + 1, 0); + gl = add_glyph(bytes_r, map_idx + 1, false); if (add_mapping(gl, curchar, map_idx + 1) != 0) return (1); }