Avoid -E and -M options inconsistencies with no libcrypto

[tcpdump] / bpf_dump.c

diff --git a/bpf_dump.c b/bpf_dump.c
index b50d7e7b66398b2152790fc7cd95052493067db2..2a55cf87b1c7b42120b641330c9e42ffa6f2387f 100644 (file)
--- a/bpf_dump.c
+++ b/bpf_dump.c
@@ -18,26 +18,20 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/bpf_dump.c,v 1.17 2008-02-14 20:53:49 guy Exp $ (LBL)";
-#endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"
 
-#include <pcap.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;
 
@@ -57,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));
        }
 }