Skip to content

Commit 117a35b

Browse files
hiltjoChanderG
authored andcommitted
die() consistency: always add newline
1 parent 0745f36 commit 117a35b

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

drw.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
129129
return NULL;
130130
}
131131
} else {
132-
die("no font specified.\n");
132+
die("no font specified.");
133133
}
134134

135135
font = ecalloc(1, sizeof(Fnt));
@@ -188,7 +188,7 @@ drw_clr_create(Drw *drw, XftColor *dest, const char *clrname)
188188
if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
189189
DefaultColormap(drw->dpy, drw->screen),
190190
clrname, dest))
191-
die("error, cannot allocate color '%s'\n", clrname);
191+
die("error, cannot allocate color '%s'", clrname);
192192
}
193193

194194
/* Wrapper to create color schemes. The caller has to call free(3) on the
@@ -331,7 +331,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
331331

332332
if (!drw->fonts->pattern) {
333333
/* Refer to the comment in xfont_create for more information. */
334-
die("the first font in the cache must be loaded from a font string.\n");
334+
die("the first font in the cache must be loaded from a font string.");
335335
}
336336

337337
fcpattern = FcPatternDuplicate(drw->fonts->pattern);

dwm.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -1627,7 +1627,7 @@ setup(void)
16271627
root = RootWindow(dpy, screen);
16281628
drw = drw_create(dpy, screen, root, sw, sh);
16291629
if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
1630-
die("no fonts could be loaded.\n");
1630+
die("no fonts could be loaded.");
16311631
lrpad = drw->fonts->h;
16321632
bh = drw->fonts->h + 2;
16331633
updategeom();
@@ -2231,7 +2231,7 @@ xerrordummy(Display *dpy, XErrorEvent *ee)
22312231
int
22322232
xerrorstart(Display *dpy, XErrorEvent *ee)
22332233
{
2234-
die("dwm: another window manager is already running\n");
2234+
die("dwm: another window manager is already running");
22352235
return -1;
22362236
}
22372237

@@ -2253,13 +2253,13 @@ int
22532253
main(int argc, char *argv[])
22542254
{
22552255
if (argc == 2 && !strcmp("-v", argv[1]))
2256-
die("dwm-"VERSION "\n");
2256+
die("dwm-"VERSION);
22572257
else if (argc != 1)
2258-
die("usage: dwm [-v]\n");
2258+
die("usage: dwm [-v]");
22592259
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
22602260
fputs("warning: no locale support\n", stderr);
22612261
if (!(dpy = XOpenDisplay(NULL)))
2262-
die("dwm: cannot open display\n");
2262+
die("dwm: cannot open display");
22632263
checkotherwm();
22642264
setup();
22652265
scan();

util.c

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ die(const char *fmt, ...) {
2727
if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
2828
fputc(' ', stderr);
2929
perror(NULL);
30+
} else {
31+
fputc('\n', stderr);
3032
}
3133

3234
exit(1);

0 commit comments

Comments
 (0)