src: rename NFTNL_RULE_EXPR_ATTR to NFTNL_EXPR_

So we get a shorter constant definition for expression attributes.

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

2 files changed, 28 insertions, 28 deletions

diff --git a/include/libnftnl/expr.h b/include/libnftnl/expr.h
index 0600860..d9090ff 100644
--- a/include/libnftnl/expr.h
+++ b/include/libnftnl/expr.h
@@ -1,5 +1,5 @@
-#ifndef _LIBNFTNL_RULE_EXPR_H_
-#define _LIBNFTNL_RULE_EXPR_H_
+#ifndef _LIBNFTNL_EXPR_H_
+#define _LIBNFTNL_EXPR_H_
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -12,8 +12,8 @@ extern "C" {
 struct nftnl_expr;
 
 enum {
-	NFTNL_RULE_EXPR_ATTR_NAME = 0,
-	NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_NAME = 0,
+	NFTNL_EXPR_BASE,
 };
 
 struct nftnl_expr *nftnl_expr_alloc(const char *name);
@@ -39,38 +39,38 @@ const char *nftnl_expr_get_str(const struct nftnl_expr *expr, uint16_t type);
 int nftnl_expr_snprintf(char *buf, size_t buflen, struct nftnl_expr *expr, uint32_t type, uint32_t flags);
 
 enum {
-	NFTNL_EXPR_PAYLOAD_DREG	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_PAYLOAD_DREG	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_PAYLOAD_BASE,
 	NFTNL_EXPR_PAYLOAD_OFFSET,
 	NFTNL_EXPR_PAYLOAD_LEN,
 };
 
 enum {
-	NFTNL_EXPR_META_KEY	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_META_KEY	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_META_DREG,
 	NFTNL_EXPR_META_SREG,
 };
 
 enum {
-	NFTNL_EXPR_CMP_SREG	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_CMP_SREG	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_CMP_OP,
 	NFTNL_EXPR_CMP_DATA,
 };
 
 enum {
-	NFTNL_EXPR_IMM_DREG	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_IMM_DREG	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_IMM_DATA,
 	NFTNL_EXPR_IMM_VERDICT,
 	NFTNL_EXPR_IMM_CHAIN,
 };
 
 enum {
-	NFTNL_EXPR_CTR_PACKETS	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_CTR_PACKETS	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_CTR_BYTES,
 };
 
 enum {
-	NFTNL_EXPR_BITWISE_SREG	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_BITWISE_SREG	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_BITWISE_DREG,
 	NFTNL_EXPR_BITWISE_LEN,
 	NFTNL_EXPR_BITWISE_MASK,
@@ -78,19 +78,19 @@ enum {
 };
 
 enum {
-	NFTNL_EXPR_TG_NAME	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_TG_NAME	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_TG_REV,
 	NFTNL_EXPR_TG_INFO,
 };
 
 enum {
-	NFTNL_EXPR_MT_NAME	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_MT_NAME	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_MT_REV,
 	NFTNL_EXPR_MT_INFO,
 };
 
 enum {
-	NFTNL_EXPR_NAT_TYPE		= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_NAT_TYPE		= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_NAT_FAMILY,
 	NFTNL_EXPR_NAT_REG_ADDR_MIN,
 	NFTNL_EXPR_NAT_REG_ADDR_MAX,
@@ -100,14 +100,14 @@ enum {
 };
 
 enum {
-	NFTNL_EXPR_LOOKUP_SREG	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_LOOKUP_SREG	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_LOOKUP_DREG,
 	NFTNL_EXPR_LOOKUP_SET,
 	NFTNL_EXPR_LOOKUP_SET_ID,
 };
 
 enum {
-	NFTNL_EXPR_DYNSET_SREG_KEY	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_DYNSET_SREG_KEY	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_DYNSET_SREG_DATA,
 	NFTNL_EXPR_DYNSET_OP,
 	NFTNL_EXPR_DYNSET_TIMEOUT,
@@ -117,7 +117,7 @@ enum {
 };
 
 enum {
-	NFTNL_EXPR_LOG_PREFIX	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_LOG_PREFIX	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_LOG_GROUP,
 	NFTNL_EXPR_LOG_SNAPLEN,
 	NFTNL_EXPR_LOG_QTHRESHOLD,
@@ -126,21 +126,21 @@ enum {
 };
 
 enum {
-	NFTNL_EXPR_EXTHDR_DREG	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_EXTHDR_DREG	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_EXTHDR_TYPE,
 	NFTNL_EXPR_EXTHDR_OFFSET,
 	NFTNL_EXPR_EXTHDR_LEN,
 };
 
 enum {
-	NFTNL_EXPR_CT_DREG	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_CT_DREG	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_CT_KEY,
 	NFTNL_EXPR_CT_DIR,
 	NFTNL_EXPR_CT_SREG,
 };
 
 enum {
-	NFTNL_EXPR_BYTEORDER_DREG	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_BYTEORDER_DREG	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_BYTEORDER_SREG,
 	NFTNL_EXPR_BYTEORDER_OP,
 	NFTNL_EXPR_BYTEORDER_LEN,
@@ -148,27 +148,27 @@ enum {
 };
 
 enum {
-	NFTNL_EXPR_LIMIT_RATE	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_LIMIT_RATE	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_LIMIT_UNIT,
 };
 
 enum {
-	NFTNL_EXPR_REJECT_TYPE	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_REJECT_TYPE	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_REJECT_CODE,
 };
 
 enum {
-	NFTNL_EXPR_QUEUE_NUM	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_QUEUE_NUM	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_QUEUE_TOTAL,
 	NFTNL_EXPR_QUEUE_FLAGS,
 };
 
 enum {
-	NFTNL_EXPR_MASQ_FLAGS	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_MASQ_FLAGS	= NFTNL_EXPR_BASE,
 };
 
 enum {
-	NFTNL_EXPR_REDIR_REG_PROTO_MIN	= NFTNL_RULE_EXPR_ATTR_BASE,
+	NFTNL_EXPR_REDIR_REG_PROTO_MIN	= NFTNL_EXPR_BASE,
 	NFTNL_EXPR_REDIR_REG_PROTO_MAX,
 	NFTNL_EXPR_REDIR_FLAGS,
 };
@@ -345,4 +345,4 @@ enum {
 } /* extern "C" */
 #endif
 
-#endif /* _LIBNFTNL_RULE_EXPR_H_ */
+#endif /* _LIBNFTNL_EXPR_H_ */
diff --git a/src/expr.c b/src/expr.c
index 994c239..3249a5c 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -38,7 +38,7 @@ struct nftnl_expr *nftnl_expr_alloc(const char *name)
 		return NULL;
 
 	/* Manually set expression name attribute */
-	expr->flags |= (1 << NFTNL_RULE_EXPR_ATTR_NAME);
+	expr->flags |= (1 << NFTNL_EXPR_NAME);
 	expr->ops = ops;
 
 	return expr;
@@ -65,7 +65,7 @@ nftnl_expr_set(struct nftnl_expr *expr, uint16_t type,
 		  const void *data, uint32_t data_len)
 {
 	switch(type) {
-	case NFTNL_RULE_EXPR_ATTR_NAME:	/* cannot be modified */
+	case NFTNL_EXPR_NAME:	/* cannot be modified */
 		return;
 	default:
 		if (expr->ops->set(expr, type, data, data_len) < 0)
@@ -119,7 +119,7 @@ const void *nftnl_expr_get(const struct nftnl_expr *expr,
 		return NULL;
 
 	switch(type) {
-	case NFTNL_RULE_EXPR_ATTR_NAME:
+	case NFTNL_EXPR_NAME:
 		ret = expr->ops->name;
 		break;
 	default: