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/ct.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/expr/ct.c') diff --git a/src/expr/ct.c b/src/expr/ct.c index 8ca2167..fedb1f2 100644 --- a/src/expr/ct.c +++ b/src/expr/ct.c @@ -39,7 +39,7 @@ static int nft_rule_expr_ct_set(struct nft_rule_expr *e, uint16_t type, const void *data, size_t data_len) { - struct nft_expr_ct *ct = (struct nft_expr_ct *)e->data; + struct nft_expr_ct *ct = nft_expr_data(e); switch(type) { case NFT_EXPR_CT_KEY: @@ -61,7 +61,7 @@ static const void * nft_rule_expr_ct_get(const struct nft_rule_expr *e, uint16_t type, size_t *data_len) { - struct nft_expr_ct *ct = (struct nft_expr_ct *)e->data; + struct nft_expr_ct *ct = nft_expr_data(e); switch(type) { case NFT_EXPR_CT_KEY: @@ -122,7 +122,7 @@ static int nft_rule_expr_ct_cb(const struct nlattr *attr, void *data) static void nft_rule_expr_ct_build(struct nlmsghdr *nlh, struct nft_rule_expr *e) { - struct nft_expr_ct *ct = (struct nft_expr_ct *)e->data; + struct nft_expr_ct *ct = nft_expr_data(e); if (e->flags & (1 << NFT_EXPR_CT_KEY)) mnl_attr_put_u32(nlh, NFTA_CT_KEY, htonl(ct->key)); @@ -135,7 +135,7 @@ nft_rule_expr_ct_build(struct nlmsghdr *nlh, struct nft_rule_expr *e) static int nft_rule_expr_ct_parse(struct nft_rule_expr *e, struct nlattr *attr) { - struct nft_expr_ct *ct = (struct nft_expr_ct *)e->data; + struct nft_expr_ct *ct = nft_expr_data(e); struct nlattr *tb[NFTA_CT_MAX+1] = {}; if (mnl_attr_parse_nested(attr, nft_rule_expr_ct_cb, tb) < 0) @@ -195,7 +195,7 @@ static inline int str2ctkey(const char *ctkey) static int nft_rule_expr_ct_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree) { #ifdef XML_PARSING - struct nft_expr_ct *ct = (struct nft_expr_ct *)e->data; + struct nft_expr_ct *ct = nft_expr_data(e); mxml_node_t *node = NULL; uint64_t tmp; int32_t reg; @@ -248,7 +248,7 @@ static int nft_rule_expr_ct_snprintf(char *buf, size_t len, uint32_t type, uint32_t flags, struct nft_rule_expr *e) { - struct nft_expr_ct *ct = (struct nft_expr_ct *)e->data; + struct nft_expr_ct *ct = nft_expr_data(e); switch(type) { case NFT_RULE_O_DEFAULT: -- cgit v1.2.3