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 209cfbb18907ff3891ca7ffdc15fd276f714f2e8..05ae760a8f29e0a0005e0d82d47114cd4fae55a5 100644 (file)
--- 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 56ef04395b4c71f499bcee4ceb1b7f1345383549..11720546f16a867ad09822b752cd6492e791ecd6 100644 (file)
--- 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 2016552cea2ce27dfa44b8ab0db779b5f8355625..cf5f637a7b253dcc14e2dac9a3adc6d33ab01dd5 100644 (file)
--- 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 1efabe759f52e28f1233114228d4b881874806ed..3d1cb2e43349e84598cbf6155e7f129b5cf62cae 100644 (file)
--- 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 d3d92938c3a509787cb5a15b5a56cd9f74a1e00b..f037aefaec123e2e3f3b5afef9311f63b6b40a65 100644 (file)
--- 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 7546543bce9d456e505b2a5b129284c93be5fd72..fc234b765f3c44c8cab19eb1475261066b63c76e 100644 (file)
--- 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 611f27cdebbb966dc09c654924db7e2112fe16b9..1e075d745b38e031d7626dec5728f49afa840be2 100644 (file)
--- 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 7b49b8de70c8f7374488afd54ddd8ca17016de2c..03a18dc484ce168568f15e8129b9b3224076e6ab 100644 (file)
--- 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 9824072b66740e3f70aab9201b8fade12a92bbe8..d67c6f5451363f1cea6da8a28cc8fcd014afec9c 100644 (file)
--- 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 00cbd8d8913c48c6fef4ebe2fe0b480a34e01e04..74edb40a24430a2d66d1b3ae66e9bf23649ecba0 100644 (file)
--- 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 82e1de65db2c79267d7847d4b1ead090b1ee606d..83e08ded0cdafc2dcd7d5caa33bb14e67017021b 100644 (file)
--- 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 cfd924f9a68d7d2ae2d70a9977c7abb4c0c01d85..c8bb3dec19d8dfe6efd7e474facf8e8cc0e71a75 100644 (file)
--- 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 22808d14e059bb5ae12a1a1b3ba98774d8e1077d..84ad77d85ac57d60b4525a9000ed3d8a7c75195c 100644 (file)
--- 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 7011c55eaacef37b007021892f8b08c97a9391a1..3a99657a787d4cb19e6c1303c143a2aea6a926b3 100644 (file)
--- 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 6273b9c297b5da3a8a474ba82776307210e44c5e..7fdc42e0e90558c31898b0a6af69ed1fbe4d4e56 100644 (file)
--- 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 c268e856f05d3e7b3b4db8a7d3421372a9369dee..7e24de240a12ff12beef2f2c3632cf283f5d91a0 100644 (file)
--- 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 e0f696d0e08c4c5e0572e5bcc6507bbef093cac2..ea68f95b27b1d3e28912e1b2ed04834d1d1ca571 100644 (file)
--- 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 3e710948656717e589d77d26910ea363cb572c65..45ba2c3071c6ec203dd81fbac4121b2e70f384f8 100644 (file)
--- 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 556df93ad1dae52741c71d25e6ce26fb75c7d346..3f93a36c3710b4ef0af552a06dbde58d6c9a12a0 100644 (file)
--- 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 f2e3c8581f25053f48b28f48532131af01277a94..49dc3ab1b66d78849645c97b641899b07e28e11a 100644 (file)
--- 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 94dee188e655b2a7a05fbec5e3930d804e8dfce1..94b36ae6a4863bacb8ecfab1eeb05c5e77a8d75d 100644 (file)
--- 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 cd278145c78d6d15491de28c178bb3f7d5cc30ac..0a8bcf25e7e7ce6e704bcabf3812f9243c2bce6d 100644 (file)
--- 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 22754f587f42919b35ca796cbd3a4ed2a8a6fcd4..a4011c1439e0e3ebf3158e3d4f6deb06a4a46f1a 100644 (file)
--- 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 f5f8d424d208d2abcce3f19f8c5fc1138cad8d9f..547f0738f8ae4f737eac4a4812277cd5c37e8de8 100644 (file)
--- 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 5d30806abbba84872b0f4d905d441cb29db9f5cc..dc9f2a36cc9056ddb20b5518e4f3c3435181db3d 100644 (file)
--- 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 f19a03b100ee277709486371d437b354c0e75769..cef71ccde16ad42ea87331ab2e902e0e3c5db822 100644 (file)
--- 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 490eac3eb05501ac38adbc0ece04a77c26dc3b10..2aa07f2056c2cf6497701013e5a5d528cbd0e441 100644 (file)
--- 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 af6e0801eb630b22e7659fe2e742c39ab8d2d70a..50c6c6ad8134e6412fd167c7e9398b0a4a521d18 100644 (file)
--- 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 dd8ceef79d96aebea2597c0c128df9e27e7b7ee5..c1e42c20e65e897d04adc236259cbffe297ad5ad 100644 (file)
--- 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 11e0f26e09aa30f784f3f37804e2ca0fe914c7e8..ae86ccbfb5c758c2fb4cddc2c2ec053438da38ee 100644 (file)
--- 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 8d80ad902a26d80852f07137273e547a56d4142c..f636308a7fe6433d42ba3d90856048f636973b2d 100644 (file)
--- 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 ba6a8c6842bb5e04a90661185f5723ee45ef2941..50eb6c0f4d1a961271f11011f800527b83f8a06b 100644 (file)
--- 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 425e35d4997ca0f3724e40eea92c1c6598ff12bf..4db5d5074a368feb071272d3daf606daae1e761e 100644 (file)
--- 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 bc3a4520802461a313f811380261e2917181af7b..a489776bc561d452a9b67adb3f75a11921716b18 100644 (file)
--- 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 e7655c882564e9e4de6d4fa0a2ecefef88e09b09..ff406025c9929c87b3d104eb1318e548ee727883 100644 (file)
--- 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>