Signed-off-by: Jeremy Sowden <jeremy@xxxxxxxxxx> --- src/expr/bitwise.c | 12 ++++++------ tests/nft-expr_bitwise-test.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c index c9d40df34b54..489ee8420c44 100644 --- a/src/expr/bitwise.c +++ b/src/expr/bitwise.c @@ -31,7 +31,7 @@ struct nftnl_expr_bitwise { static int nftnl_expr_bitwise_set(struct nftnl_expr *e, uint16_t type, - const void *data, uint32_t data_len) + const void *data, uint32_t data_len) { struct nftnl_expr_bitwise *bitwise = nftnl_expr_data(e); @@ -61,7 +61,7 @@ nftnl_expr_bitwise_set(struct nftnl_expr *e, uint16_t type, static const void * nftnl_expr_bitwise_get(const struct nftnl_expr *e, uint16_t type, - uint32_t *data_len) + uint32_t *data_len) { struct nftnl_expr_bitwise *bitwise = nftnl_expr_data(e); @@ -127,7 +127,7 @@ nftnl_expr_bitwise_build(struct nlmsghdr *nlh, const struct nftnl_expr *e) nest = mnl_attr_nest_start(nlh, NFTA_BITWISE_MASK); mnl_attr_put(nlh, NFTA_DATA_VALUE, bitwise->mask.len, - bitwise->mask.val); + bitwise->mask.val); mnl_attr_nest_end(nlh, nest); } if (e->flags & (1 << NFTNL_EXPR_BITWISE_XOR)) { @@ -135,7 +135,7 @@ nftnl_expr_bitwise_build(struct nlmsghdr *nlh, const struct nftnl_expr *e) nest = mnl_attr_nest_start(nlh, NFTA_BITWISE_XOR); mnl_attr_put(nlh, NFTA_DATA_VALUE, bitwise->xor.len, - bitwise->xor.val); + bitwise->xor.val); mnl_attr_nest_end(nlh, nest); } } @@ -185,14 +185,14 @@ static int nftnl_expr_bitwise_snprintf_default(char *buf, size_t size, SNPRINTF_BUFFER_SIZE(ret, remain, offset); ret = nftnl_data_reg_snprintf(buf + offset, remain, &bitwise->mask, - NFTNL_OUTPUT_DEFAULT, 0, DATA_VALUE); + NFTNL_OUTPUT_DEFAULT, 0, DATA_VALUE); SNPRINTF_BUFFER_SIZE(ret, remain, offset); ret = snprintf(buf + offset, remain, ") ^ "); SNPRINTF_BUFFER_SIZE(ret, remain, offset); ret = nftnl_data_reg_snprintf(buf + offset, remain, &bitwise->xor, - NFTNL_OUTPUT_DEFAULT, 0, DATA_VALUE); + NFTNL_OUTPUT_DEFAULT, 0, DATA_VALUE); SNPRINTF_BUFFER_SIZE(ret, remain, offset); return offset; diff --git a/tests/nft-expr_bitwise-test.c b/tests/nft-expr_bitwise-test.c index 64c14466dbd2..e37d85832072 100644 --- a/tests/nft-expr_bitwise-test.c +++ b/tests/nft-expr_bitwise-test.c @@ -28,7 +28,7 @@ static void print_err(const char *msg) } static void cmp_nftnl_expr(struct nftnl_expr *rule_a, - struct nftnl_expr *rule_b) + struct nftnl_expr *rule_b) { uint32_t maska, maskb; uint32_t xora, xorb; @@ -50,8 +50,8 @@ static void cmp_nftnl_expr(struct nftnl_expr *rule_a, nftnl_expr_get(rule_b, NFTNL_EXPR_BITWISE_XOR, &xorb); if (xora != xorb) print_err("Size of BITWISE_XOR mismatches"); - } + int main(int argc, char *argv[]) { struct nftnl_rule *a, *b = NULL; -- 2.24.1