some cleanups/fixes inspired by Jukka Salmi's feedback

keyboard
arg@10ksloc.org 19 years ago
parent 4970ef938e
commit 0464e42231
  1. 4
      event.c
  2. 3
      main.c
  3. 7
      tag.c
  4. 6
      util.c

@ -267,7 +267,7 @@ expose(XEvent *e)
static void static void
keypress(XEvent *e) 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; unsigned int i;
KeySym keysym; KeySym keysym;
XKeyEvent *ev = &e->xkey; XKeyEvent *ev = &e->xkey;
@ -370,7 +370,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
void void
grabkeys() grabkeys()
{ {
static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0; static unsigned int len = sizeof(key) / sizeof(key[0]);
unsigned int i; unsigned int i;
KeyCode code; KeyCode code;

@ -10,6 +10,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/select.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
@ -163,7 +164,7 @@ xerror(Display *dpy, XErrorEvent *ee)
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int i, n; int i;
unsigned int mask; unsigned int mask;
fd_set rd; fd_set rd;
Bool readin = True; Bool readin = True;

@ -165,18 +165,13 @@ void
settags(Client *c) settags(Client *c)
{ {
char classinst[256]; 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; unsigned int i, j;
regex_t regex; regex_t regex;
regmatch_t tmp; regmatch_t tmp;
Bool matched = False; Bool matched = False;
XClassHint ch; XClassHint ch;
if(!len) {
c->tags[tsel] = tags[tsel];
return;
}
if(XGetClassHint(dpy, c->win, &ch)) { if(XGetClassHint(dpy, c->win, &ch)) {
snprintf(classinst, sizeof(classinst), "%s:%s", snprintf(classinst, sizeof(classinst), "%s:%s",
ch.res_class ? ch.res_class : "", ch.res_class ? ch.res_class : "",

@ -15,9 +15,7 @@
static void static void
bad_malloc(unsigned int size) bad_malloc(unsigned int size)
{ {
fprintf(stderr, "fatal: could not malloc() %d bytes\n", eprint("fatal: could not malloc() %u bytes\n", size);
(int) size);
exit(EXIT_FAILURE);
} }
/* extern */ /* extern */
@ -58,7 +56,7 @@ spawn(Arg *arg)
fprintf(stderr, "dwm: execvp %s", argv[0]); fprintf(stderr, "dwm: execvp %s", argv[0]);
perror(" failed"); perror(" failed");
} }
exit(EXIT_FAILURE); exit(0);
} }
wait(0); wait(0);
} }

Loading…
Cancel
Save