diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-18 20:01:27 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-18 20:08:25 +0200 |
commit | 6cdc49ffbe0a672c27f4fffe831563b12a8e2e61 (patch) | |
tree | 76e1b5318bfdd9627f8ab5138293cbe569c25da4 /src/expr/match.c | |
parent | 5ecac519cd78043d0a5bfead1922a683d32db9d2 (diff) |
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 <pablo@netfilter.org>
Diffstat (limited to 'src/expr/match.c')
-rw-r--r-- | src/expr/match.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/src/expr/match.c b/src/expr/match.c index ee894a1..d7d9c5b 100644 --- a/src/expr/match.c +++ b/src/expr/match.c @@ -69,28 +69,14 @@ nft_rule_expr_match_get(const struct nft_rule_expr *e, uint16_t type, switch(type) { case NFT_EXPR_MT_NAME: - if (e->flags & (1 << NFT_EXPR_MT_NAME)) { - *data_len = sizeof(mt->name); - return mt->name; - } else - return NULL; - break; + *data_len = sizeof(mt->name); + return mt->name; case NFT_EXPR_MT_REV: - if (e->flags & (1 << NFT_EXPR_MT_REV)) { - *data_len = sizeof(mt->rev); - return &mt->rev; - } else - return NULL; - break; + *data_len = sizeof(mt->rev); + return &mt->rev; case NFT_EXPR_MT_INFO: - if (e->flags & (1 << NFT_EXPR_MT_INFO)) { - *data_len = mt->data_len; - return mt->data; - } else - return NULL; - break; - default: - break; + *data_len = mt->data_len; + return mt->data; } return NULL; } |