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/immediate.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/immediate.c')
-rw-r--r-- | src/expr/immediate.c | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/src/expr/immediate.c b/src/expr/immediate.c index 8177766..48e9d1e 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -64,35 +64,17 @@ nft_rule_expr_immediate_get(const struct nft_rule_expr *e, uint16_t type, switch(type) { case NFT_EXPR_IMM_DREG: - if (e->flags & (1 << NFT_EXPR_IMM_DREG)) { - *data_len = sizeof(imm->dreg); - return &imm->dreg; - } else - return NULL; - break; + *data_len = sizeof(imm->dreg); + return &imm->dreg; case NFT_EXPR_IMM_DATA: - if (e->flags & (1 << NFT_EXPR_IMM_DATA)) { - *data_len = imm->data.len; - return &imm->data.val; - } else - return NULL; - break; + *data_len = imm->data.len; + return &imm->data.val; case NFT_EXPR_IMM_VERDICT: - if (e->flags & (1 << NFT_EXPR_IMM_VERDICT)) { - *data_len = sizeof(imm->data.verdict); - return &imm->data.verdict; - } else - return NULL; - break; + *data_len = sizeof(imm->data.verdict); + return &imm->data.verdict; case NFT_EXPR_IMM_CHAIN: - if (e->flags & (1 << NFT_EXPR_IMM_CHAIN)) { - *data_len = strlen(imm->data.chain)+1; - return imm->data.chain; - } else - return NULL; - break; - default: - break; + *data_len = strlen(imm->data.chain)+1; + return imm->data.chain; } return NULL; } |