git: 3433daae0d20 - main - vtfontcvt: Improve error message for unsupported DWIDTH

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=3433daae0d20d55503084c4d17b8a3e685657ad2

commit 3433daae0d20d55503084c4d17b8a3e685657ad2
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-01-20 20:04:20 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
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);
 		}