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/counter.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'src/expr/counter.c') diff --git a/src/expr/counter.c b/src/expr/counter.c index 8521a22..8b2542d 100644 --- a/src/expr/counter.c +++ b/src/expr/counter.c @@ -55,21 +55,11 @@ nft_rule_expr_counter_get(const struct nft_rule_expr *e, uint16_t type, switch(type) { case NFT_EXPR_CTR_BYTES: - if (e->flags & (1 << NFT_EXPR_CTR_BYTES)) { - *data_len = sizeof(ctr->bytes); - return &ctr->bytes; - } else - return NULL; - break; + *data_len = sizeof(ctr->bytes); + return &ctr->bytes; case NFT_EXPR_CTR_PACKETS: - if (e->flags & (1 << NFT_EXPR_CTR_PACKETS)) { - *data_len = sizeof(ctr->pkts); - return &ctr->pkts; - } else - return NULL; - break; - default: - break; + *data_len = sizeof(ctr->pkts); + return &ctr->pkts; } return NULL; } -- cgit v1.2.3