about summary refs log tree commit diff
path: root/mpick.c
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2016-07-31 16:51:49 +0200
committerDuncaen <mail@duncano.de>2017-01-20 23:30:54 +0100
commitafdfd07fe459aa50a6194355ed8984b6cee4a1ee (patch)
treeede9944975cfb3f4c70058f67d2cd7318228f2e6 /mpick.c
parentb93b9303da2bc819d74b01b937300ee29f6323ff (diff)
downloadmblaze-afdfd07fe459aa50a6194355ed8984b6cee4a1ee.tar.gz
mblaze-afdfd07fe459aa50a6194355ed8984b6cee4a1ee.tar.xz
mblaze-afdfd07fe459aa50a6194355ed8984b6cee4a1ee.zip
mpick: fix reuse of num
Diffstat (limited to 'mpick.c')
-rw-r--r--mpick.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/mpick.c b/mpick.c
index 2ac5e49..ba70951 100644
--- a/mpick.c
+++ b/mpick.c
@@ -796,7 +796,7 @@ eval(struct expr *e, struct mailinfo *m)
 	case EXPR_GT:
 	case EXPR_ALLSET:
 	case EXPR_ANYSET: {
-		long v = 0, num;
+		long v = 0, n;
 
 		if (!m->sb && (
 		    e->a.prop == PROP_ATIME ||
@@ -813,14 +813,14 @@ eval(struct expr *e, struct mailinfo *m)
 			switch (e->b.var) {
 			case VAR_CUR:
 				if (!cur_idx)
-					num = (e->op == EXPR_LT || e->op == EXPR_LE) ? LONG_MAX : -1;
+					n = (e->op == EXPR_LT || e->op == EXPR_LE) ? LONG_MAX : -1;
 				else
-					num = cur_idx;
+					n = cur_idx;
 				break;
-			default: num = 0;
+			default: n = 0;
 			}
 		} else {
-			num = e->b.num;
+			n = e->b.num;
 		}
 
 		switch (e->a.prop) {
@@ -838,14 +838,14 @@ eval(struct expr *e, struct mailinfo *m)
 		}
 
 		switch (e->op) {
-		case EXPR_LT: return v < num;
-		case EXPR_LE: return v <= num;
-		case EXPR_EQ: return v == num;
-		case EXPR_NEQ: return v != num;
-		case EXPR_GE: return v >= num;
-		case EXPR_GT: return v > num;
-		case EXPR_ALLSET: return (v & num) == num;
-		case EXPR_ANYSET: return (v & num) > 0;
+		case EXPR_LT: return v < n;
+		case EXPR_LE: return v <= n;
+		case EXPR_EQ: return v == n;
+		case EXPR_NEQ: return v != n;
+		case EXPR_GE: return v >= n;
+		case EXPR_GT: return v > n;
+		case EXPR_ALLSET: return (v & n) == n;
+		case EXPR_ANYSET: return (v & n) > 0;
 		}
 	}
 	case EXPR_STREQ: