From 6cdc49ffbe0a672c27f4fffe831563b12a8e2e61 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 18 Jul 2013 20:01:27 +0200 Subject: src: simplify getter logic This patch refactors the getter code to simplify it. The default cases have been removed so gcc will spot a warning if an attribute is not handled appropriately. Signed-off-by: Pablo Neira Ayuso --- src/expr/lookup.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'src/expr/lookup.c') diff --git a/src/expr/lookup.c b/src/expr/lookup.c index 027f1b5..b9a803e 100644 --- a/src/expr/lookup.c +++ b/src/expr/lookup.c @@ -64,23 +64,13 @@ nft_rule_expr_lookup_get(const struct nft_rule_expr *e, uint16_t type, switch(type) { case NFT_EXPR_LOOKUP_SREG: - if (e->flags & (1 << NFT_EXPR_LOOKUP_SREG)) { - *data_len = sizeof(lookup->sreg); - return &lookup->sreg; - } - break; + *data_len = sizeof(lookup->sreg); + return &lookup->sreg; case NFT_EXPR_LOOKUP_DREG: - if (e->flags & (1 << NFT_EXPR_LOOKUP_DREG)) { - *data_len = sizeof(lookup->dreg); - return &lookup->dreg; - } - break; + *data_len = sizeof(lookup->dreg); + return &lookup->dreg; case NFT_EXPR_LOOKUP_SET: - if (e->flags & (1 << NFT_EXPR_LOOKUP_SET)) - return lookup->set_name; - break; - default: - break; + return lookup->set_name; } return NULL; } -- cgit v1.2.3