X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=4aad990606f8e1b8896ff57736bfed709c51cf5f;hb=08d85d6d66bc4493414d76e470e473fa689c5990;hp=d566c9e3055ae782b3bf5a9a901b86fbcecbd480;hpb=a635743c6dd8e945bbca6b5799dd00c86fe847e6;p=dwm.git

diff --git a/main.c b/main.c
index d566c9e..4aad990 100644
--- a/main.c
+++ b/main.c
@@ -63,7 +63,7 @@ scan()
 }
 
 static int
-win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
+winprop(Window w, Atom a, Atom t, long l, unsigned char **prop)
 {
 	int status, format;
 	unsigned long res, extra;
@@ -116,7 +116,7 @@ getproto(Window w)
 	long res;
 	Atom *protocols;
 
-	res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L,
+	res = winprop(w, wmatom[WMProtocols], XA_ATOM, 20L,
 			((unsigned char **)&protocols));
 	if(res <= 0) {
 		return protos;
@@ -286,11 +286,9 @@ main(int argc, char *argv[])
 			FD_SET(STDIN_FILENO, &rd);
 		FD_SET(xfd, &rd);
 		i = select(xfd + 1, &rd, NULL, NULL, NULL);
-		if(i == -1 && errno == EINTR)
+		if((i == -1) && (errno == EINTR))
 			continue;
-		if(i < 0)
-			eprint("select failed\n");
-		else if(i > 0) {
+		if(i > 0) {
 			if(readin && FD_ISSET(STDIN_FILENO, &rd)) {
 				readin = NULL != fgets(stext, sizeof(stext), stdin);
 				if(readin)
@@ -300,6 +298,8 @@ main(int argc, char *argv[])
 				drawstatus();
 			}
 		}
+		else if(i < 0)
+			eprint("select failed\n");
 		procevent();
 	}
 	cleanup();