From: Willy Tarreau <w@1wt.eu>
Date: Mon, 4 May 2015 15:18:42 +0000 (+0200)
Subject: BUILD: pattern: fix build warnings introduced in the LRU cache
X-Git-Tag: v1.6-dev2~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aee9314e71b49854220881f0326b78a53f283998;p=thirdparty%2Fhaproxy.git

BUILD: pattern: fix build warnings introduced in the LRU cache

They're caused by the cast to long long from ptr in 32-bit.

src/pattern.c: In function 'pat_match_str':
src/pattern.c:479:44: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
---

diff --git a/src/pattern.c b/src/pattern.c
index cbfa20db10..656c190658 100644
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -476,7 +476,7 @@ struct pattern *pat_match_str(struct sample *smp, struct pattern_expr *expr, int
 
 	/* look in the list */
 	if (pat_lru_tree) {
-		unsigned long long seed = pat_lru_seed ^ (unsigned long long)expr;
+		unsigned long long seed = pat_lru_seed ^ (long)expr;
 
 		lru = lru64_get(XXH64(smp->data.str.str, smp->data.str.len, seed),
 				pat_lru_tree, expr, expr->revision);
@@ -513,7 +513,7 @@ struct pattern *pat_match_bin(struct sample *smp, struct pattern_expr *expr, int
 	struct lru64 *lru = NULL;
 
 	if (pat_lru_tree) {
-		unsigned long long seed = pat_lru_seed ^ (unsigned long long)expr;
+		unsigned long long seed = pat_lru_seed ^ (long)expr;
 
 		lru = lru64_get(XXH64(smp->data.str.str, smp->data.str.len, seed),
 				pat_lru_tree, expr, expr->revision);
@@ -550,7 +550,7 @@ struct pattern *pat_match_reg(struct sample *smp, struct pattern_expr *expr, int
 	struct lru64 *lru = NULL;
 
 	if (pat_lru_tree) {
-		unsigned long long seed = pat_lru_seed ^ (unsigned long long)expr;
+		unsigned long long seed = pat_lru_seed ^ (long)expr;
 
 		lru = lru64_get(XXH64(smp->data.str.str, smp->data.str.len, seed),
 				pat_lru_tree, expr, expr->revision);
@@ -610,7 +610,7 @@ struct pattern *pat_match_beg(struct sample *smp, struct pattern_expr *expr, int
 
 	/* look in the list */
 	if (pat_lru_tree) {
-		unsigned long long seed = pat_lru_seed ^ (unsigned long long)expr;
+		unsigned long long seed = pat_lru_seed ^ (long)expr;
 
 		lru = lru64_get(XXH64(smp->data.str.str, smp->data.str.len, seed),
 				pat_lru_tree, expr, expr->revision);
@@ -649,7 +649,7 @@ struct pattern *pat_match_end(struct sample *smp, struct pattern_expr *expr, int
 	struct lru64 *lru = NULL;
 
 	if (pat_lru_tree) {
-		unsigned long long seed = pat_lru_seed ^ (unsigned long long)expr;
+		unsigned long long seed = pat_lru_seed ^ (long)expr;
 
 		lru = lru64_get(XXH64(smp->data.str.str, smp->data.str.len, seed),
 				pat_lru_tree, expr, expr->revision);
@@ -692,7 +692,7 @@ struct pattern *pat_match_sub(struct sample *smp, struct pattern_expr *expr, int
 	struct lru64 *lru = NULL;
 
 	if (pat_lru_tree) {
-		unsigned long long seed = pat_lru_seed ^ (unsigned long long)expr;
+		unsigned long long seed = pat_lru_seed ^ (long)expr;
 
 		lru = lru64_get(XXH64(smp->data.str.str, smp->data.str.len, seed),
 				pat_lru_tree, expr, expr->revision);