tonitch/sent
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Use consistent wording for error messages

Browse Source
This commit is contained in:
Alexis
2015-11-26 15:18:44 +01:00
committed by Markus Teich
parent 95af430d97
commit 824dae147e
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
sent.c
View File

@ -135,7 +135,7 @@ Image *pngopen(char *filename)
Image *img; Image *img;
if (!(f = fopen(filename, "rb"))) { if (!(f = fopen(filename, "rb"))) {
eprintf("could not open file %s:", filename); eprintf("Unable to open file %s:", filename);
return NULL; return NULL;
} }
@ -251,25 +251,25 @@ int pngprepare(Image *img)
height = img->bufheight * xw.uw / img->bufwidth; height = img->bufheight * xw.uw / img->bufwidth;
if (depth < 24) { if (depth < 24) {
eprintf("display depths <24 not supported."); eprintf("Display depths <24 not supported.");
return 0; return 0;
} }
if (!(img->ximg = XCreateImage(xw.dpy, CopyFromParent, depth, ZPixmap, 0, if (!(img->ximg = XCreateImage(xw.dpy, CopyFromParent, depth, ZPixmap, 0,
NULL, width, height, 32, 0))) { NULL, width, height, 32, 0))) {
eprintf("could not create XImage"); eprintf("Unable to create XImage.");
return 0; return 0;
} }
if (!(img->ximg->data = malloc(img->ximg->bytes_per_line * height))) { if (!(img->ximg->data = malloc(img->ximg->bytes_per_line * height))) {
eprintf("could not alloc data section for XImage"); eprintf("Unable to alloc data section for XImage.");
XDestroyImage(img->ximg); XDestroyImage(img->ximg);
img->ximg = NULL; img->ximg = NULL;
return 0; return 0;
} }
if (!XInitImage(img->ximg)) { if (!XInitImage(img->ximg)) {
eprintf("could not init XImage"); eprintf("Unable to init XImage.");
free(img->ximg->data); free(img->ximg->data);
XDestroyImage(img->ximg); XDestroyImage(img->ximg);
img->ximg = NULL; img->ximg = NULL;
@ -422,7 +422,7 @@ void load(FILE *fp)
if ((slidecount+1) * sizeof(*slides) >= size) if ((slidecount+1) * sizeof(*slides) >= size)
if (!(slides = realloc(slides, (size += BUFSIZ)))) if (!(slides = realloc(slides, (size += BUFSIZ))))
die("cannot realloc %u bytes:", size); die("Unable to realloc %u bytes:", size);
/* read one slide */ /* read one slide */
maxlines = 0; maxlines = 0;
@ -435,12 +435,12 @@ void load(FILE *fp)
if (s->linecount >= maxlines) { if (s->linecount >= maxlines) {
maxlines = 2 * s->linecount + 1; maxlines = 2 * s->linecount + 1;
if (!(s->lines = realloc(s->lines, maxlines * sizeof(s->lines[0])))) if (!(s->lines = realloc(s->lines, maxlines * sizeof(s->lines[0]))))
die("cannot realloc %u bytes:", maxlines * sizeof(s->lines[0])); die("Unable to realloc %u bytes:", maxlines * sizeof(s->lines[0]));
} }
blen = strlen(buf); blen = strlen(buf);
if (!(s->lines[s->linecount] = strdup(buf))) if (!(s->lines[s->linecount] = strdup(buf)))
die("cannot strdup:"); die("Unable to strdup:");
if (s->lines[s->linecount][blen-1] == '\n') if (s->lines[s->linecount][blen-1] == '\n')
s->lines[s->linecount][blen-1] = '\0'; s->lines[s->linecount][blen-1] = '\0';
@ -470,9 +470,9 @@ void advance(const Arg *arg)
idx = new_idx; idx = new_idx;
xdraw(); xdraw();
if (slidecount > idx + 1 && slides[idx + 1].img && !pngread(slides[idx + 1].img)) if (slidecount > idx + 1 && slides[idx + 1].img && !pngread(slides[idx + 1].img))
die("could not read image %s", slides[idx + 1].lines[0]); die("Unable to read image %s.", slides[idx + 1].lines[0]);
if (0 < idx && slides[idx - 1].img && !pngread(slides[idx - 1].img)) if (0 < idx && slides[idx - 1].img && !pngread(slides[idx - 1].img))
die("could not read image %s", slides[idx - 1].lines[0]); die("Unable to read image %s.", slides[idx - 1].lines[0]);
} }
} }
@ -537,9 +537,9 @@ void xdraw()
0); 0);
drw_map(d, xw.win, 0, 0, xw.w, xw.h); drw_map(d, xw.win, 0, 0, xw.w, xw.h);
} else if (!(im->state & LOADED) && !pngread(im)) { } else if (!(im->state & LOADED) && !pngread(im)) {
eprintf("could not read image %s", slides[idx].lines[0]); eprintf("Unable to read image %s.", slides[idx].lines[0]);
} else if (!(im->state & SCALED) && !pngprepare(im)) { } else if (!(im->state & SCALED) && !pngprepare(im)) {
eprintf("could not prepare image %s for drawing", slides[idx].lines[0]); eprintf("Unable to prepare image %s for drawing.", slides[idx].lines[0]);
} else if (!(im->state & DRAWN)) { } else if (!(im->state & DRAWN)) {
pngdraw(im); pngdraw(im);
} }
@ -552,7 +552,7 @@ void xhints()
XSizeHints *sizeh = NULL; XSizeHints *sizeh = NULL;
if (!(sizeh = XAllocSizeHints())) if (!(sizeh = XAllocSizeHints()))
die("sent: Could not alloc size hints"); die("Unable to alloc size hints.");
sizeh->flags = PSize; sizeh->flags = PSize;
sizeh->height = xw.h; sizeh->height = xw.h;
@ -567,7 +567,7 @@ void xinit()
XTextProperty prop; XTextProperty prop;
if (!(xw.dpy = XOpenDisplay(NULL))) if (!(xw.dpy = XOpenDisplay(NULL)))
die("Can't open display."); die("Unable to open display.");
xw.scr = XDefaultScreen(xw.dpy); xw.scr = XDefaultScreen(xw.dpy);
xw.vis = XDefaultVisual(xw.dpy, xw.scr); xw.vis = XDefaultVisual(xw.dpy, xw.scr);
resize(DisplayWidth(xw.dpy, xw.scr), DisplayHeight(xw.dpy, xw.scr)); resize(DisplayWidth(xw.dpy, xw.scr), DisplayHeight(xw.dpy, xw.scr));
@ -585,7 +585,7 @@ void xinit()
XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1); XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
if (!(d = drw_create(xw.dpy, xw.scr, xw.win, xw.w, xw.h))) if (!(d = drw_create(xw.dpy, xw.scr, xw.win, xw.w, xw.h)))
die("Can't create drawing context."); die("Unable to create drawing context.");
sc = drw_scm_create(d, fgcol, bgcol); sc = drw_scm_create(d, fgcol, bgcol);
drw_setscheme(d, sc); drw_setscheme(d, sc);
XSetWindowBackground(xw.dpy, xw.win, sc->bg.pix); XSetWindowBackground(xw.dpy, xw.win, sc->bg.pix);
@ -608,16 +608,16 @@ void xloadfonts()
for (j = 0; j < LEN(fontfallbacks); j++) { for (j = 0; j < LEN(fontfallbacks); j++) {
if (!(fstrs[j] = malloc(MAXFONTSTRLEN))) if (!(fstrs[j] = malloc(MAXFONTSTRLEN)))
die("could not malloc fstrs"); die("Unable to malloc fstrs.");
} }
for (i = 0; i < NUMFONTSCALES; i++) { for (i = 0; i < NUMFONTSCALES; i++) {
for (j = 0; j < LEN(fontfallbacks); j++) { for (j = 0; j < LEN(fontfallbacks); j++) {
if (MAXFONTSTRLEN < snprintf(fstrs[j], MAXFONTSTRLEN, "%s:size=%d", fontfallbacks[j], FONTSZ(i))) if (MAXFONTSTRLEN < snprintf(fstrs[j], MAXFONTSTRLEN, "%s:size=%d", fontfallbacks[j], FONTSZ(i)))
die("font string too long"); die("Font string too long.");
} }
if (!(fonts[i] = drw_fontset_create(d, (const char**)fstrs, LEN(fstrs)))) if (!(fonts[i] = drw_fontset_create(d, (const char**)fstrs, LEN(fstrs))))
die("unable to load any font for size %d", FONTSZ(i)); die("Unable to load any font for size %d.", FONTSZ(i));
} }
for (j = 0; j < LEN(fontfallbacks); j++) for (j = 0; j < LEN(fontfallbacks); j++)
@ -681,7 +681,7 @@ int main(int argc, char *argv[])
load(fp); load(fp);
fclose(fp); fclose(fp);
} else { } else {
eprintf("could not open %s for reading:", argv[i]); eprintf("Unable to open '%s' for reading:", argv[i]);
} }
} }