[hackers] [dmenu] die() consistency: always add newline || Hiltjo Posthuma

From: <git_AT_suckless.org>
Date: Fri, 12 Aug 2016 14:41:47 +0200 (CEST)

commit 026827fd65c1163a92a984c4eae3882a6d69f8df
Author: Hiltjo Posthuma <hiltjo_AT_codemadness.org>
AuthorDate: Fri Aug 12 14:39:30 2016 +0200
Commit: Hiltjo Posthuma <hiltjo_AT_codemadness.org>
CommitDate: Fri Aug 12 14:39:30 2016 +0200

    die() consistency: always add newline

diff --git a/dmenu.c b/dmenu.c
index df51e76..3b05752 100644
--- a/dmenu.c
+++ b/dmenu.c
_AT_@ -187,7 +187,7 @@ grabkeyboard(void)
                         return;
                 nanosleep(&ts, NULL);
         }
- die("cannot grab keyboard\n");
+ die("cannot grab keyboard");
 }
 
 static void
_AT_@ -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;
_AT_@ -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
_AT_@ -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));
_AT_@ -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
_AT_@ -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
_AT_@ -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);
Received on Fri Aug 12 2016 - 14:41:47 CEST