expr: refactor nft_rule_expr_get

Merge common checking for attribute set in nft_rule_expr_get.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

1 files changed, 6 insertions, 8 deletions

diff --git a/src/expr.c b/src/expr.c
index d2d345c..84fd64b 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -102,21 +102,19 @@ nft_rule_expr_set_str(struct nft_rule_expr *expr, uint16_t type, const char *str
 }
 EXPORT_SYMBOL(nft_rule_expr_set_str);
 
-const void *nft_rule_expr_get(const struct nft_rule_expr *expr, uint16_t type, size_t *data_len)
+const void *nft_rule_expr_get(const struct nft_rule_expr *expr,
+			      uint16_t type, size_t *data_len)
 {
-	const void *ret = NULL;
+	const void *ret;
+
+	if (!(expr->flags & (1 << type)))
+		return NULL;
 
 	switch(type) {
 	case NFT_RULE_EXPR_ATTR_NAME:
-		if (!(expr->flags & (1 << NFT_RULE_EXPR_ATTR_NAME)))
-			return NULL;
-
 		ret = expr->ops->name;
 		break;
 	default:
-		if (!(expr->flags & (1 << type)))
-			return NULL;
-
 		ret = expr->ops->get(expr, type, data_len);
 		break;
 	}