sent-font

sent: font engine test
git clone git://git.codemadness.org/sent-font
Log | Files | Refs | LICENSE

commit efea6575ca7f27b2c415fe0866349a842699fb72
parent b737e3e6af9e6999baace5d453e405f32c60b2d2
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Fri, 12 Aug 2016 10:57:44 +0200

improve some more error messages

- remove \n in die() messages in drw.c
- add a few more ':' suffix for functions that set errno.
- minor typo.

Diffstat:
drw.c | 6+++---
sent.c | 14++++++++------
2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/drw.c b/drw.c @@ -129,7 +129,7 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) return NULL; } } else { - die("no font specified.\n"); + die("no font specified."); } font = ecalloc(1, sizeof(Fnt)); @@ -188,7 +188,7 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname) if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), DefaultColormap(drw->dpy, drw->screen), clrname, dest)) - die("error, cannot allocate color '%s'\n", clrname); + die("error, cannot allocate color '%s'", clrname); } /* Wrapper to create color schemes. The caller has to call free(3) on the @@ -331,7 +331,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp if (!drw->fonts->pattern) { /* Refer to the comment in xfont_create for more information. */ - die("the first font in the cache must be loaded from a font string.\n"); + die("the first font in the cache must be loaded from a font string."); } fcpattern = FcPatternDuplicate(drw->fonts->pattern); diff --git a/sent.c b/sent.c @@ -206,8 +206,10 @@ ffload(Slide *s) die("sent: Unable to filter '%s':", filename); close(fdin); - if (read(fdout, hdr, 16) != 16 || memcmp("farbfeld", hdr, 8)) - die("sent: Unable to filter '%s' into a valid farbfeld file", filename); + if (read(fdout, hdr, 16) != 16) + die("sent: Unable to read filtered file '%s':", filename); + if (memcmp("farbfeld", hdr, 8)) + die("sent: Filtered file '%s' has no valid farbfeld header", filename); s->img = calloc(1, sizeof(Image)); s->img->bufwidth = ntohl(*(uint32_t *)&hdr[8]); @@ -217,13 +219,13 @@ ffload(Slide *s) free(s->img->buf); /* internally the image is stored in 888 format */ if (!(s->img->buf = malloc(3 * s->img->bufwidth * s->img->bufheight))) - die("sent: Unable to allocate buffer for image"); + die("sent: Unable to allocate buffer for image:"); /* scratch buffer to read row by row */ rowlen = s->img->bufwidth * 2 * strlen("RGBA"); row = malloc(rowlen); if (!row) - die("sent: Unable to allocate buffer for image row"); + die("sent: Unable to allocate buffer for image row:"); /* extract window background color channels for transparency */ bg_r = (sc[ColBg].pixel >> 16) % 256; @@ -268,7 +270,7 @@ ffprepare(Image *img) height = img->bufheight * xw.uw / img->bufwidth; if (depth < 24) - die("sent: Display color depths <24 not supported"); + die("sent: Display color depths < 24 not supported"); if (!(img->ximg = XCreateImage(xw.dpy, CopyFromParent, depth, ZPixmap, 0, NULL, width, height, 32, 0))) @@ -585,7 +587,7 @@ xloadfonts() for (j = 0; j < LEN(fontfallbacks); j++) { if (!(fstrs[j] = malloc(MAXFONTSTRLEN))) - die("sent: Unable to allocate fontstring"); + die("sent: Unable to allocate fontstring:"); } for (i = 0; i < NUMFONTSCALES; i++) {