about summary refs log tree commit diff
path: root/client.c
diff options
context:
space:
mode:
authorokan <okan>2011-06-24 05:40:09 +0000
committerokan <okan>2011-06-24 05:40:09 +0000
commitf6fcd0eb5d2f48b82f52b65fa343a83c74a8f55f (patch)
treecc38360ea3f157153570a9576d8cab6e66eab535 /client.c
parent69cc58555de66b0ff67fd0c3880fcb70eb06f837 (diff)
downloadcwm-f6fcd0eb5d2f48b82f52b65fa343a83c74a8f55f.tar.gz
cwm-f6fcd0eb5d2f48b82f52b65fa343a83c74a8f55f.tar.xz
cwm-f6fcd0eb5d2f48b82f52b65fa343a83c74a8f55f.zip
alter a few function returns and prototypes; found by lint.
ok oga@
Diffstat (limited to 'client.c')
-rw-r--r--client.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/client.c b/client.c
index a18ffcc..de6cb1b 100644
--- a/client.c
+++ b/client.c
@@ -137,7 +137,7 @@ client_new(Window win, struct screen_ctx *sc, int mapped)
 	return (cc);
 }
 
-int
+void
 client_delete(struct client_ctx *cc)
 {
 	struct screen_ctx	*sc = cc->sc;
@@ -189,8 +189,6 @@ client_delete(struct client_ctx *cc)
 
 	client_freehints(cc);
 	xfree(cc);
-
-	return (0);
 }
 
 void
@@ -550,9 +548,8 @@ client_setname(struct client_ctx *cc)
 	char		*newname;
 
 	if (!xu_getstrprop(cc->win, _NET_WM_NAME, &newname))
-		xu_getstrprop(cc->win, XA_WM_NAME, &newname);
-	if (newname == NULL)
-		newname = emptystring;
+		if (!xu_getstrprop(cc->win, XA_WM_NAME, &newname))
+			newname = emptystring;
 
 	TAILQ_FOREACH(wn, &cc->nameq, entry)
 		if (strcmp(wn->name, newname) == 0) {
@@ -580,11 +577,9 @@ match:
 		xfree(wn);
 		cc->nameqlen--;
 	}
-
-	return;
 }
 
-struct client_ctx *
+void
 client_cycle(struct screen_ctx *sc, int reverse)
 {
 	struct client_ctx	*oldcc, *newcc;
@@ -594,7 +589,7 @@ client_cycle(struct screen_ctx *sc, int reverse)
 
 	/* If no windows then you cant cycle */
 	if (TAILQ_EMPTY(&sc->mruq))
-		return (NULL);
+		return;
 
 	if (oldcc == NULL)
 		oldcc = (reverse ? TAILQ_LAST(&sc->mruq, cycle_entry_q) :
@@ -614,7 +609,7 @@ client_cycle(struct screen_ctx *sc, int reverse)
 		/* Is oldcc the only non-hidden window? */
 		if (newcc == oldcc) {
 			if (again)
-				return (NULL);	/* No windows visible. */
+				return;	/* No windows visible. */
 
 			break;
 		}
@@ -624,8 +619,6 @@ client_cycle(struct screen_ctx *sc, int reverse)
 	sc->altpersist = 1;
 	client_ptrsave(oldcc);
 	client_ptrwarp(newcc);
-
-	return (newcc);
 }
 
 static struct client_ctx *