From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 23 Aug 2013 23:54:09 +0000 (+0100)
Subject: Do not use calculations in macroes.
X-Git-Tag: 0.6.0~202
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=231c62a4d17fba802eccb2767ee0c77aa3a8ce9f;p=thirdparty%2Frspamd.git

Do not use calculations in macroes.
---

diff --git a/src/bloom.c b/src/bloom.c
index 3db8faa9c1..d74d395c97 100644
--- a/src/bloom.c
+++ b/src/bloom.c
@@ -204,9 +204,11 @@ bloom_add (bloom_filter_t * bloom, const gchar *s)
 {
 	size_t                          n;
 	u_char                          t;
+	guint                           v;
 
 	for (n = 0; n < bloom->nfuncs; ++n) {
-		INCBIT (bloom->a, bloom->funcs[n] (s) % bloom->asize, t);
+		v = bloom->funcs[n] (s) % bloom->asize;
+		INCBIT (bloom->a, v, t);
 	}
 
 	return TRUE;
@@ -217,9 +219,11 @@ bloom_del (bloom_filter_t * bloom, const gchar *s)
 {
 	size_t                          n;
 	u_char                          t;
+	guint                           v;
 
 	for (n = 0; n < bloom->nfuncs; ++n) {
-		DECBIT (bloom->a, bloom->funcs[n] (s) % bloom->asize, t);
+		v = bloom->funcs[n] (s) % bloom->asize;
+		DECBIT (bloom->a, v, t);
 	}
 
 	return TRUE;
@@ -230,9 +234,11 @@ gboolean
 bloom_check (bloom_filter_t * bloom, const gchar *s)
 {
 	size_t                          n;
+	guint                           v;
 
 	for (n = 0; n < bloom->nfuncs; ++n) {
-		if (!(GETBIT (bloom->a, bloom->funcs[n] (s) % bloom->asize)))
+		v = bloom->funcs[n] (s) % bloom->asize;
+		if (!(GETBIT (bloom->a, v)))
 			return FALSE;
 	}