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>

1 files changed, 6 insertions, 20 deletions

diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index 2fa9bf5..cbc08ec 100644
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -61,28 +61,14 @@ nft_rule_expr_cmp_get(const struct nft_rule_expr *e, uint16_t type,
 
 	switch(type) {
 	case NFT_EXPR_CMP_SREG:
-		if (e->flags & (1 << NFT_EXPR_CMP_SREG)) {
-			*data_len = sizeof(cmp->sreg);
-			return &cmp->sreg;
-		} else
-			return NULL;
-		break;
+		*data_len = sizeof(cmp->sreg);
+		return &cmp->sreg;
 	case NFT_EXPR_CMP_OP:
-		if (e->flags & (1 << NFT_EXPR_CMP_OP)) {
-			*data_len = sizeof(cmp->op);
-			return &cmp->op;
-		} else
-			return NULL;
-		break;
+		*data_len = sizeof(cmp->op);
+		return &cmp->op;
 	case NFT_EXPR_CMP_DATA:
-		if (e->flags & (1 << NFT_EXPR_CMP_DATA)) {
-			*data_len = cmp->data.len;
-			return &cmp->data.val;
-		} else
-			return NULL;
-		break;
-	default:
-		break;
+		*data_len = cmp->data.len;
+		return &cmp->data.val;
 	}
 	return NULL;
 }