 |
die() consistency: always add newline - dmenu - dynamic menu |
 |
git clone git://git.suckless.org/dmenu |
 |
Log |
|
Files |
|
Refs |
|
README |
|
LICENSE |
|
--- |
|
commit 026827fd65c1163a92a984c4eae3882a6d69f8df |
|
parent d14670b9959f8b3760b63dd40a70687a90312b8a |
|
Author: Hiltjo Posthuma <[email protected]> |
|
Date: Fri, 12 Aug 2016 14:39:30 +0200 |
|
|
|
die() consistency: always add newline |
|
|
|
Diffstat: |
|
M dmenu.c | 8 ++++---- |
|
M drw.c | 6 +++--- |
|
M util.c | 2 ++ |
|
|
|
3 files changed, 9 insertions(+), 7 deletions(-) |
|
--- |
|
diff --git a/dmenu.c b/dmenu.c |
|
@@ -187,7 +187,7 @@ grabkeyboard(void) |
|
return; |
|
nanosleep(&ts, NULL); |
|
} |
|
- die("cannot grab keyboard\n"); |
|
+ die("cannot grab keyboard"); |
|
} |
|
|
|
static void |
|
@@ -205,7 +205,7 @@ match(void) |
|
/* separate input text into tokens to be matched individually */ |
|
for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "… |
|
if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *t… |
|
- die("cannot realloc %u bytes\n", tokn * sizeof *tokv); |
|
+ die("cannot realloc %u bytes:", tokn * sizeof *tokv); |
|
len = tokc ? strlen(tokv[0]) : 0; |
|
|
|
matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL; |
|
@@ -647,14 +647,14 @@ main(int argc, char *argv[]) |
|
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) |
|
fputs("warning: no locale support\n", stderr); |
|
if (!(dpy = XOpenDisplay(NULL))) |
|
- die("cannot open display\n"); |
|
+ die("cannot open display"); |
|
screen = DefaultScreen(dpy); |
|
root = RootWindow(dpy, screen); |
|
sw = DisplayWidth(dpy, screen); |
|
sh = DisplayHeight(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; |
|
|
|
if (fast) { |
|
diff --git a/drw.c b/drw.c |
|
@@ -129,7 +129,7 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fon… |
|
return NULL; |
|
} |
|
} else { |
|
- die("no font specified.\n"); |
|
+ die("no font specified."); |
|
} |
|
|
|
font = ecalloc(1, sizeof(Fnt)); |
|
@@ -188,7 +188,7 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname) |
|
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 |
|
@@ -331,7 +331,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned i… |
|
|
|
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/util.c b/util.c |
|
@@ -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); |
