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/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;
 }