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/counter.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/counter.c')
| -rw-r--r-- | src/expr/counter.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/expr/counter.c b/src/expr/counter.c index e32a46c..8521a22 100644 --- a/src/expr/counter.c +++ b/src/expr/counter.c @@ -32,7 +32,7 @@ static int nft_rule_expr_counter_set(struct nft_rule_expr *e, uint16_t type, const void *data, size_t data_len) { - struct nft_expr_counter *ctr = (struct nft_expr_counter *)e->data; + struct nft_expr_counter *ctr = nft_expr_data(e); switch(type) { case NFT_EXPR_CTR_BYTES: @@ -51,7 +51,7 @@ static const void * nft_rule_expr_counter_get(const struct nft_rule_expr *e, uint16_t type, size_t *data_len) { - struct nft_expr_counter *ctr = (struct nft_expr_counter *)e->data; + struct nft_expr_counter *ctr = nft_expr_data(e); switch(type) { case NFT_EXPR_CTR_BYTES: @@ -99,7 +99,7 @@ static int nft_rule_expr_counter_cb(const struct nlattr *attr, void *data) static void nft_rule_expr_counter_build(struct nlmsghdr *nlh, struct nft_rule_expr *e) { - struct nft_expr_counter *ctr = (struct nft_expr_counter *)e->data; + struct nft_expr_counter *ctr = nft_expr_data(e); if (e->flags & (1 << NFT_EXPR_CTR_BYTES)) mnl_attr_put_u64(nlh, NFTA_COUNTER_BYTES, htobe64(ctr->bytes)); @@ -110,7 +110,7 @@ nft_rule_expr_counter_build(struct nlmsghdr *nlh, struct nft_rule_expr *e) static int nft_rule_expr_counter_parse(struct nft_rule_expr *e, struct nlattr *attr) { - struct nft_expr_counter *ctr = (struct nft_expr_counter *)e->data; + struct nft_expr_counter *ctr = nft_expr_data(e); struct nlattr *tb[NFTA_COUNTER_MAX+1] = {}; if (mnl_attr_parse_nested(attr, nft_rule_expr_counter_cb, tb) < 0) @@ -132,7 +132,7 @@ static int nft_rule_expr_counter_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree) { #ifdef XML_PARSING - struct nft_expr_counter *ctr = (struct nft_expr_counter *)e->data; + struct nft_expr_counter *ctr = nft_expr_data(e); mxml_node_t *node = NULL; char *endptr; uint64_t tmp; @@ -172,7 +172,7 @@ static int nft_rule_expr_counter_snprintf(char *buf, size_t len, uint32_t type, uint32_t flags, struct nft_rule_expr *e) { - struct nft_expr_counter *ctr = (struct nft_expr_counter *)e->data; + struct nft_expr_counter *ctr = nft_expr_data(e); switch(type) { case NFT_RULE_O_DEFAULT: |