summary refs log tree commit diff
path: root/parse.y
diff options
context:
space:
mode:
authorokan <okan>2009-01-11 21:33:45 +0000
committerokan <okan>2009-01-11 21:33:45 +0000
commit0aca400461ed99c9b8e3bcc6c8e1d5ebb6eb7b12 (patch)
tree5a9900dd36e0caf878e6e356a39293c1fe666807 /parse.y
parent590169ce240e38bb9a90fc178f2fce65afb7bef0 (diff)
downloadcwm-0aca400461ed99c9b8e3bcc6c8e1d5ebb6eb7b12.tar.gz
cwm-0aca400461ed99c9b8e3bcc6c8e1d5ebb6eb7b12.tar.xz
cwm-0aca400461ed99c9b8e3bcc6c8e1d5ebb6eb7b12.zip
better comparison idiom; found with -Wall
ok oga@
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y20
1 files changed, 10 insertions, 10 deletions
diff --git a/parse.y b/parse.y
index 82ca689..d0d05d7 100644
--- a/parse.y
+++ b/parse.y
@@ -471,17 +471,17 @@ conf_clear(struct conf *c)
 	struct cmd		*cmd;
 	struct mousebinding	*mb;
 
-	while (cmd = TAILQ_FIRST(&c->cmdq)) {
+	while ((cmd = TAILQ_FIRST(&c->cmdq)) != NULL) {
 		TAILQ_REMOVE(&c->cmdq, cmd, entry);
 		free(cmd);
 	}
 
-	while (kb = TAILQ_FIRST(&c->keybindingq)) {
+	while ((kb = TAILQ_FIRST(&c->keybindingq)) != NULL) {
 		TAILQ_REMOVE(&c->keybindingq, kb, entry);
 		free(kb);
 	}
 
-	while (ag = TAILQ_FIRST(&c->autogroupq)) {
+	while ((ag = TAILQ_FIRST(&c->autogroupq)) != NULL) {
 		TAILQ_REMOVE(&c->autogroupq, ag, entry);
 		free(ag->class);
 		if (ag->name)
@@ -490,12 +490,12 @@ conf_clear(struct conf *c)
 		free(ag);
 	}
 
-	while (wm = TAILQ_FIRST(&c->ignoreq)) {
+	while ((wm = TAILQ_FIRST(&c->ignoreq)) != NULL) {
 		TAILQ_REMOVE(&c->ignoreq, wm, entry);
 		free(wm);
 	}
 
-	while (mb = TAILQ_FIRST(&c->mousebindingq)) {
+	while ((mb = TAILQ_FIRST(&c->mousebindingq)) != NULL) {
 		TAILQ_REMOVE(&c->mousebindingq, mb, entry);
 		free(mb);
 	}
@@ -541,27 +541,27 @@ parse_config(const char *filename, struct conf *xconf)
 
 		xconf->flags = conf->flags;
 
-		while (cmd = TAILQ_FIRST(&conf->cmdq)) {
+		while ((cmd = TAILQ_FIRST(&conf->cmdq)) != NULL) {
 			TAILQ_REMOVE(&conf->cmdq, cmd, entry);
 			TAILQ_INSERT_TAIL(&xconf->cmdq, cmd, entry);
 		}
 
-		while (kb = TAILQ_FIRST(&conf->keybindingq)) {
+		while ((kb = TAILQ_FIRST(&conf->keybindingq)) != NULL) {
 			TAILQ_REMOVE(&conf->keybindingq, kb, entry);
 			TAILQ_INSERT_TAIL(&xconf->keybindingq, kb, entry);
 		}
 
-		while (ag = TAILQ_FIRST(&conf->autogroupq)) {
+		while ((ag = TAILQ_FIRST(&conf->autogroupq)) != NULL) {
 			TAILQ_REMOVE(&conf->autogroupq, ag, entry);
 			TAILQ_INSERT_TAIL(&xconf->autogroupq, ag, entry);
 		}
 
-		while (wm = TAILQ_FIRST(&conf->ignoreq)) {
+		while ((wm = TAILQ_FIRST(&conf->ignoreq)) != NULL) {
 			TAILQ_REMOVE(&conf->ignoreq, wm, entry);
 			TAILQ_INSERT_TAIL(&xconf->ignoreq, wm, entry);
 		}
 
-		while (mb = TAILQ_FIRST(&conf->mousebindingq)) {
+		while ((mb = TAILQ_FIRST(&conf->mousebindingq)) != NULL) {
 			TAILQ_REMOVE(&conf->mousebindingq, mb, entry);
 			TAILQ_INSERT_TAIL(&xconf->mousebindingq, mb, entry);
 		}