diff options
| author | Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com> | 2012-08-02 00:31:35 +0000 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-08-03 11:38:56 +0200 |
| commit | e5990b016a7c7d17e0dac1cadb6e8bc2c91610b0 (patch) | |
| tree | 588ba199e7e3682cba188cf7bea5c1757215d2cb /src/evaluate.c | |
| parent | 1f9ce119666902e92619ee648395fed3147d18a3 (diff) | |
expression: Differentiate expr among anonymous structures in struct expr
This fixes compilation with gcc-4.7
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/evaluate.c')
| -rw-r--r-- | src/evaluate.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index a371c24a..da3a0d4e 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -291,9 +291,9 @@ static int expr_evaluate_prefix(struct eval_ctx *ctx, struct expr **expr) { struct expr *prefix = *expr, *base, *and, *mask; - if (expr_evaluate(ctx, &prefix->expr) < 0) + if (expr_evaluate(ctx, &prefix->prefix) < 0) return -1; - base = prefix->expr; + base = prefix->prefix; if (!expr_is_constant(base)) return expr_error(ctx, prefix, @@ -317,10 +317,10 @@ static int expr_evaluate_prefix(struct eval_ctx *ctx, struct expr **expr) mpz_prefixmask(mask->value, base->len, prefix->prefix_len); and = binop_expr_alloc(&prefix->location, OP_AND, base, mask); - prefix->expr = and; - if (expr_evaluate(ctx, &prefix->expr) < 0) + prefix->prefix = and; + if (expr_evaluate(ctx, &prefix->prefix) < 0) return -1; - base = prefix->expr; + base = prefix->prefix; assert(expr_is_constant(base)); prefix->dtype = base->dtype; @@ -656,10 +656,10 @@ static int expr_evaluate_map(struct eval_ctx *ctx, struct expr **expr) struct expr_ctx ectx = ctx->ectx; struct expr *map = *expr, *mappings; - if (expr_evaluate(ctx, &map->expr) < 0) + if (expr_evaluate(ctx, &map->map) < 0) return -1; - if (expr_is_constant(map->expr)) - return expr_error(ctx, map->expr, + if (expr_is_constant(map->map)) + return expr_error(ctx, map->map, "Map expression can not be constant"); mappings = map->mappings; @@ -695,7 +695,7 @@ static int expr_evaluate_map(struct eval_ctx *ctx, struct expr **expr) /* Data for range lookups needs to be in big endian order */ if (map->mappings->set_flags & SET_F_INTERVAL && - byteorder_conversion(ctx, &map->expr, BYTEORDER_BIG_ENDIAN) < 0) + byteorder_conversion(ctx, &map->map, BYTEORDER_BIG_ENDIAN) < 0) return -1; return 0; @@ -895,7 +895,7 @@ static int expr_evaluate_relational(struct eval_ctx *ctx, struct expr **expr) case EXPR_RANGE: goto range; case EXPR_PREFIX: - if (byteorder_conversion(ctx, &right->expr, left->byteorder) < 0) + if (byteorder_conversion(ctx, &right->prefix, left->byteorder) < 0) return -1; break; case EXPR_VALUE: |