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/ct.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'src/expr/ct.c') diff --git a/src/expr/ct.c b/src/expr/ct.c index fedb1f2..f399219 100644 --- a/src/expr/ct.c +++ b/src/expr/ct.c @@ -65,28 +65,14 @@ nft_rule_expr_ct_get(const struct nft_rule_expr *e, uint16_t type, switch(type) { case NFT_EXPR_CT_KEY: - if (e->flags & (1 << NFT_EXPR_CT_KEY)) { - *data_len = sizeof(ct->key); - return &ct->key; - } else - return NULL; - break; + *data_len = sizeof(ct->key); + return &ct->key; case NFT_EXPR_CT_DIR: - if (e->flags & (1 << NFT_EXPR_CT_DIR)) { - *data_len = sizeof(ct->dir); - return &ct->dir; - } else - return NULL; - break; + *data_len = sizeof(ct->dir); + return &ct->dir; case NFT_EXPR_CT_DREG: - if (e->flags & (1 << NFT_EXPR_CT_DREG)) { - *data_len = sizeof(ct->dreg); - return &ct->dreg; - } else - return NULL; - break; - default: - break; + *data_len = sizeof(ct->dreg); + return &ct->dreg; } return NULL; } -- cgit v1.2.3