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 824dae147e8c89465e09709764601d7d80dff819 /git/sent-sdk/commit/824dae147e8c89465e09709764601d7d80dff819.gph codevoid.de 70 1parent 95af430d978d9ad9a6235ac1899a1ecd46bff6f3 /git/sent-sdk/commit/95af430d978d9ad9a6235ac1899a1ecd46bff6f3.gph codevoid.de 70 hAuthor: Alexis URL:mailto:surryhill@gmail.com codevoid.de 70 iDate: Thu, 26 Nov 2015 15:18:44 +0100 Err codevoid.de 70 i Err codevoid.de 70 iUse consistent wording for 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 Err codevoid.de 70 i1 file changed, 19 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@@ -135,7 +135,7 @@ Image *pngopen(char *filename) Err codevoid.de 70 i Image *img; Err codevoid.de 70 i Err codevoid.de 70 i if (!(f = fopen(filename, "rb"))) { Err codevoid.de 70 i- eprintf("could not open file %s:", filename); Err codevoid.de 70 i+ eprintf("Unable to open file %s:", filename); Err codevoid.de 70 i return NULL; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 it@@ -251,25 +251,25 @@ int pngprepare(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- eprintf("display depths <24 not supported."); Err codevoid.de 70 i+ eprintf("Display depths <24 not supported."); Err codevoid.de 70 i return 0; Err codevoid.de 70 i } 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- eprintf("could not create XImage"); Err codevoid.de 70 i+ eprintf("Unable to create XImage."); Err codevoid.de 70 i return 0; Err codevoid.de 70 i } 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- eprintf("could not alloc data section for XImage"); Err codevoid.de 70 i+ eprintf("Unable to alloc data section for XImage."); Err codevoid.de 70 i XDestroyImage(img->ximg); Err codevoid.de 70 i img->ximg = NULL; Err codevoid.de 70 i return 0; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i if (!XInitImage(img->ximg)) { Err codevoid.de 70 i- eprintf("could not init XImage"); Err codevoid.de 70 i+ eprintf("Unable to init XImage."); Err codevoid.de 70 i free(img->ximg->data); Err codevoid.de 70 i XDestroyImage(img->ximg); Err codevoid.de 70 i img->ximg = NULL; Err codevoid.de 70 it@@ -422,7 +422,7 @@ void 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("cannot realloc %u bytes:", size); Err codevoid.de 70 i+ die("Unable to realloc %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@@ -435,12 +435,12 @@ void 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("cannot realloc %u bytes:", maxlines * sizeof(s->lines[0])); Err codevoid.de 70 i+ die("Unable to realloc %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 i if (!(s->lines[s->linecount] = strdup(buf))) Err codevoid.de 70 i- die("cannot strdup:"); Err codevoid.de 70 i+ die("Unable to strdup:"); Err codevoid.de 70 i if (s->lines[s->linecount][blen-1] == '\n') Err codevoid.de 70 i s->lines[s->linecount][blen-1] = '\0'; Err codevoid.de 70 i Err codevoid.de 70 it@@ -470,9 +470,9 @@ void advance(const Arg *arg) Err codevoid.de 70 i idx = new_idx; Err codevoid.de 70 i xdraw(); Err codevoid.de 70 i if (slidecount > idx + 1 && slides[idx + 1].img && !pngread(slides[idx + 1].img)) Err codevoid.de 70 i- die("could not read image %s", slides[idx + 1].lines[0]); Err codevoid.de 70 i+ die("Unable to read image %s.", slides[idx + 1].lines[0]); Err codevoid.de 70 i if (0 < idx && slides[idx - 1].img && !pngread(slides[idx - 1].img)) Err codevoid.de 70 i- die("could not read image %s", slides[idx - 1].lines[0]); Err codevoid.de 70 i+ die("Unable to read image %s.", slides[idx - 1].lines[0]); Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 it@@ -537,9 +537,9 @@ void xdraw() Err codevoid.de 70 i 0); Err codevoid.de 70 i drw_map(d, xw.win, 0, 0, xw.w, xw.h); Err codevoid.de 70 i } else if (!(im->state & LOADED) && !pngread(im)) { Err codevoid.de 70 i- eprintf("could not read image %s", slides[idx].lines[0]); Err codevoid.de 70 i+ eprintf("Unable to read image %s.", slides[idx].lines[0]); Err codevoid.de 70 i } else if (!(im->state & SCALED) && !pngprepare(im)) { Err codevoid.de 70 i- eprintf("could not prepare image %s for drawing", slides[idx].lines[0]); Err codevoid.de 70 i+ eprintf("Unable to prepare image %s for drawing.", slides[idx].lines[0]); Err codevoid.de 70 i } else if (!(im->state & DRAWN)) { Err codevoid.de 70 i pngdraw(im); Err codevoid.de 70 i } Err codevoid.de 70 it@@ -552,7 +552,7 @@ void 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: Could not alloc size hints"); Err codevoid.de 70 i+ die("Unable to alloc 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@@ -567,7 +567,7 @@ void 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("Can't open display."); Err codevoid.de 70 i+ die("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@@ -585,7 +585,7 @@ void 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("Can't create drawing context."); Err codevoid.de 70 i+ die("Unable to create drawing context."); Err codevoid.de 70 i sc = drw_scm_create(d, fgcol, bgcol); Err codevoid.de 70 i drw_setscheme(d, sc); Err codevoid.de 70 i XSetWindowBackground(xw.dpy, xw.win, sc->bg.pix); Err codevoid.de 70 it@@ -608,16 +608,16 @@ void 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("could not malloc fstrs"); Err codevoid.de 70 i+ die("Unable to malloc fstrs."); 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("font string too long"); Err codevoid.de 70 i+ die("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("unable to load any font for size %d", FONTSZ(i)); Err codevoid.de 70 i+ die("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@@ -681,7 +681,7 @@ int main(int argc, char *argv[]) Err codevoid.de 70 i load(fp); Err codevoid.de 70 i fclose(fp); Err codevoid.de 70 i } else { Err codevoid.de 70 i- eprintf("could not open %s for reading:", argv[i]); Err codevoid.de 70 i+ eprintf("Unable to open '%s' for reading:", argv[i]); Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 .