Mercurial > dwm-meillo

changeset 138:c1185dc7a36e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some cleanups/fixes inspired by Jukka Salmi's feedback
author arg@10ksloc.org
date Fri, 21 Jul 2006 18:34:10 +0200
parents 77922a389fa8
children 22213b9a2114
files event.c main.c tag.c util.c
diffstat 4 files changed, 7 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/event.c	Fri Jul 21 14:11:38 2006 +0200
+++ b/event.c	Fri Jul 21 18:34:10 2006 +0200
@@ -267,7 +267,7 @@
 static void
 keypress(XEvent *e)
 {
-	static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+	static unsigned int len = sizeof(key) / sizeof(key[0]);
 	unsigned int i;
 	KeySym keysym;
 	XKeyEvent *ev = &e->xkey;
@@ -370,7 +370,7 @@
 void
 grabkeys()
 {
-	static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+	static unsigned int len = sizeof(key) / sizeof(key[0]);
 	unsigned int i;
 	KeyCode code;
 
--- a/main.c	Fri Jul 21 14:11:38 2006 +0200
+++ b/main.c	Fri Jul 21 18:34:10 2006 +0200
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/select.h>
 #include <X11/cursorfont.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
@@ -163,7 +164,7 @@
 int
 main(int argc, char *argv[])
 {
-	int i, n;
+	int i;
 	unsigned int mask;
 	fd_set rd;
 	Bool readin = True;
--- a/tag.c	Fri Jul 21 14:11:38 2006 +0200
+++ b/tag.c	Fri Jul 21 18:34:10 2006 +0200
@@ -165,18 +165,13 @@
 settags(Client *c)
 {
 	char classinst[256];
-	static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
+	static unsigned int len = sizeof(rule) / sizeof(rule[0]);
 	unsigned int i, j;
 	regex_t regex;
 	regmatch_t tmp;
 	Bool matched = False;
 	XClassHint ch;
 
-	if(!len) {
-		c->tags[tsel] = tags[tsel];
-		return;
-	}
-
 	if(XGetClassHint(dpy, c->win, &ch)) {
 		snprintf(classinst, sizeof(classinst), "%s:%s",
 				ch.res_class ? ch.res_class : "",
--- a/util.c	Fri Jul 21 14:11:38 2006 +0200
+++ b/util.c	Fri Jul 21 18:34:10 2006 +0200
@@ -15,9 +15,7 @@
 static void
 bad_malloc(unsigned int size)
 {
-	fprintf(stderr, "fatal: could not malloc() %d bytes\n",
-			(int) size);
-	exit(EXIT_FAILURE);
+	eprint("fatal: could not malloc() %u bytes\n", size);
 }
 
 /* extern */
@@ -58,7 +56,7 @@
 			fprintf(stderr, "dwm: execvp %s", argv[0]);
 			perror(" failed");
 		}
-		exit(EXIT_FAILURE);
+		exit(0);
 	}
 	wait(0);
 }