made function signatures more consistent to my coding style

.hgtags

@@ -6,3 +6,4 @@ d352e9dc112ee96aa5cad961a0ed880ae9ce7276 0.3
 25f679fb19686140a907684ffcb423b9e9d44b53 0.6
 5fc20d7158bd16b4d5f8d1c25e177680b6d54252 0.7
 409667a57221f7e50ba8b5248f638915cd61b366 0.8
+d046c818ea467555cc338751c9bf3024609f1f12 0.9

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 0.9
+VERSION = 1.0
 
 # Customize below to fit your system
 

dmenu.h

@@ -23,26 +23,27 @@ struct Fnt {
 	int height;
 };
 
-struct DC { /* draw context */
+struct DC {
 	int x, y, w, h;
 	unsigned long norm[ColLast];
 	unsigned long sel[ColLast];
 	Drawable drawable;
 	Fnt font;
 	GC gc;
-};
+}; /* draw context */
 
 extern int screen;
 extern Display *dpy;
-extern DC dc;
+extern DC dc;			/* global drawing context */
 
 /* draw.c */
-extern void drawtext(const char *text, unsigned long col[ColLast]);
+extern void drawtext(const char *text,
-extern unsigned long getcolor(const char *colstr);
+			unsigned long col[ColLast]);	/* draws text with the defined color tuple */
-extern void setfont(const char *fontstr);
+extern unsigned long getcolor(const char *colstr);	/* returns color of colstr */
-extern unsigned int textw(const char *text);
+extern void setfont(const char *fontstr);		/* sets global font */
+extern unsigned int textw(const char *text);		/* returns width of text in px */
 
 /* util.c */
-extern void *emalloc(unsigned int size);
+extern void *emalloc(unsigned int size);		/* allocates memory, exits on error */
-extern void eprint(const char *errstr, ...);
+extern void eprint(const char *errstr, ...);		/* prints errstr and exits with 1 */
-extern char *estrdup(const char *str);
+extern char *estrdup(const char *str);			/* duplicates str, exits on allocation error */

draw.c

@@ -10,8 +10,7 @@
 /* static */
 
 static unsigned int
-textnw(const char *text, unsigned int len)
+textnw(const char *text, unsigned int len) {
-{
 	XRectangle r;
 
 	if(dc.font.set) {
@@ -24,8 +23,7 @@ textnw(const char *text, unsigned int len)
 /* extern */
 
 void
-drawtext(const char *text, unsigned long col[ColLast])
+drawtext(const char *text, unsigned long col[ColLast]) {
-{
 	int x, y, w, h;
 	static char buf[256];
 	unsigned int len, olen;
@@ -78,8 +76,7 @@ drawtext(const char *text, unsigned long col[ColLast])
 }
 
 unsigned long
-getcolor(const char *colstr)
+getcolor(const char *colstr) {
-{
 	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
 
@@ -88,8 +85,7 @@ getcolor(const char *colstr)
 }
 
 void
-setfont(const char *fontstr)
+setfont(const char *fontstr) {
-{
 	char **missing, *def;
 	int i, n;
 
@@ -137,7 +133,6 @@ setfont(const char *fontstr)
 }
 
 unsigned int
-textw(const char *text)
+textw(const char *text) {
-{
 	return textnw(text, strlen(text)) + dc.font.height;
 }

main.c

@@ -42,8 +42,7 @@ static Window root;
 static Window win;
 
 static void
-calcoffsets()
+calcoffsets() {
-{
 	unsigned int tw, w;
 
 	if(!curr)
@@ -71,8 +70,7 @@ calcoffsets()
 }
 
 static void
-drawmenu()
+drawmenu() {
-{
 	Item *i;
 
 	dc.x = 0;
@@ -110,8 +108,7 @@ drawmenu()
 }
 
 static void
-match(char *pattern)
+match(char *pattern) {
-{
 	unsigned int plen;
 	Item *i, *j;
 
@@ -151,8 +148,7 @@ match(char *pattern)
 }
 
 static void
-kpress(XKeyEvent * e)
+kpress(XKeyEvent * e) {
-{
 	char buf[32];
 	int num, prev_nitem;
 	unsigned int i, len;
@@ -251,8 +247,7 @@ kpress(XKeyEvent * e)
 }
 
 static char *
-readstdin()
+readstdin() {
-{
 	static char *maxname = NULL;
 	char *p, buf[1024];
 	unsigned int len = 0, max = 0;
@@ -289,8 +284,7 @@ Display *dpy;
 DC dc = {0};
 
 int
-main(int argc, char *argv[])
+main(int argc, char *argv[]) {
-{
 	char *maxname;
 	fd_set rd;
 	struct timeval timeout;

util.c

@@ -13,16 +13,14 @@
 /* static */
 
 static void
-badmalloc(unsigned int size)
+badmalloc(unsigned int size) {
-{
 	eprint("fatal: could not malloc() %u bytes\n", size);
 }
 
 /* extern */
 
 void *
-emalloc(unsigned int size)
+emalloc(unsigned int size) {
-{
 	void *res = malloc(size);
 	if(!res)
 		badmalloc(size);
@@ -30,8 +28,7 @@ emalloc(unsigned int size)
 }
 
 void
-eprint(const char *errstr, ...)
+eprint(const char *errstr, ...) {
-{
 	va_list ap;
 
 	va_start(ap, errstr);
@@ -41,8 +38,7 @@ eprint(const char *errstr, ...)
 }
 
 char *
-estrdup(const char *str)
+estrdup(const char *str) {
-{
 	void *res = strdup(str);
 	if(!res)
 		badmalloc(strlen(str));