From bb4edc756c7ceddb0f13194929cd1d363c85d653 Mon Sep 17 00:00:00 2001 From: Bert Date: Tue, 18 Jan 2011 17:21:59 +0100 Subject: Renamed FATAL to DIE --- image.c | 2 +- sxiv.h | 2 +- window.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/image.c b/image.c index a2742f4..a430b81 100644 --- a/image.c +++ b/image.c @@ -40,7 +40,7 @@ void img_load(img_t *img, char *filename) { imlib_free_image(); if (!(img->im = imlib_load_image(filename))) - FATAL("could not open image: %s", filename); + DIE("could not open image: %s", filename); imlib_context_set_image(img->im); diff --git a/sxiv.h b/sxiv.h index f26a84f..1ebcf57 100644 --- a/sxiv.h +++ b/sxiv.h @@ -30,7 +30,7 @@ fprintf(stderr, "\n"); \ } while (0) -#define FATAL(...) \ +#define DIE(...) \ do { \ fprintf(stderr, "sxiv: %s:%d: error: ", __FILE__, __LINE__); \ fprintf(stderr, __VA_ARGS__); \ diff --git a/window.c b/window.c index 34c81aa..f8afad6 100644 --- a/window.c +++ b/window.c @@ -37,7 +37,7 @@ void win_open(win_t *win) { e = &win->env; if (!(e->dpy = XOpenDisplay(NULL))) - FATAL("could not open display"); + DIE("could not open display"); e->scr = DefaultScreen(e->dpy); e->scrw = DisplayWidth(e->dpy, e->scr); @@ -49,7 +49,7 @@ void win_open(win_t *win) { if (!XAllocNamedColor(e->dpy, DefaultColormap(e->dpy, e->scr), BG_COLOR, &bgcol, &bgcol)) - FATAL("could not allocate color: %s", BG_COLOR); + DIE("could not allocate color: %s", BG_COLOR); if (win->w > e->scrw) win->w = e->scrw; @@ -67,7 +67,7 @@ void win_open(win_t *win) { win->x, win->y, win->w, win->h, 0, e->depth, InputOutput, e->vis, mask, &attr); if (win->xwin == None) - FATAL("could not create window"); + DIE("could not create window"); XSelectInput(e->dpy, win->xwin, StructureNotifyMask | ExposureMask | KeyPressMask); -- cgit v1.2.3-54-g00ecf