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/meta.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'src/expr/meta.c') diff --git a/src/expr/meta.c b/src/expr/meta.c index 6b19764..4a7a83a 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c @@ -58,21 +58,11 @@ nft_rule_expr_meta_get(const struct nft_rule_expr *e, uint16_t type, switch(type) { case NFT_EXPR_META_KEY: - if (e->flags & (1 << NFT_EXPR_META_KEY)) { - *data_len = sizeof(meta->key); - return &meta->key; - } else - return NULL; - break; + *data_len = sizeof(meta->key); + return &meta->key; case NFT_EXPR_META_DREG: - if (e->flags & (1 << NFT_EXPR_META_DREG)) { - *data_len = sizeof(meta->dreg); - return &meta->dreg; - } else - return NULL; - break; - default: - break; + *data_len = sizeof(meta->dreg); + return &meta->dreg; } return NULL; } -- cgit v1.2.3