Avoid -E and -M options inconsistencies with no libcrypto

[tcpdump] / bpf_dump.c

diff --git a/bpf_dump.c b/bpf_dump.c
index b7d649a1c3ef000f10e64dcbef096032ae7a4421..2a55cf87b1c7b42120b641330c9e42ffa6f2387f 100644 (file)
--- a/bpf_dump.c
+++ b/bpf_dump.c
@@ -19,20 +19,19 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <stdio.h>
 
+#include "netdissect.h"
 #include "interface.h"
 
 void
 bpf_dump(const struct bpf_program *p, int option)
 {
-       struct bpf_insn *insn;
+       const struct bpf_insn *insn;
        int i;
        int n = p->bf_len;
 
@@ -52,10 +51,6 @@ bpf_dump(const struct bpf_program *p, int option)
                return;
        }
        for (i = 0; i < n; ++insn, ++i) {
-#ifdef BDEBUG
-               extern int bids[];
-               printf(bids[i] > 0 ? "[%02d]" : " -- ", bids[i] - 1);
-#endif
                puts(bpf_image(insn, i));
        }
 }