mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-29 08:08:37 +00:00
Code Issues Releases Activity

vtfontcvt: remove superfluous newlines in errx messages

Browse Source
This commit is contained in:
Ed Maste 2016-09-14 18:22:12 +00:00
parent 62ee0c0a9a
commit 9b61efccf7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=305815
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/vtfontcvt/vtfontcvt.c
View File

@ -122,7 +122,7 @@ add_mapping(struct glyph *gl, unsigned int c, unsigned int map_idx)
ml = &maps[map_idx];
if (TAILQ_LAST(ml, mapping_list) != NULL &&
TAILQ_LAST(ml, mapping_list)->m_char >= c)
errx(1, "Bad ordering at character %u\n", c);
errx(1, "Bad ordering at character %u", c);
TAILQ_INSERT_TAIL(ml, mp, m_list);
map_count[map_idx]++;
@ -143,7 +143,7 @@ dedup_mapping(unsigned int map_idx)
while (mp_normal->m_char < mp_bold->m_char)
mp_normal = TAILQ_NEXT(mp_normal, m_list);
if (mp_bold->m_char != mp_normal->m_char)
errx(1, "Character %u not in normal font!\n",
errx(1, "Character %u not in normal font!",
mp_bold->m_char);
if (mp_bold->m_glyph != mp_normal->m_glyph)
continue;
@ -218,7 +218,7 @@ parse_bitmap_line(uint8_t *left, uint8_t *right, unsigned int line,
unsigned int i, subline;
if (dwidth != width && dwidth != width * 2)
errx(1, "Bitmap with unsupported width %u!\n", dwidth);
errx(1, "Bitmap with unsupported width %u!", dwidth);
/* Move pixel data right to simplify splitting double characters. */
line >>= (howmany(dwidth, 8) * 8) - dwidth;
@ -235,7 +235,7 @@ parse_bitmap_line(uint8_t *left, uint8_t *right, unsigned int line,
*p++ = subline >> 8;
*p = subline;
} else {
errx(1, "Unsupported wbytes %u!\n", wbytes);
errx(1, "Unsupported wbytes %u!", wbytes);
}
line >>= width;
@ -267,7 +267,7 @@ parse_bdf(FILE *fp, unsigned int map_idx)
(ln[6] == ' ' || ln[6] == '\0')) {
for (i = 0; i < height; i++) {
if ((ln = fgetln(fp, &length)) == NULL)
errx(1, "Unexpected EOF!\n");
errx(1, "Unexpected EOF!");
ln[length - 1] = '\0';
sscanf(ln, "%x", &line);
if (parse_bitmap_line(bytes + i * wbytes,