tdie() consistency: always add newline - dwm - [fork] customized build of dwm, … | |
git clone git://src.adamsgaard.dk/dwm | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit ab9571bbc5f6fb04fd583238a665a7e830fc1397 | |
parent 56a31dc4a7be459e3a1ea06d45427e1a4087a1a6 | |
Author: Hiltjo Posthuma <[email protected]> | |
Date: Fri, 12 Aug 2016 14:35:25 +0200 | |
die() consistency: always add newline | |
Diffstat: | |
M drw.c | 6 +++--- | |
M dwm.c | 10 +++++----- | |
M util.c | 2 ++ | |
3 files changed, 10 insertions(+), 8 deletions(-) | |
--- | |
diff --git a/drw.c b/drw.c | |
t@@ -129,7 +129,7 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fo… | |
return NULL; | |
} | |
} else { | |
- die("no font specified.\n"); | |
+ die("no font specified."); | |
} | |
font = ecalloc(1, sizeof(Fnt)); | |
t@@ -188,7 +188,7 @@ drw_clr_create(Drw *drw, XftColor *dest, const char *clrna… | |
if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), | |
DefaultColormap(drw->dpy, drw->screen), | |
clrname, dest)) | |
- die("error, cannot allocate color '%s'\n", clrname); | |
+ die("error, cannot allocate color '%s'", clrname); | |
} | |
/* Wrapper to create color schemes. The caller has to call free(3) on the | |
t@@ -331,7 +331,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned … | |
if (!drw->fonts->pattern) { | |
/* Refer to the comment in xfont_create for mo… | |
- die("the first font in the cache must be loade… | |
+ die("the first font in the cache must be loade… | |
} | |
fcpattern = FcPatternDuplicate(drw->fonts->pattern); | |
diff --git a/dwm.c b/dwm.c | |
t@@ -1561,7 +1561,7 @@ setup(void) | |
root = RootWindow(dpy, screen); | |
drw = drw_create(dpy, screen, root, sw, sh); | |
if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) | |
- die("no fonts could be loaded.\n"); | |
+ die("no fonts could be loaded."); | |
lrpad = drw->fonts->h; | |
bh = drw->fonts->h + 2; | |
updategeom(); | |
t@@ -2101,7 +2101,7 @@ xerrordummy(Display *dpy, XErrorEvent *ee) | |
int | |
xerrorstart(Display *dpy, XErrorEvent *ee) | |
{ | |
- die("dwm: another window manager is already running\n"); | |
+ die("dwm: another window manager is already running"); | |
return -1; | |
} | |
t@@ -2123,13 +2123,13 @@ int | |
main(int argc, char *argv[]) | |
{ | |
if (argc == 2 && !strcmp("-v", argv[1])) | |
- die("dwm-"VERSION "\n"); | |
+ die("dwm-"VERSION); | |
else if (argc != 1) | |
- die("usage: dwm [-v]\n"); | |
+ die("usage: dwm [-v]"); | |
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) | |
fputs("warning: no locale support\n", stderr); | |
if (!(dpy = XOpenDisplay(NULL))) | |
- die("dwm: cannot open display\n"); | |
+ die("dwm: cannot open display"); | |
checkotherwm(); | |
setup(); | |
scan(); | |
diff --git a/util.c b/util.c | |
t@@ -27,6 +27,8 @@ die(const char *fmt, ...) { | |
if (fmt[0] && fmt[strlen(fmt)-1] == ':') { | |
fputc(' ', stderr); | |
perror(NULL); | |
+ } else { | |
+ fputc('\n', stderr); | |
} | |
exit(1); |