From 35f6cd327c2ec46296adf464f981cd6cddfec27b Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Fri, 16 Jun 2017 14:54:06 +0530 Subject: src: Pass stateless, numeric, ip2name and handle variables as structure members. libnftables library will be created soon. So declare numeric_output, stateless_output, ip2name_output and handle_output as members of structure output_ctx, instead of global variables. Rename these variables as following, numeric_output -> numeric stateless_output -> stateless ip2name_output -> ip2name handle_output -> handle Also add struct output_ctx *octx as member of struct netlink_ctx. Signed-off-by: Varsha Rao Signed-off-by: Pablo Neira Ayuso --- src/proto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/proto.c') diff --git a/src/proto.c b/src/proto.c index 2afedf77..64d06325 100644 --- a/src/proto.c +++ b/src/proto.c @@ -893,9 +893,9 @@ static const struct symbol_table ethertype_tbl = { }, }; -static void ethertype_print(const struct expr *expr) +static void ethertype_print(const struct expr *expr, struct output_ctx *octx) { - return symbolic_constant_print(ðertype_tbl, expr, false); + return symbolic_constant_print(ðertype_tbl, expr, false, octx); } const struct datatype ethertype_type = { -- cgit v1.2.3