Merge pull request #613 from mkubecek/mk/master/opt-unknown

[libpcap] / optimize.c

diff --git a/optimize.c b/optimize.c
index 8544f3e19d1e9cb1d914573b4523fcb37d3cef30..0bf52cdd8f4f2c72c077f309b8474cf588b6ec77 100644 (file)
--- a/optimize.c
+++ b/optimize.c
@@ -115,7 +115,7 @@ struct vmapinfo {
        bpf_int32 const_val;
 };
 
-struct _opt_state {
+typedef struct {
        /*
         * A flag to indicate that further optimization is needed.
         * Iterative passes are continued until a given pass yields no
@@ -198,7 +198,7 @@ struct _opt_state {
        struct vmapinfo *vmap;
        struct valnode *vnode_base;
        struct valnode *next_vnode;
-};
+} opt_state_t;
 
 typedef struct {
        /*
@@ -2334,10 +2334,8 @@ dot_dump(compiler_state_t *cstate, struct icode *ic)
        f.bf_insns = icode_to_fcode(cstate, ic, ic->root, &f.bf_len);
 
        fprintf(out, "digraph BPF {\n");
-       ic->cur_mark = 0;
        unMarkAll(ic);
        dot_dump_node(ic, ic->root, &f, out);
-       ic->cur_mark = 0;
        unMarkAll(ic);
        dot_dump_edge(ic, ic->root, out);
        fprintf(out, "}\n");