diff options
author | Florian Westphal <fw@strlen.de> | 2019-02-08 17:02:19 +0100 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2019-02-08 21:22:21 +0100 |
commit | 68e76238749fb238bf92e7dc8903fed15a86aa1b (patch) | |
tree | 9d968dd70b1c214ac28cd48b794699291a81ffc9 /src/expression.c | |
parent | a80997fa9a290462c5d001c5d448ddb2fbd7da5c (diff) |
src: expr: add and use expr_name helper
Currently callers use expr->ops->name, but follouwp patch will remove the
ops pointer from struct expr. So add this helper and use it everywhere.
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expression.c')
-rw-r--r-- | src/expression.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/expression.c b/src/expression.c index 62a6f890..37b106f8 100644 --- a/src/expression.c +++ b/src/expression.c @@ -87,6 +87,11 @@ bool expr_cmp(const struct expr *e1, const struct expr *e2) return e1->ops->cmp(e1, e2); } +const char *expr_name(const struct expr *e) +{ + return e->ops->name; +} + void expr_describe(const struct expr *expr, struct output_ctx *octx) { const struct datatype *dtype = expr->dtype; @@ -1106,7 +1111,7 @@ void range_expr_value_low(mpz_t rop, const struct expr *expr) case EXPR_SET_ELEM: return range_expr_value_low(rop, expr->key); default: - BUG("invalid range expression type %s\n", expr->ops->name); + BUG("invalid range expression type %s\n", expr_name(expr)); } } @@ -1130,6 +1135,6 @@ void range_expr_value_high(mpz_t rop, const struct expr *expr) case EXPR_SET_ELEM: return range_expr_value_high(rop, expr->key); default: - BUG("invalid range expression type %s\n", expr->ops->name); + BUG("invalid range expression type %s\n", expr_name(expr)); } } |