From nobody Tue Feb 4 13:38:20 2025 X-Original-To: dev-commits-src-all@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 4YnPZh34Rkz5mqZd; Tue, 04 Feb 2025 13:38:20 +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 4YnPZh2YjGz3t7L; Tue, 04 Feb 2025 13:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738676300; 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=v8g0MVWJbMpzryCcyM2D3SCuwgPt390Wqsoi5VZ/CGs=; b=a+AA+DCvDfa0HgTC2rKtaY144Kxf5qTrfeIJ1g9Y1Wd5oMB5kogFfZ+Kx4FFzFjnUpPzDw TpfO1oRuBkhDb4S+LNNzzHjEaTPgD34UMwPqYr7a09lUeSZ78DwaiCmGKcmhMQb6am8Sfu EI6PSuYaCVJQHtgRnAAny+qnocT4SPUFU7Tlt0EBiUg5ZywrwjUMXjgoXUhxi9mk3GUY5A QbVUcZeE5u7O7XXaxnPs0RZGIBXId5/tyUaLJaF5ZDNj8KQ8ivtM0EVROxdmSNJidu8iIi WuxBQApMA9G0HBjfuzv8z+h2OxVZa5tdFLZdwyvHpvgfs5ds6lM+S6lGXzMl1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738676300; 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=v8g0MVWJbMpzryCcyM2D3SCuwgPt390Wqsoi5VZ/CGs=; b=egfa5uN6ID1H+XryTySHQYWhrXgqn8F4rK0/4ZAG+cujFd9v1PwbuwX5vPEwQYhSMvyZ6N 8xXiCKuO7Vq6W0KzxzGDCImYv0YmW5Nxe4LY9fbMgrNwOM8W3UhnC6moppsOlVsphNJXmo HgTtpkfSnJ+gp+uNngE06Emh6HHeWZvvbBVg9NQRG+xSO3xm8KMysq4t1ftUKM7Nfze3tB 940hHPx6wZHI5wF7QJ5E7MQ2+NU0SwUAf35O3EWC0Yr34FDlz1R5h3MXau2icY+Mprv7aZ TTYUK2DkQABvuidWdM4uNT6Uy1jXB3YGDcU2JN88Q05heDdfdAXtnbUcVim8ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738676300; a=rsa-sha256; cv=none; b=fJ2g//+rUge/H0tfh50UUSy+NMZpKjFoM/wH+8QBcyQRSukNzOrF8rX6B7wBZKPltAOeJl C5unu5ooccpirsJwj7I5qIaPv77BBSXdUuyqmYDJ3tQaN5xAvonRo7nF8rmv+50AOqOkJy tao9rgy/n92O1910+rPN7F+L98PXb2Iq6b1CkpOyOqAKL2BHQcdn3/EuQfp9BcVxq1mcuM Gb2F9Zwo7n4aNu9M/m17nZhO6eq5MyV2l+tARVsv9WPqa3YfDSee1vNNU3Hy6O+PCUYeq3 SrI2mGe8j3xXm3hmof8wfu4MVnWgL40IF9s3Y79ACwHzjlY1OuNQJytIPKN/pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YnPZh28Dxz1N8S; Tue, 04 Feb 2025 13:38:20 +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 514DcK56072498; Tue, 4 Feb 2025 13:38:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 514DcKN1072495; Tue, 4 Feb 2025 13:38:20 GMT (envelope-from git) Date: Tue, 4 Feb 2025 13:38:20 GMT Message-Id: <202502041338.514DcKN1072495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 036ce9b76e0a - stable/14 - vtfontcvt: Improve error message for unsupported DWIDTH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: 036ce9b76e0ac5bb3a611a4b259a39e3158c25d4 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=036ce9b76e0ac5bb3a611a4b259a39e3158c25d4 commit 036ce9b76e0ac5bb3a611a4b259a39e3158c25d4 Author: Ed Maste AuthorDate: 2025-01-20 20:04:20 +0000 Commit: Ed Maste CommitDate: 2025-02-04 13:38:09 +0000 vtfontcvt: Improve error message for unsupported DWIDTH vtfontcvt requires that all glyphs are 1x or 2x a common width, reporting for example "bitmap with unsupported DWIDTH 27 0 on line xxx" if the font is expected to be 32 pixels wide. Add the expected / permitted values to the error message to make the issue more clear - for the same example, "bitmap with unsupported DWIDTH 27 0 (not 32 or 64)". Reviewed by: ziaee Sponsored by: The FreeBSD Foundation (cherry picked from commit 3433daae0d20d55503084c4d17b8a3e685657ad2) --- usr.bin/vtfontcvt/vtfontcvt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/vtfontcvt/vtfontcvt.c b/usr.bin/vtfontcvt/vtfontcvt.c index d68516dda360..508e298257a4 100644 --- a/usr.bin/vtfontcvt/vtfontcvt.c +++ b/usr.bin/vtfontcvt/vtfontcvt.c @@ -451,8 +451,8 @@ parse_bdf(FILE *fp, unsigned int map_idx) if (sscanf(ln + 7, "%d %d", &dwidth, &dwy) != 2) errx(1, "invalid DWIDTH at line %u", linenum); if (dwy != 0 || (dwidth != fbbw && dwidth * 2 != fbbw)) - errx(1, "bitmap with unsupported DWIDTH %d %d at line %u", - dwidth, dwy, linenum); + errx(1, "bitmap with unsupported DWIDTH %d %d (not %d or %d) at line %u", + dwidth, dwy, fbbw, 2 * fbbw, linenum); if (dwidth < fbbw) set_width(dwidth); }