diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-13 21:56:06 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-13 21:56:50 +0200 |
| commit | 46439a3e8d6635a1461ff4c43665fb1425cadd1d (patch) | |
| tree | f17038dee8b57cca27ca00ac3b5a25d151ba4791 /src/expr/match.c | |
| parent | 4dd0772911a2c92a43d4e4aecf305fba498be106 (diff) | |
expr: add nft_expr_data to replace explicit casting to obtain expression data
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr/match.c')
| -rw-r--r-- | src/expr/match.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/expr/match.c b/src/expr/match.c index 8bc2878..ee894a1 100644 --- a/src/expr/match.c +++ b/src/expr/match.c @@ -38,7 +38,7 @@ static int nft_rule_expr_match_set(struct nft_rule_expr *e, uint16_t type, const void *data, size_t data_len) { - struct nft_expr_match *mt = (struct nft_expr_match *)e->data; + struct nft_expr_match *mt = nft_expr_data(e); switch(type) { case NFT_EXPR_MT_NAME: @@ -65,7 +65,7 @@ static const void * nft_rule_expr_match_get(const struct nft_rule_expr *e, uint16_t type, size_t *data_len) { - struct nft_expr_match *mt = (struct nft_expr_match *)e->data; + struct nft_expr_match *mt = nft_expr_data(e); switch(type) { case NFT_EXPR_MT_NAME: @@ -131,7 +131,7 @@ static int nft_rule_expr_match_cb(const struct nlattr *attr, void *data) static void nft_rule_expr_match_build(struct nlmsghdr *nlh, struct nft_rule_expr *e) { - struct nft_expr_match *mt = (struct nft_expr_match *)e->data; + struct nft_expr_match *mt = nft_expr_data(e); if (e->flags & (1 << NFT_EXPR_MT_NAME)) mnl_attr_put_strz(nlh, NFTA_MATCH_NAME, mt->name); @@ -143,7 +143,7 @@ nft_rule_expr_match_build(struct nlmsghdr *nlh, struct nft_rule_expr *e) static int nft_rule_expr_match_parse(struct nft_rule_expr *e, struct nlattr *attr) { - struct nft_expr_match *match = (struct nft_expr_match *)e->data; + struct nft_expr_match *match = nft_expr_data(e); struct nlattr *tb[NFTA_MATCH_MAX+1] = {}; if (mnl_attr_parse_nested(attr, nft_rule_expr_match_cb, tb) < 0) @@ -187,7 +187,7 @@ static int nft_rule_expr_match_parse(struct nft_rule_expr *e, struct nlattr *att static int nft_rule_expr_match_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree) { #ifdef XML_PARSING - struct nft_expr_match *mt = (struct nft_expr_match *)e->data; + struct nft_expr_match *mt = nft_expr_data(e); mxml_node_t *node = NULL; /* get and set <name>. Not mandatory */ @@ -238,7 +238,7 @@ static int nft_rule_expr_match_snprintf(char *buf, size_t len, uint32_t type, uint32_t flags, struct nft_rule_expr *e) { - struct nft_expr_match *match = (struct nft_expr_match *)e->data; + struct nft_expr_match *match = nft_expr_data(e); switch(type) { case NFT_RULE_O_DEFAULT: |