all repos — dmenu @ 026827fd65c1163a92a984c4eae3882a6d69f8df

my build of dmenu

die() consistency: always add newline
Hiltjo Posthuma hiltjo@codemadness.org
Fri, 12 Aug 2016 14:39:30 +0200
commit

026827fd65c1163a92a984c4eae3882a6d69f8df

parent

d14670b9959f8b3760b63dd40a70687a90312b8a

3 files changed, 9 insertions(+), 7 deletions(-)

jump to
M dmenu.cdmenu.c

@@ -187,7 +187,7 @@ GrabModeAsync, CurrentTime) == GrabSuccess)

return; nanosleep(&ts, NULL); } - die("cannot grab keyboard\n"); + die("cannot grab keyboard"); } static void

@@ -205,7 +205,7 @@ strcpy(buf, text);

/* 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 @@

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) {
M drw.cdrw.c

@@ -129,7 +129,7 @@ fprintf(stderr, "error, cannot load font from pattern.\n");

return NULL; } } else { - die("no font specified.\n"); + die("no font specified."); } font = ecalloc(1, sizeof(Fnt));

@@ -188,7 +188,7 @@

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 @@ FcCharSetAddChar(fccharset, utf8codepoint);

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);
M util.cutil.c

@@ -27,6 +27,8 @@

if (fmt[0] && fmt[strlen(fmt)-1] == ':') { fputc(' ', stderr); perror(NULL); + } else { + fputc('\n', stderr); } exit(1);