aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiltjo Posthuma <hiltjo@codemadness.org>2016-08-12 14:39:30 +0200
committerHiltjo Posthuma <hiltjo@codemadness.org>2016-08-12 14:39:30 +0200
commit026827fd65c1163a92a984c4eae3882a6d69f8df (patch)
tree9de6cecba4d2eedd2a0de5284cbcd228dee4c919
parentd14670b9959f8b3760b63dd40a70687a90312b8a (diff)
downloaddmenu-026827fd65c1163a92a984c4eae3882a6d69f8df.tar.gz
dmenu-026827fd65c1163a92a984c4eae3882a6d69f8df.tar.bz2
dmenu-026827fd65c1163a92a984c4eae3882a6d69f8df.zip
die() consistency: always add newline
-rw-r--r--dmenu.c8
-rw-r--r--drw.c6
-rw-r--r--util.c2
3 files changed, 9 insertions, 7 deletions
diff --git a/dmenu.c b/dmenu.c
index df51e76..3b05752 100644
--- 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 *tokv)))
- 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
index 95839c9..c1582e7 100644
--- a/drw.c
+++ b/drw.c
@@ -129,7 +129,7 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
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 int h, unsigned int lp
if (!drw->fonts->pattern) {
/* Refer to the comment in xfont_create for more information. */
- die("the first font in the cache must be loaded from a font string.\n");
+ die("the first font in the cache must be loaded from a font string.");
}
fcpattern = FcPatternDuplicate(drw->fonts->pattern);
diff --git a/util.c b/util.c
index 6b703e9..b0612af 100644
--- 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);