From 46439a3e8d6635a1461ff4c43665fb1425cadd1d Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 13 Jul 2013 21:56:06 +0200 Subject: expr: add nft_expr_data to replace explicit casting to obtain expression data Signed-off-by: Pablo Neira Ayuso --- src/expr/lookup.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/expr/lookup.c') diff --git a/src/expr/lookup.c b/src/expr/lookup.c index 9495ab0..027f1b5 100644 --- a/src/expr/lookup.c +++ b/src/expr/lookup.c @@ -37,7 +37,7 @@ static int nft_rule_expr_lookup_set(struct nft_rule_expr *e, uint16_t type, const void *data, size_t data_len) { - struct nft_expr_lookup *lookup = (struct nft_expr_lookup *)e->data; + struct nft_expr_lookup *lookup = nft_expr_data(e); switch(type) { case NFT_EXPR_LOOKUP_SREG: @@ -60,7 +60,7 @@ static const void * nft_rule_expr_lookup_get(const struct nft_rule_expr *e, uint16_t type, size_t *data_len) { - struct nft_expr_lookup *lookup = (struct nft_expr_lookup *)e->data; + struct nft_expr_lookup *lookup = nft_expr_data(e); switch(type) { case NFT_EXPR_LOOKUP_SREG: @@ -116,7 +116,7 @@ static int nft_rule_expr_lookup_cb(const struct nlattr *attr, void *data) static void nft_rule_expr_lookup_build(struct nlmsghdr *nlh, struct nft_rule_expr *e) { - struct nft_expr_lookup *lookup = (struct nft_expr_lookup *)e->data; + struct nft_expr_lookup *lookup = nft_expr_data(e); if (e->flags & (1 << NFT_EXPR_LOOKUP_SREG)) mnl_attr_put_u32(nlh, NFTA_LOOKUP_SREG, htonl(lookup->sreg)); @@ -129,7 +129,7 @@ nft_rule_expr_lookup_build(struct nlmsghdr *nlh, struct nft_rule_expr *e) static int nft_rule_expr_lookup_parse(struct nft_rule_expr *e, struct nlattr *attr) { - struct nft_expr_lookup *lookup = (struct nft_expr_lookup *)e->data; + struct nft_expr_lookup *lookup = nft_expr_data(e); struct nlattr *tb[NFTA_LOOKUP_MAX+1] = {}; int ret = 0; @@ -156,7 +156,7 @@ static int nft_rule_expr_lookup_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree) { #ifdef XML_PARSING - struct nft_expr_lookup *lookup = (struct nft_expr_lookup *)e->data; + struct nft_expr_lookup *lookup = nft_expr_data(e); mxml_node_t *node = NULL; int32_t reg; @@ -235,7 +235,7 @@ static int nft_rule_expr_lookup_snprintf(char *buf, size_t size, uint32_t type, uint32_t flags, struct nft_rule_expr *e) { - struct nft_expr_lookup *lookup = (struct nft_expr_lookup *)e->data; + struct nft_expr_lookup *lookup = nft_expr_data(e); switch(type) { case NFT_RULE_O_DEFAULT: -- cgit v1.2.3