tsome cleanups/fixes inspired by Jukka Salmi's feedback - dwm - [fork] customized build of dwm, the dynamic window manager
(HTM) git clone git://src.adamsgaard.dk/dwm
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 0464e42231199d7a6ea45e46cf7798f2b6cf972c
(DIR) parent 4970ef938eca10d9af3ef058d15d2ffeb6dfbe18
(HTM) Author: arg@10ksloc.org <unknown>
Date: Fri, 21 Jul 2006 18:34:10 +0200
some cleanups/fixes inspired by Jukka Salmi's feedback
Diffstat:
M event.c | 4 ++--
M main.c | 3 ++-
M tag.c | 7 +------
M util.c | 6 ++----
4 files changed, 7 insertions(+), 13 deletions(-)
---
(DIR) diff --git a/event.c b/event.c
t@@ -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;
t@@ -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;
(DIR) diff --git a/main.c b/main.c
t@@ -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>
t@@ -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;
(DIR) diff --git a/tag.c b/tag.c
t@@ -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 : "",
(DIR) diff --git a/util.c b/util.c
t@@ -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 */
t@@ -58,7 +56,7 @@ spawn(Arg *arg)
fprintf(stderr, "dwm: execvp %s", argv[0]);
perror(" failed");
}
- exit(EXIT_FAILURE);
+ exit(0);
}
wait(0);
}