]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: pattern: fix build warnings introduced in the LRU cache
authorWilly Tarreau <w@1wt.eu>
Mon, 4 May 2015 15:18:42 +0000 (17:18 +0200)
committerWilly Tarreau <w@1wt.eu>
Mon, 4 May 2015 15:18:42 +0000 (17:18 +0200)
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]

src/pattern.c

index cbfa20db109d811c8722c9c048802c680cefc0b4..656c190658df1c5f03c6a68ca37d11bb2ef7e429 100644 (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);