summaryrefslogtreecommitdiffstats
path: root/src/segtree.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2019-03-05 13:13:52 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2019-03-06 11:12:38 +0100
commit2277a8cf318359885be67aad566c70f497551cca (patch)
tree9ba8f09cebeda374314bcf27d8c5a781fb1d0dbc /src/segtree.c
parentafd1ad6f68680c0f0a4afad7c67ddc8652948732 (diff)
segtree: remove dummy debug_octx
Breaks custom-defined configuration in library mode, ie. user may want to store output in a file, instead of stderr. Fixes: 35f6cd327c2e ("src: Pass stateless, numeric, ip2name and handle variables as structure members.") Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/segtree.c')
-rw-r--r--src/segtree.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/segtree.c b/src/segtree.c
index e3a2f48c..939c30d2 100644
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -566,10 +566,9 @@ static void set_insert_interval(struct expr *set, struct seg_tree *tree,
int set_to_intervals(struct list_head *errs, struct set *set,
struct expr *init, bool add, unsigned int debug_mask,
- bool merge)
+ bool merge, struct output_ctx *octx)
{
struct elementary_interval *ei, *next;
- struct output_ctx debug_octx;
struct seg_tree tree;
LIST_HEAD(list);
@@ -590,10 +589,7 @@ int set_to_intervals(struct list_head *errs, struct set *set,
}
if (segtree_debug(tree.debug_mask)) {
- memset(&debug_octx, 0, sizeof(debug_octx));
- debug_octx.output_fp = stderr;
- debug_octx.error_fp = stderr;
- expr_print(init, &debug_octx);
+ expr_print(init, octx);
pr_gmp_debug("\n");
}