From nobody Mon Jan 20 20:24:22 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 4YcMJ665Rwz5ktjY; Mon, 20 Jan 2025 20:24:22 +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 4YcMJ65VHdz41ZK; Mon, 20 Jan 2025 20:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737404662; 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=nRM3+dBz/tVOPGKu2k7uQdceqlyFyp4m/MQlwyzUWrI=; b=nQz35Ke1bScqCVbIdQDV6/aQGXoBP9ysaKN/0Ug3+UBu3DWi2vhgU+UWBVeSb2vOprJjo2 t1X4VgKWFwoWfDUsCGgwN3rDmsMnNHBW5gWw21CEuLWYCY04CpbC+LTdkX+kqIfVk7X1c3 BPNXE2JuFF72C07r7jRyIJlh0LsNRfSOIIeiAptdbEJmoJM6coPOz6BJDCooQ7sRKhhdEH KKVWSAB3OdsgG2QuePavcNtBwswIoiXHz8VoZ4sXccc9gqfC+wwL4Y8CbmsR+pzjuHSMdc if/zoMlZ42tYTjRTcqVnltt/R0Z1HjwkXueLWiX/QY0YTVLEmSK71KnpWa1q3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737404662; 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=nRM3+dBz/tVOPGKu2k7uQdceqlyFyp4m/MQlwyzUWrI=; b=eUMGgNbyIgswCekZ4RtSnW65AdTQqyVAM9Rn57kb0vrDXWaInaHmBVcvutLXBQFpKJZnMn UJ4/I8AeN4Bdo9xEcMy8hmsjActoyB8bgrkdTI3Nb1I6zU9K8NhdWsARSbPSxGmU62+OQX CrJ35rghJ957UIWq8AHsu1ef5/oJGmr+DM61mqUJ7vXH8aXaRUG0Fk411Y+s02WcGZjMC0 ddFiHoI9CmXIv7D9mmWlNqOXdQh21JpdpHkMIQi1t9G9W+u+txvVJEd7D/6CnLGFVZAf8J 1cEa+sJ0dsQK2u9AfJjjx+6Tn3XpJKSdFAUFHDF6LVrLwmGZQGrWYDmvrmYUGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737404662; a=rsa-sha256; cv=none; b=Qp9kJeEr9d0RLAy7KAlOW+UOc8jXgcjrkStziO/zcXzGkkQ9LdwsYInC+9C/Qv9fmJbz6M UuDDbTNNjPS0sk7omBjzluc/dMP1f/E9oRq64oHiu1sqgATjGYghxPZUb1yXzeiSK8sQtY xoZg+cKasJCoCSKu/IjcqjRtMGSTpLcw+Q3+6B9frSUaAi5xes5TH+sDLj31R5MB+AyCpg N5zgZkqjTOCmNcvlPVq7Sty0U595ZEm+Or9tYaSt/qBLHKrW+5sOsrsNlL8RzoB0vQzL0f cr0Tzt8RILpXFETqnwuwr3fWBiSiFludCN97wlk8b3+u3Qck+77uIZs6/1egpA== 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 4YcMJ651L8zc5d; Mon, 20 Jan 2025 20:24:22 +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 50KKOMHq060578; Mon, 20 Jan 2025 20:24:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50KKOM2k060575; Mon, 20 Jan 2025 20:24:22 GMT (envelope-from git) Date: Mon, 20 Jan 2025 20:24:22 GMT Message-Id: <202501202024.50KKOM2k060575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3433daae0d20 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 3433daae0d20d55503084c4d17b8a3e685657ad2 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3433daae0d20d55503084c4d17b8a3e685657ad2 commit 3433daae0d20d55503084c4d17b8a3e685657ad2 Author: Ed Maste AuthorDate: 2025-01-20 20:04:20 +0000 Commit: Ed Maste CommitDate: 2025-01-20 20:23:49 +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 --- 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 ddff1580a993..773072813d8a 100644 --- a/usr.bin/vtfontcvt/vtfontcvt.c +++ b/usr.bin/vtfontcvt/vtfontcvt.c @@ -450,8 +450,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); }