it* My version of sent Err codevoid.de 70 i Err codevoid.de 70 hgit clone git://git.codevoid.de/sent-sdk.git URL:git://git.codevoid.de/sent-sdk.git codevoid.de 70 1Log /git/sent-sdk/log.gph codevoid.de 70 1Files /git/sent-sdk/files.gph codevoid.de 70 1Refs /git/sent-sdk/refs.gph codevoid.de 70 1README /git/sent-sdk/file/README.md.gph codevoid.de 70 1LICENSE /git/sent-sdk/file/LICENSE.gph codevoid.de 70 i--- Err codevoid.de 70 1commit efea6575ca7f27b2c415fe0866349a842699fb72 /git/sent-sdk/commit/efea6575ca7f27b2c415fe0866349a842699fb72.gph codevoid.de 70 1parent b737e3e6af9e6999baace5d453e405f32c60b2d2 /git/sent-sdk/commit/b737e3e6af9e6999baace5d453e405f32c60b2d2.gph codevoid.de 70 hAuthor: Hiltjo Posthuma URL:mailto:hiltjo@codemadness.org codevoid.de 70 iDate: Fri, 12 Aug 2016 10:57:44 +0200 Err codevoid.de 70 i Err codevoid.de 70 iimprove some more error messages Err codevoid.de 70 i Err codevoid.de 70 i- remove \n in die() messages in drw.c Err codevoid.de 70 i- add a few more ':' suffix for functions that set errno. Err codevoid.de 70 i- minor typo. Err codevoid.de 70 i Err codevoid.de 70 iDiffstat: Err codevoid.de 70 i M drw.c | 6 +++--- Err codevoid.de 70 i M sent.c | 14 ++++++++------ Err codevoid.de 70 i Err codevoid.de 70 i2 files changed, 11 insertions(+), 9 deletions(-) Err codevoid.de 70 i--- Err codevoid.de 70 1diff --git a/drw.c b/drw.c /git/sent-sdk/file/drw.c.gph codevoid.de 70 it@@ -129,7 +129,7 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) Err codevoid.de 70 i return NULL; Err codevoid.de 70 i } Err codevoid.de 70 i } else { Err codevoid.de 70 i- die("no font specified.\n"); Err codevoid.de 70 i+ die("no font specified."); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i font = ecalloc(1, sizeof(Fnt)); Err codevoid.de 70 it@@ -188,7 +188,7 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname) Err codevoid.de 70 i if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), Err codevoid.de 70 i DefaultColormap(drw->dpy, drw->screen), Err codevoid.de 70 i clrname, dest)) Err codevoid.de 70 i- die("error, cannot allocate color '%s'\n", clrname); Err codevoid.de 70 i+ die("error, cannot allocate color '%s'", clrname); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i /* Wrapper to create color schemes. The caller has to call free(3) on the Err codevoid.de 70 it@@ -331,7 +331,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp Err codevoid.de 70 i Err codevoid.de 70 i if (!drw->fonts->pattern) { Err codevoid.de 70 i /* Refer to the comment in xfont_create for more information. */ Err codevoid.de 70 i- die("the first font in the cache must be loaded from a font string.\n"); Err codevoid.de 70 i+ die("the first font in the cache must be loaded from a font string."); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i fcpattern = FcPatternDuplicate(drw->fonts->pattern); Err codevoid.de 70 1diff --git a/sent.c b/sent.c /git/sent-sdk/file/sent.c.gph codevoid.de 70 it@@ -206,8 +206,10 @@ ffload(Slide *s) Err codevoid.de 70 i die("sent: Unable to filter '%s':", filename); Err codevoid.de 70 i close(fdin); Err codevoid.de 70 i Err codevoid.de 70 i- if (read(fdout, hdr, 16) != 16 || memcmp("farbfeld", hdr, 8)) Err codevoid.de 70 i- die("sent: Unable to filter '%s' into a valid farbfeld file", filename); Err codevoid.de 70 i+ if (read(fdout, hdr, 16) != 16) Err codevoid.de 70 i+ die("sent: Unable to read filtered file '%s':", filename); Err codevoid.de 70 i+ if (memcmp("farbfeld", hdr, 8)) Err codevoid.de 70 i+ die("sent: Filtered file '%s' has no valid farbfeld header", filename); Err codevoid.de 70 i Err codevoid.de 70 i s->img = calloc(1, sizeof(Image)); Err codevoid.de 70 i s->img->bufwidth = ntohl(*(uint32_t *)&hdr[8]); Err codevoid.de 70 it@@ -217,13 +219,13 @@ ffload(Slide *s) Err codevoid.de 70 i free(s->img->buf); Err codevoid.de 70 i /* internally the image is stored in 888 format */ Err codevoid.de 70 i if (!(s->img->buf = malloc(3 * s->img->bufwidth * s->img->bufheight))) Err codevoid.de 70 i- die("sent: Unable to allocate buffer for image"); Err codevoid.de 70 i+ die("sent: Unable to allocate buffer for image:"); Err codevoid.de 70 i Err codevoid.de 70 i /* scratch buffer to read row by row */ Err codevoid.de 70 i rowlen = s->img->bufwidth * 2 * strlen("RGBA"); Err codevoid.de 70 i row = malloc(rowlen); Err codevoid.de 70 i if (!row) Err codevoid.de 70 i- die("sent: Unable to allocate buffer for image row"); Err codevoid.de 70 i+ die("sent: Unable to allocate buffer for image row:"); Err codevoid.de 70 i Err codevoid.de 70 i /* extract window background color channels for transparency */ Err codevoid.de 70 i bg_r = (sc[ColBg].pixel >> 16) % 256; Err codevoid.de 70 it@@ -268,7 +270,7 @@ ffprepare(Image *img) Err codevoid.de 70 i height = img->bufheight * xw.uw / img->bufwidth; Err codevoid.de 70 i Err codevoid.de 70 i if (depth < 24) Err codevoid.de 70 i- die("sent: Display color depths <24 not supported"); Err codevoid.de 70 i+ die("sent: Display color depths < 24 not supported"); Err codevoid.de 70 i Err codevoid.de 70 i if (!(img->ximg = XCreateImage(xw.dpy, CopyFromParent, depth, ZPixmap, 0, Err codevoid.de 70 i NULL, width, height, 32, 0))) Err codevoid.de 70 it@@ -585,7 +587,7 @@ xloadfonts() Err codevoid.de 70 i Err codevoid.de 70 i for (j = 0; j < LEN(fontfallbacks); j++) { Err codevoid.de 70 i if (!(fstrs[j] = malloc(MAXFONTSTRLEN))) Err codevoid.de 70 i- die("sent: Unable to allocate fontstring"); Err codevoid.de 70 i+ die("sent: Unable to allocate fontstring:"); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i for (i = 0; i < NUMFONTSCALES; i++) { Err codevoid.de 70 .