mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-24 23:31:40 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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]
This commit is contained in:
Willy Tarreau 2015-05-04 17:18:42 +02:00
parent 6eac32ebc1
commit aee9314e71
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pattern.c
View File

@ -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);