summaryrefslogtreecommitdiffstats
path: root/src/expr/bitwise.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2013-07-13 21:56:06 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2013-07-13 21:56:50 +0200
commit46439a3e8d6635a1461ff4c43665fb1425cadd1d (patch)
treef17038dee8b57cca27ca00ac3b5a25d151ba4791 /src/expr/bitwise.c
parent4dd0772911a2c92a43d4e4aecf305fba498be106 (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/bitwise.c')
-rw-r--r--src/expr/bitwise.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index 7ea5376..bfb3163 100644
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -35,7 +35,7 @@ static int
nft_rule_expr_bitwise_set(struct nft_rule_expr *e, uint16_t type,
const void *data, size_t data_len)
{
- struct nft_expr_bitwise *bitwise = (struct nft_expr_bitwise *)e->data;
+ struct nft_expr_bitwise *bitwise = nft_expr_data(e);
switch(type) {
case NFT_EXPR_BITWISE_SREG:
@@ -65,7 +65,7 @@ static const void *
nft_rule_expr_bitwise_get(const struct nft_rule_expr *e, uint16_t type,
size_t *data_len)
{
- struct nft_expr_bitwise *bitwise = (struct nft_expr_bitwise *)e->data;
+ struct nft_expr_bitwise *bitwise = nft_expr_data(e);
switch(type) {
case NFT_EXPR_BITWISE_SREG:
@@ -137,7 +137,7 @@ static int nft_rule_expr_bitwise_cb(const struct nlattr *attr, void *data)
static void
nft_rule_expr_bitwise_build(struct nlmsghdr *nlh, struct nft_rule_expr *e)
{
- struct nft_expr_bitwise *bitwise = (struct nft_expr_bitwise *)e->data;
+ struct nft_expr_bitwise *bitwise = nft_expr_data(e);
if (e->flags & (1 << NFT_EXPR_BITWISE_SREG))
mnl_attr_put_u32(nlh, NFTA_BITWISE_SREG, htonl(bitwise->sreg));
@@ -166,7 +166,7 @@ nft_rule_expr_bitwise_build(struct nlmsghdr *nlh, struct nft_rule_expr *e)
static int
nft_rule_expr_bitwise_parse(struct nft_rule_expr *e, struct nlattr *attr)
{
- struct nft_expr_bitwise *bitwise = (struct nft_expr_bitwise *)e->data;
+ struct nft_expr_bitwise *bitwise = nft_expr_data(e);
struct nlattr *tb[NFTA_BITWISE_MAX+1] = {};
int ret = 0;
@@ -201,7 +201,7 @@ static int
nft_rule_expr_bitwise_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree)
{
#ifdef XML_PARSING
- struct nft_expr_bitwise *bitwise = (struct nft_expr_bitwise *)e->data;
+ struct nft_expr_bitwise *bitwise = nft_expr_data(e);
int32_t reg;
reg = nft_mxml_reg_parse(tree, "sreg", MXML_DESCEND_FIRST);
@@ -333,7 +333,7 @@ static int
nft_rule_expr_bitwise_snprintf(char *buf, size_t size, uint32_t type,
uint32_t flags, struct nft_rule_expr *e)
{
- struct nft_expr_bitwise *bitwise = (struct nft_expr_bitwise *)e->data;
+ struct nft_expr_bitwise *bitwise = nft_expr_data(e);
switch(type) {
case NFT_RULE_O_DEFAULT: