From: Denis Ovsienko <infrastation@yandex.ru>
Date: Fri, 28 Feb 2014 09:10:28 +0000 (+0400)
Subject: don't include pcap.h needlessly
X-Git-Tag: tcpdump-4.6.0~206
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/88e479b75ea97730bf265a2371c0658a401eae92

don't include pcap.h needlessly

Both interface.h and netdissect.h include <pcap.h>, thus most files
should not include it regardless if these need it or not. The only
exceptions so far remain:
* addrtoname.c
* missing/datalinks.c
* missing/dlnames.c
* tcpdump.c
---

diff --git a/bpf_dump.c b/bpf_dump.c
index 209cfbb1..05ae760a 100644
--- a/bpf_dump.c
+++ b/bpf_dump.c
@@ -25,7 +25,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
 #include <stdio.h>
 
 #include "interface.h"
diff --git a/print-802_11.c b/print-802_11.c
index 56ef0439..11720546 100644
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -27,7 +27,6 @@
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <pcap.h>
 #include <string.h>
 
 #include "interface.h"
diff --git a/print-802_15_4.c b/print-802_15_4.c
index 2016552c..cf5f637a 100644
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -27,7 +27,6 @@
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <pcap.h>
 #include <string.h>
 
 #include "interface.h"
diff --git a/print-ap1394.c b/print-ap1394.c
index 1efabe75..3d1cb2e4 100644
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -26,7 +26,6 @@
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <pcap.h>
 
 #include "interface.h"
 #include "extract.h"
diff --git a/print-arcnet.c b/print-arcnet.c
index d3d92938..f037aefa 100644
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -28,7 +28,6 @@
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <pcap.h>
 
 #include "interface.h"
 #include "extract.h"
diff --git a/print-atalk.c b/print-atalk.c
index 7546543b..fc234b76 100644
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pcap.h>
 
 #include "interface.h"
 #include "addrtoname.h"
diff --git a/print-atm.c b/print-atm.c
index 611f27cd..1e075d74 100644
--- a/print-atm.c
+++ b/print-atm.c
@@ -26,7 +26,6 @@
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <pcap.h>
 #include <string.h>
 
 #include "interface.h"
diff --git a/print-bt.c b/print-bt.c
index 7b49b8de..03a18dc4 100644
--- a/print-bt.c
+++ b/print-bt.c
@@ -23,7 +23,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/print-calm-fast.c b/print-calm-fast.c
index 9824072b..d67c6f54 100644
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -21,7 +21,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/print-chdlc.c b/print-chdlc.c
index 00cbd8d8..74edb40a 100644
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -25,7 +25,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
 #include <stdio.h>
 
 #include "interface.h"
diff --git a/print-cip.c b/print-cip.c
index 82e1de65..83e08ded 100644
--- a/print-cip.c
+++ b/print-cip.c
@@ -29,7 +29,6 @@
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <pcap.h>
 
 #include "interface.h"
 #include "addrtoname.h"
diff --git a/print-enc.c b/print-enc.c
index cfd924f9..c8bb3dec 100644
--- a/print-enc.c
+++ b/print-enc.c
@@ -27,8 +27,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
-
 #include "interface.h"
 #include "extract.h"
 
diff --git a/print-ether.c b/print-ether.c
index 22808d14..84ad77d8 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -27,7 +27,6 @@
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <pcap.h>
 
 #include "interface.h"
 #include "extract.h"
diff --git a/print-fddi.c b/print-fddi.c
index 7011c55e..3a99657a 100644
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -25,7 +25,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/print-fr.c b/print-fr.c
index 6273b9c2..7fdc42e0 100644
--- a/print-fr.c
+++ b/print-fr.c
@@ -27,7 +27,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <pcap.h>
 
 #include "addrtoname.h"
 #include "interface.h"
diff --git a/print-geonet.c b/print-geonet.c
index c268e856..7e24de24 100644
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -21,7 +21,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/print-ipfc.c b/print-ipfc.c
index e0f696d0..ea68f95b 100644
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -25,7 +25,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/print-ipnet.c b/print-ipnet.c
index 3e710948..45ba2c30 100644
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -5,7 +5,6 @@
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <pcap.h>
 
 #include "netdissect.h"
 #include "interface.h"
diff --git a/print-juniper.c b/print-juniper.c
index 556df93a..3f93a36c 100644
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -26,7 +26,6 @@ __RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp ");
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
 #include <stdio.h>
 
 #include "interface.h"
diff --git a/print-lane.c b/print-lane.c
index f2e3c858..49dc3ab1 100644
--- a/print-lane.c
+++ b/print-lane.c
@@ -27,7 +27,6 @@
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <pcap.h>
 
 #include "interface.h"
 #include "extract.h"
diff --git a/print-nflog.c b/print-nflog.c
index 94dee188..94b36ae6 100644
--- a/print-nflog.c
+++ b/print-nflog.c
@@ -32,7 +32,6 @@
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <pcap.h>
 
 #include "netdissect.h"
 #include "interface.h"
diff --git a/print-nfs.c b/print-nfs.c
index cd278145..0a8bcf25 100644
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -25,7 +25,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/print-null.c b/print-null.c
index 22754f58..a4011c14 100644
--- a/print-null.c
+++ b/print-null.c
@@ -25,7 +25,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/print-pflog.c b/print-pflog.c
index f5f8d424..547f0738 100644
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -35,7 +35,6 @@
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <pcap.h>
 
 #include "extract.h"
 #include "interface.h"
diff --git a/print-ppi.c b/print-ppi.c
index 5d30806a..dc9f2a36 100644
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -8,7 +8,6 @@
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <pcap.h>
 
 #include "netdissect.h"
 #include "interface.h"
diff --git a/print-ppp.c b/print-ppp.c
index f19a03b1..cef71ccd 100644
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -40,7 +40,6 @@
 #include <net/if_ppp.h>
 #endif
 
-#include <pcap.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/print-raw.c b/print-raw.c
index 490eac3e..2aa07f20 100644
--- a/print-raw.c
+++ b/print-raw.c
@@ -25,7 +25,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/print-sl.c b/print-sl.c
index af6e0801..50c6c6ad 100644
--- a/print-sl.c
+++ b/print-sl.c
@@ -25,7 +25,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
 #include <stdio.h>
 
 #include "interface.h"
diff --git a/print-sll.c b/print-sll.c
index dd8ceef7..c1e42c20 100644
--- a/print-sll.c
+++ b/print-sll.c
@@ -27,7 +27,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <pcap.h>
 
 #include "interface.h"
 #include "addrtoname.h"
diff --git a/print-sunatm.c b/print-sunatm.c
index 11e0f26e..ae86ccbf 100644
--- a/print-sunatm.c
+++ b/print-sunatm.c
@@ -40,7 +40,6 @@ struct mbuf;
 struct rtentry;
 
 #include <stdio.h>
-#include <pcap.h>
 
 #include "interface.h"
 #include "extract.h"
diff --git a/print-symantec.c b/print-symantec.c
index 8d80ad90..f636308a 100644
--- a/print-symantec.c
+++ b/print-symantec.c
@@ -26,7 +26,6 @@
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <pcap.h>
 
 #include "interface.h"
 #include "extract.h"
diff --git a/print-token.c b/print-token.c
index ba6a8c68..50eb6c0f 100644
--- a/print-token.c
+++ b/print-token.c
@@ -30,7 +30,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/print-usb.c b/print-usb.c
index 425e35d4..4db5d507 100644
--- a/print-usb.c
+++ b/print-usb.c
@@ -25,7 +25,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/print-vjc.c b/print-vjc.c
index bc3a4520..a489776b 100644
--- a/print-vjc.c
+++ b/print-vjc.c
@@ -25,7 +25,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
 #include <stdio.h>
 
 #include "interface.h"
diff --git a/util.c b/util.c
index e7655c88..ff406025 100644
--- a/util.c
+++ b/util.c
@@ -31,7 +31,6 @@
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#include <pcap.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>