Commit bb4edc7

nsxivbb4edc7

Renamed FATAL to DIE

+5 −5

3 files changed

−Context 3+

M image.c View

M sxiv.h View

M window.c View

		@@ -40,7 +40,7 @@ void img_load(img_t img, char filename) {
40	40		imlib_free_image();
41	41
42	42		if (!(img->im = imlib_load_image(filename)))
43		−	FATAL("could not open image: %s", filename);
	43	+	DIE("could not open image: %s", filename);
44	44
45	45		imlib_context_set_image(img->im);
46	46

		@@ -30,7 +30,7 @@
30	30		fprintf(stderr, "\n"); \
31	31		} while (0)
32	32
33		−	#define FATAL(...) \
	33	+	#define DIE(...) \
34	34		do { \
35	35		fprintf(stderr, "sxiv: %s:%d: error: ", __FILE__, __LINE__); \
36	36		fprintf(stderr, __VA_ARGS__); \

		@@ -37,7 +37,7 @@ void win_open(win_t *win) {
37	37		e = &win->env;
38	38
39	39		if (!(e->dpy = XOpenDisplay(NULL)))
40		−	FATAL("could not open display");
	40	+	DIE("could not open display");
41	41
42	42		e->scr = DefaultScreen(e->dpy);
43	43		e->scrw = DisplayWidth(e->dpy, e->scr);
		@@ -49,7 +49,7 @@ void win_open(win_t *win) {
49	49
50	50		if (!XAllocNamedColor(e->dpy, DefaultColormap(e->dpy, e->scr), BG_COLOR,
51	51		&bgcol, &bgcol))
52		−	FATAL("could not allocate color: %s", BG_COLOR);
	52	+	DIE("could not allocate color: %s", BG_COLOR);
53	53
54	54		if (win->w > e->scrw)
55	55		win->w = e->scrw;
		@@ -67,7 +67,7 @@ void win_open(win_t *win) {
67	67		win->x, win->y, win->w, win->h, 0,
68	68		e->depth, InputOutput, e->vis, mask, &attr);
69	69		if (win->xwin == None)
70		−	FATAL("could not create window");
	70	+	DIE("could not create window");
71	71
72	72		XSelectInput(e->dpy, win->xwin,
73	73		StructureNotifyMask \| ExposureMask \| KeyPressMask);