diff options
| author | arg@10ksloc.org <unknown> | 2006-07-21 18:34:10 +0200 |
|---|---|---|
| committer | arg@10ksloc.org <unknown> | 2006-07-21 18:34:10 +0200 |
| commit | 0464e42231199d7a6ea45e46cf7798f2b6cf972c (patch) | |
| tree | a9fbd46c88b1f689572fdb3f93f0524e8ee23099 | |
| parent | 4970ef938eca10d9af3ef058d15d2ffeb6dfbe18 (diff) | |
| download | dwm-0464e42231199d7a6ea45e46cf7798f2b6cf972c.tar.gz | |
some cleanups/fixes inspired by Jukka Salmi's feedback
| -rw-r--r-- | event.c | 4 | ||||
| -rw-r--r-- | main.c | 3 | ||||
| -rw-r--r-- | tag.c | 7 | ||||
| -rw-r--r-- | util.c | 6 |
4 files changed, 7 insertions, 13 deletions
diff --git a/event.c b/event.c index ab57024..95b94cc 100644 --- a/event.c +++ b/event.c @@ -267,7 +267,7 @@ expose(XEvent *e) 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 (*handler[LASTEvent]) (XEvent *) = { 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; diff --git a/main.c b/main.c index db36536..dffa4ba 100644 --- a/main.c +++ b/main.c @@ -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 @@ xerror(Display *dpy, XErrorEvent *ee) int main(int argc, char *argv[]) { - int i, n; + int i; unsigned int mask; fd_set rd; Bool readin = True; diff --git a/tag.c b/tag.c index f7ab6b9..67e2498 100644 --- a/tag.c +++ b/tag.c @@ -165,18 +165,13 @@ void 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 : "", diff --git a/util.c b/util.c index 94590f9..6eb19b4 100644 --- a/util.c +++ b/util.c @@ -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 @@ spawn(Arg *arg) fprintf(stderr, "dwm: execvp %s", argv[0]); perror(" failed"); } - exit(EXIT_FAILURE); + exit(0); } wait(0); } |