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 b2daba339097e8113b5b98405014cdb18a6657bd /git/sent-sdk/commit/b2daba339097e8113b5b98405014cdb18a6657bd.gph codevoid.de 70 1parent 072a318adbdf091a58587c740d081d0ccfff271c /git/sent-sdk/commit/072a318adbdf091a58587c740d081d0ccfff271c.gph codevoid.de 70 hAuthor: FRIGN URL:mailto:dev@frign.de codevoid.de 70 iDate: Thu, 11 Aug 2016 21:47:57 +0200 Err codevoid.de 70 i Err codevoid.de 70 iFix error-messages Err codevoid.de 70 i Err codevoid.de 70 iDiffstat: Err codevoid.de 70 i M sent.c | 38 ++++++++++++++++---------------- Err codevoid.de 70 i M util.c | 2 ++ Err codevoid.de 70 i Err codevoid.de 70 i2 files changed, 21 insertions(+), 19 deletions(-) Err codevoid.de 70 i--- Err codevoid.de 70 1diff --git a/sent.c b/sent.c /git/sent-sdk/file/sent.c.gph codevoid.de 70 it@@ -197,17 +197,17 @@ ffload(Slide *s) Err codevoid.de 70 i regfree(®ex); Err codevoid.de 70 i } Err codevoid.de 70 i if (!bin) Err codevoid.de 70 i- die("sent: Unable to find matching filter for file %s", filename); Err codevoid.de 70 i+ die("sent: Unable to find matching filter for '%s'", filename); Err codevoid.de 70 i Err codevoid.de 70 i if ((fdin = open(filename, O_RDONLY)) < 0) Err codevoid.de 70 i- die("sent: Unable to open file %s:", filename); Err codevoid.de 70 i+ die("sent: Unable to open '%s':", filename); Err codevoid.de 70 i Err codevoid.de 70 i if ((fdout = filter(fdin, bin)) < 0) Err codevoid.de 70 i- die("sent: Unable to filter %s:", filename); 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+ die("sent: Unable to filter '%s' into a valid farbfeld file", 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 +217,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 malloc buffer for image.\n"); 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 malloc buffer for image row.\n"); 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,17 +268,17 @@ 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 depths <24 not supported.\n"); 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 i- die("sent: Unable to create XImage.\n"); Err codevoid.de 70 i+ die("sent: Unable to create XImage"); Err codevoid.de 70 i Err codevoid.de 70 i if (!(img->ximg->data = malloc(img->ximg->bytes_per_line * height))) Err codevoid.de 70 i- die("sent: Unable to alloc data section for XImage.\n"); Err codevoid.de 70 i+ die("sent: Unable to allocate data section for XImage"); Err codevoid.de 70 i Err codevoid.de 70 i if (!XInitImage(img->ximg)) Err codevoid.de 70 i- die("sent: Unable to init XImage.\n"); Err codevoid.de 70 i+ die("sent: Unable to initiate XImage"); Err codevoid.de 70 i Err codevoid.de 70 i ffscale(img); Err codevoid.de 70 i img->state |= SCALED; Err codevoid.de 70 it@@ -395,7 +395,7 @@ load(FILE *fp) Err codevoid.de 70 i Err codevoid.de 70 i if ((slidecount+1) * sizeof(*slides) >= size) Err codevoid.de 70 i if (!(slides = realloc(slides, (size += BUFSIZ)))) Err codevoid.de 70 i- die("sent: Unable to realloc %u bytes:", size); Err codevoid.de 70 i+ die("sent: Unable to reallocate %u bytes:", size); Err codevoid.de 70 i Err codevoid.de 70 i /* read one slide */ Err codevoid.de 70 i maxlines = 0; Err codevoid.de 70 it@@ -408,7 +408,7 @@ load(FILE *fp) Err codevoid.de 70 i if (s->linecount >= maxlines) { Err codevoid.de 70 i maxlines = 2 * s->linecount + 1; Err codevoid.de 70 i if (!(s->lines = realloc(s->lines, maxlines * sizeof(s->lines[0])))) Err codevoid.de 70 i- die("sent: Unable to realloc %u bytes:", maxlines * sizeof(s->lines[0])); Err codevoid.de 70 i+ die("sent: Unable to reallocate %u bytes:", maxlines * sizeof(s->lines[0])); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i blen = strlen(buf); Err codevoid.de 70 it@@ -525,7 +525,7 @@ xhints() Err codevoid.de 70 i XSizeHints *sizeh = NULL; Err codevoid.de 70 i Err codevoid.de 70 i if (!(sizeh = XAllocSizeHints())) Err codevoid.de 70 i- die("sent: Unable to alloc size hints.\n"); Err codevoid.de 70 i+ die("sent: Unable to allocate size hints"); Err codevoid.de 70 i Err codevoid.de 70 i sizeh->flags = PSize; Err codevoid.de 70 i sizeh->height = xw.h; Err codevoid.de 70 it@@ -541,7 +541,7 @@ xinit() Err codevoid.de 70 i XTextProperty prop; Err codevoid.de 70 i Err codevoid.de 70 i if (!(xw.dpy = XOpenDisplay(NULL))) Err codevoid.de 70 i- die("sent: Unable to open display.\n"); Err codevoid.de 70 i+ die("sent: Unable to open display"); Err codevoid.de 70 i xw.scr = XDefaultScreen(xw.dpy); Err codevoid.de 70 i xw.vis = XDefaultVisual(xw.dpy, xw.scr); Err codevoid.de 70 i resize(DisplayWidth(xw.dpy, xw.scr), DisplayHeight(xw.dpy, xw.scr)); Err codevoid.de 70 it@@ -560,7 +560,7 @@ xinit() Err codevoid.de 70 i XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1); Err codevoid.de 70 i Err codevoid.de 70 i if (!(d = drw_create(xw.dpy, xw.scr, xw.win, xw.w, xw.h))) Err codevoid.de 70 i- die("sent: Unable to create drawing context.\n"); Err codevoid.de 70 i+ die("sent: Unable to create drawing context"); Err codevoid.de 70 i sc = drw_scm_create(d, colors, 2); Err codevoid.de 70 i drw_setscheme(d, sc); Err codevoid.de 70 i XSetWindowBackground(xw.dpy, xw.win, sc[ColBg].pixel); Err codevoid.de 70 it@@ -585,16 +585,16 @@ 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 malloc fstrs.\n"); 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 i for (j = 0; j < LEN(fontfallbacks); j++) { Err codevoid.de 70 i if (MAXFONTSTRLEN < snprintf(fstrs[j], MAXFONTSTRLEN, "%s:size=%d", fontfallbacks[j], FONTSZ(i))) Err codevoid.de 70 i- die("sent: Font string too long.\n"); Err codevoid.de 70 i+ die("sent: Font string too long"); Err codevoid.de 70 i } Err codevoid.de 70 i if (!(fonts[i] = drw_fontset_create(d, (const char**)fstrs, LEN(fstrs)))) Err codevoid.de 70 i- die("sent: Unable to load any font for size %d.\n", FONTSZ(i)); Err codevoid.de 70 i+ die("sent: Unable to load any font for size %d", FONTSZ(i)); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i for (j = 0; j < LEN(fontfallbacks); j++) Err codevoid.de 70 it@@ -650,7 +650,7 @@ configure(XEvent *e) Err codevoid.de 70 i void Err codevoid.de 70 i usage() Err codevoid.de 70 i { Err codevoid.de 70 i- die("usage: %s [file]\n", argv0); Err codevoid.de 70 i+ die("usage: %s [file]", argv0); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i int Err codevoid.de 70 1diff --git a/util.c b/util.c /git/sent-sdk/file/util.c.gph codevoid.de 70 it@@ -27,6 +27,8 @@ die(const char *fmt, ...) { Err codevoid.de 70 i if (fmt[0] && fmt[strlen(fmt)-1] == ':') { Err codevoid.de 70 i fputc(' ', stderr); Err codevoid.de 70 i perror(NULL); Err codevoid.de 70 i+ } else { Err codevoid.de 70 i+ fputc('\n', stderr); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i exit(1); Err codevoid.de 70 .