git.stevedylan.dev

die() consistency: always add newline ab9571bb

Hiltjo Posthuma · 2016-08-12 14:35 3 file(s) · +10 −8

drw.c +3 −3

			return NULL;
		}
	} else {
		die("no font specified.\n");
		die("no font specified.");
	}

	font = ecalloc(1, sizeof(Fnt));

	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


			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);

dwm.c +5 −5

	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();

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;
}


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();

util.c +2 −0

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

	exit(1);

129	129		return NULL;
130	130		}
131	131		} else {
132		-	die("no font specified.\n");
	132	+	die("no font specified.");
133	133		}
134	134
135	135		font = ecalloc(1, sizeof(Fnt));

188	188		if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
189	189		DefaultColormap(drw->dpy, drw->screen),
190	190		clrname, dest))
191		-	die("error, cannot allocate color '%s'\n", clrname);
	191	+	die("error, cannot allocate color '%s'", clrname);
192	192		}
193	193
194	194		/* Wrapper to create color schemes. The caller has to call free(3) on the

331	331
332	332		if (!drw->fonts->pattern) {
333	333		/* Refer to the comment in xfont_create for more information. */
334		-	die("the first font in the cache must be loaded from a font string.\n");
	334	+	die("the first font in the cache must be loaded from a font string.");
335	335		}
336	336
337	337		fcpattern = FcPatternDuplicate(drw->fonts->pattern);

1561	1561		root = RootWindow(dpy, screen);
1562	1562		drw = drw_create(dpy, screen, root, sw, sh);
1563	1563		if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
1564		-	die("no fonts could be loaded.\n");
	1564	+	die("no fonts could be loaded.");
1565	1565		lrpad = drw->fonts->h;
1566	1566		bh = drw->fonts->h + 2;
1567	1567		updategeom();

2101	2101		int
2102	2102		xerrorstart(Display dpy, XErrorEvent ee)
2103	2103		{
2104		-	die("dwm: another window manager is already running\n");
	2104	+	die("dwm: another window manager is already running");
2105	2105		return -1;
2106	2106		}
2107	2107

2123	2123		main(int argc, char *argv[])
2124	2124		{
2125	2125		if (argc == 2 && !strcmp("-v", argv[1]))
2126		-	die("dwm-"VERSION "\n");
	2126	+	die("dwm-"VERSION);
2127	2127		else if (argc != 1)
2128		-	die("usage: dwm [-v]\n");
	2128	+	die("usage: dwm [-v]");
2129	2129		if (!setlocale(LC_CTYPE, "") \|\| !XSupportsLocale())
2130	2130		fputs("warning: no locale support\n", stderr);
2131	2131		if (!(dpy = XOpenDisplay(NULL)))
2132		-	die("dwm: cannot open display\n");
	2132	+	die("dwm: cannot open display");
2133	2133		checkotherwm();
2134	2134		setup();
2135	2135		scan();

27	27		if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
28	28		fputc(' ', stderr);
29	29		perror(NULL);
	30	+	} else {
	31	+	fputc('\n', stderr);
30	32		}
31	33
32	34		exit(1);