From a190c936d754f553e218de7174223b12c49b6b3e Mon Sep 17 00:00:00 2001 From: Martin Mathieson Date: Fri, 2 Jan 2015 23:28:44 +0000 Subject: [PATCH] Remove unnecessary includes from wiretap folder Change-Id: I10d3057801673bc1c8ea78f144215869cc4b1851 Reviewed-on: https://code.wireshark.org/review/6217 Petri-Dish: Martin Mathieson Reviewed-by: Martin Mathieson --- wiretap/5views.c | 2 -- wiretap/aethra.c | 1 - wiretap/ascendtext.c | 2 -- wiretap/btsnoop.c | 2 -- wiretap/camins.c | 3 --- wiretap/capsa.c | 1 - wiretap/catapult_dct2000.c | 1 - wiretap/commview.c | 4 ---- wiretap/cosine.c | 2 -- wiretap/csids.c | 2 -- wiretap/daintree-sna.c | 4 ---- wiretap/dbs-etherwatch.c | 2 -- wiretap/dct3trace.c | 2 -- wiretap/erf.c | 2 -- wiretap/eyesdn.c | 2 -- wiretap/file_access.c | 1 - wiretap/hcidump.c | 1 - wiretap/i4btrace.c | 1 - wiretap/ipfix.c | 4 ---- wiretap/iptrace.c | 1 - wiretap/iseries.c | 2 -- wiretap/k12.c | 2 -- wiretap/lanalyzer.c | 1 - wiretap/libpcap.c | 1 - wiretap/logcat.c | 2 -- wiretap/logcat_text.c | 2 -- wiretap/merge.c | 2 -- wiretap/netmon.c | 1 - wiretap/netscaler.c | 1 - wiretap/netscreen.c | 2 -- wiretap/nettl.c | 1 - wiretap/network_instruments.c | 1 - wiretap/netxray.c | 1 - wiretap/ngsniffer.c | 2 -- wiretap/packetlogger.c | 4 ---- wiretap/pcapng.c | 2 -- wiretap/peekclassic.c | 1 - wiretap/peektagged.c | 1 - wiretap/pppdump.c | 3 --- wiretap/radcom.c | 1 - wiretap/snoop.c | 1 - wiretap/stanag4607.c | 1 - wiretap/toshiba.c | 2 -- wiretap/visual.c | 1 - wiretap/vms.c | 2 -- wiretap/vwr.c | 1 - 46 files changed, 81 deletions(-) diff --git a/wiretap/5views.c b/wiretap/5views.c index 05a1865b80..ce0e4cf34e 100644 --- a/wiretap/5views.c +++ b/wiretap/5views.c @@ -21,11 +21,9 @@ #include "config.h" #include #include -#include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "5views.h" diff --git a/wiretap/aethra.c b/wiretap/aethra.c index 5a9e909d16..a187593a0b 100644 --- a/wiretap/aethra.c +++ b/wiretap/aethra.c @@ -23,7 +23,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "aethra.h" /* Magic number in Aethra PC108 files. */ diff --git a/wiretap/ascendtext.c b/wiretap/ascendtext.c index c54bdb23dc..e793cb8b2b 100644 --- a/wiretap/ascendtext.c +++ b/wiretap/ascendtext.c @@ -20,11 +20,9 @@ #include "config.h" #include "wtap-int.h" -#include #include "ascendtext.h" #include "ascend-int.h" #include "file_wrappers.h" -#include #include diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c index 9d026e4c64..a04c71b68f 100644 --- a/wiretap/btsnoop.c +++ b/wiretap/btsnoop.c @@ -23,8 +23,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include -#include "atm.h" #include "btsnoop.h" /* diff --git a/wiretap/camins.c b/wiretap/camins.c index 660bcf4dc3..49863799dd 100644 --- a/wiretap/camins.c +++ b/wiretap/camins.c @@ -60,11 +60,8 @@ #include "config.h" #include -#include -#include #include #include -#include #include "camins.h" diff --git a/wiretap/capsa.c b/wiretap/capsa.c index f496cf80a1..739d0d32fd 100644 --- a/wiretap/capsa.c +++ b/wiretap/capsa.c @@ -23,7 +23,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "capsa.h" /* diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c index cc9cc3a471..bdf34c8ffa 100644 --- a/wiretap/catapult_dct2000.c +++ b/wiretap/catapult_dct2000.c @@ -25,7 +25,6 @@ #include "wtap-int.h" #include "file_wrappers.h" -#include #include "catapult_dct2000.h" diff --git a/wiretap/commview.c b/wiretap/commview.c index 47d3e53336..5ea9c95f32 100644 --- a/wiretap/commview.c +++ b/wiretap/commview.c @@ -30,15 +30,11 @@ #include "config.h" -#include -#include #include #include #include -#include "wtap.h" #include "wtap-int.h" -#include #include "file_wrappers.h" #include "commview.h" diff --git a/wiretap/cosine.c b/wiretap/cosine.c index d04b3c6083..5163cb4eef 100644 --- a/wiretap/cosine.c +++ b/wiretap/cosine.c @@ -23,11 +23,9 @@ #include "config.h" #include "wtap-int.h" -#include #include "cosine.h" #include "file_wrappers.h" -#include #include #include diff --git a/wiretap/csids.c b/wiretap/csids.c index fc8e386f1a..a6848b40d2 100644 --- a/wiretap/csids.c +++ b/wiretap/csids.c @@ -20,11 +20,9 @@ #include "config.h" #include "wtap-int.h" -#include #include "csids.h" #include "file_wrappers.h" -#include #include #include diff --git a/wiretap/daintree-sna.c b/wiretap/daintree-sna.c index f43cf2dc33..18eb8b2a16 100644 --- a/wiretap/daintree-sna.c +++ b/wiretap/daintree-sna.c @@ -46,15 +46,11 @@ #include "config.h" -#include -#include #include #include #include -#include "wtap.h" #include "wtap-int.h" -#include #include "file_wrappers.h" #include "daintree-sna.h" diff --git a/wiretap/dbs-etherwatch.c b/wiretap/dbs-etherwatch.c index 6fa6145e4d..b4543846b2 100644 --- a/wiretap/dbs-etherwatch.c +++ b/wiretap/dbs-etherwatch.c @@ -20,11 +20,9 @@ #include "config.h" #include "wtap-int.h" -#include #include "dbs-etherwatch.h" #include "file_wrappers.h" -#include #include #include diff --git a/wiretap/dct3trace.c b/wiretap/dct3trace.c index e8c01e3bed..81a4970105 100644 --- a/wiretap/dct3trace.c +++ b/wiretap/dct3trace.c @@ -26,11 +26,9 @@ #include "config.h" #include "wtap-int.h" -#include #include "dct3trace.h" #include "file_wrappers.h" -#include #include #include diff --git a/wiretap/erf.c b/wiretap/erf.c index 129684d2dc..5906d80cc5 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -52,9 +52,7 @@ #include "wtap-int.h" #include "file_wrappers.h" -#include #include "pcap-encap.h" -#include "atm.h" #include "erf.h" static gboolean erf_read_header(FILE_T fh, diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c index 59bcae3ab3..f65902dd40 100644 --- a/wiretap/eyesdn.c +++ b/wiretap/eyesdn.c @@ -20,11 +20,9 @@ #include "config.h" #include "wtap-int.h" -#include #include "eyesdn.h" #include "file_wrappers.h" -#include #include #include #include diff --git a/wiretap/file_access.c b/wiretap/file_access.c index d80e8e6153..9006e4862c 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -20,7 +20,6 @@ #include "config.h" -#include #include #include diff --git a/wiretap/hcidump.c b/wiretap/hcidump.c index 02742cac00..a7b2e0fbfc 100644 --- a/wiretap/hcidump.c +++ b/wiretap/hcidump.c @@ -21,7 +21,6 @@ #include "wtap-int.h" #include "file_wrappers.h" -#include #include "hcidump.h" struct dump_hdr { diff --git a/wiretap/i4btrace.c b/wiretap/i4btrace.c index f0d4d6e508..69d2788f54 100644 --- a/wiretap/i4btrace.c +++ b/wiretap/i4btrace.c @@ -25,7 +25,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "i4b_trace.h" #include "i4btrace.h" diff --git a/wiretap/ipfix.c b/wiretap/ipfix.c index b65cf96c5e..c6abef19a1 100644 --- a/wiretap/ipfix.c +++ b/wiretap/ipfix.c @@ -65,10 +65,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include -#include "libpcap.h" -#include "pcap-common.h" -#include "pcap-encap.h" #include "ipfix.h" #if 0 diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c index a55d4c9fcd..235b317251 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -24,7 +24,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "atm.h" #include "iptrace.h" diff --git a/wiretap/iseries.c b/wiretap/iseries.c index a629eb8a4d..1b7f812e80 100644 --- a/wiretap/iseries.c +++ b/wiretap/iseries.c @@ -150,11 +150,9 @@ Number S/R Length Timer MAC Address MAC Address #include "config.h" #include "wtap-int.h" -#include #include "iseries.h" #include "file_wrappers.h" -#include #include #include #include diff --git a/wiretap/k12.c b/wiretap/k12.c index ab1d9d4390..a75dd0015e 100644 --- a/wiretap/k12.c +++ b/wiretap/k12.c @@ -29,9 +29,7 @@ #include #include "wtap-int.h" -#include "wtap.h" #include "file_wrappers.h" -#include #include "k12.h" #include diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c index dfa7f7cc00..5b8bf365ba 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -23,7 +23,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "lanalyzer.h" /* The LANalyzer format is documented (at least in part) in Novell document diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 065f85d448..59eda26002 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -25,7 +25,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "pcap-common.h" #include "pcap-encap.h" #include "libpcap.h" diff --git a/wiretap/logcat.c b/wiretap/logcat.c index 69b05c80dd..a7bb0d5580 100644 --- a/wiretap/logcat.c +++ b/wiretap/logcat.c @@ -20,11 +20,9 @@ #include "config.h" #include -#include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "logcat.h" diff --git a/wiretap/logcat_text.c b/wiretap/logcat_text.c index cbeede293f..7742ab6159 100644 --- a/wiretap/logcat_text.c +++ b/wiretap/logcat_text.c @@ -21,11 +21,9 @@ #include "config.h" #include -#include #include "wtap-int.h" #include "file_wrappers.h" -#include "wsutil/buffer.h" #include "logcat_text.h" #include "logcat.h" diff --git a/wiretap/merge.c b/wiretap/merge.c index 3b320fa53b..4bd2394c35 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -26,9 +26,7 @@ #include "config.h" -#include #include -#include #include #ifdef HAVE_UNISTD_H diff --git a/wiretap/netmon.c b/wiretap/netmon.c index d672378f8d..dc959f5ab8 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -23,7 +23,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "atm.h" #include "pcap-encap.h" #include "netmon.h" diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c index 29850281a6..fd4f27dc78 100644 --- a/wiretap/netscaler.c +++ b/wiretap/netscaler.c @@ -23,7 +23,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "netscaler.h" /* Defines imported from netscaler code: nsperfrc.h */ diff --git a/wiretap/netscreen.c b/wiretap/netscreen.c index 11c5fea7fd..c447a9a214 100644 --- a/wiretap/netscreen.c +++ b/wiretap/netscreen.c @@ -24,11 +24,9 @@ #include "config.h" #include "wtap-int.h" -#include #include "netscreen.h" #include "file_wrappers.h" -#include #include #include diff --git a/wiretap/nettl.c b/wiretap/nettl.c index 9880ff5872..9b07029721 100644 --- a/wiretap/nettl.c +++ b/wiretap/nettl.c @@ -28,7 +28,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "nettl.h" /* HP nettl file header */ diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c index c873b24a4c..3d929cd4df 100644 --- a/wiretap/network_instruments.c +++ b/wiretap/network_instruments.c @@ -22,7 +22,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "network_instruments.h" static const char network_instruments_magic[] = {"ObserverPktBufferVersion=15.00"}; diff --git a/wiretap/netxray.c b/wiretap/netxray.c index 69b39a3faf..7721b2b909 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -25,7 +25,6 @@ #include "wtap-int.h" #include "file_wrappers.h" #include "netxray.h" -#include #include "atm.h" /* Capture file header, *including* magic number, is padded to 128 bytes. */ diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index 95e117c923..ed89e61233 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -58,8 +58,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include -#include "atm.h" #include "ngsniffer.h" /* Magic number in Sniffer files. */ diff --git a/wiretap/packetlogger.c b/wiretap/packetlogger.c index ebf52d065c..943cbc0ac3 100644 --- a/wiretap/packetlogger.c +++ b/wiretap/packetlogger.c @@ -27,15 +27,11 @@ #include "config.h" -#include -#include #include #include #include -#include "wtap.h" #include "wtap-int.h" -#include #include "file_wrappers.h" #include "packetlogger.h" diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 925b7c5618..645668bec2 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -37,8 +37,6 @@ #include "wtap-int.h" #include #include "file_wrappers.h" -#include -#include "libpcap.h" #include "pcap-common.h" #include "pcap-encap.h" #include "pcapng.h" diff --git a/wiretap/peekclassic.c b/wiretap/peekclassic.c index 3065d88810..b58ab15758 100644 --- a/wiretap/peekclassic.c +++ b/wiretap/peekclassic.c @@ -38,7 +38,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "peekclassic.h" /* CREDITS * diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c index 47e2ee7d53..631170ed36 100644 --- a/wiretap/peektagged.c +++ b/wiretap/peektagged.c @@ -36,7 +36,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "peektagged.h" /* CREDITS diff --git a/wiretap/pppdump.c b/wiretap/pppdump.c index 5b1981fcd9..0d8b6e2b18 100644 --- a/wiretap/pppdump.c +++ b/wiretap/pppdump.c @@ -19,12 +19,9 @@ #include "config.h" #include "wtap-int.h" -#include #include "pppdump.h" #include "file_wrappers.h" -#include -#include #include #include #include diff --git a/wiretap/radcom.c b/wiretap/radcom.c index 95e0df36cf..6a0b6f8259 100644 --- a/wiretap/radcom.c +++ b/wiretap/radcom.c @@ -24,7 +24,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "radcom.h" struct frame_date { diff --git a/wiretap/snoop.c b/wiretap/snoop.c index 099d52c901..005a5832a9 100644 --- a/wiretap/snoop.c +++ b/wiretap/snoop.c @@ -23,7 +23,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "atm.h" #include "snoop.h" /* See RFC 1761 for a description of the "snoop" file format. */ diff --git a/wiretap/stanag4607.c b/wiretap/stanag4607.c index 59e5acc06c..1845cc0ab5 100644 --- a/wiretap/stanag4607.c +++ b/wiretap/stanag4607.c @@ -21,7 +21,6 @@ #include "config.h" -#include #include #ifdef HAVE_SYS_STAT_H diff --git a/wiretap/toshiba.c b/wiretap/toshiba.c index e3c3501702..091eb1e4c1 100644 --- a/wiretap/toshiba.c +++ b/wiretap/toshiba.c @@ -20,11 +20,9 @@ #include "config.h" #include "wtap-int.h" -#include #include "toshiba.h" #include "file_wrappers.h" -#include #include #include diff --git a/wiretap/visual.c b/wiretap/visual.c index 1a6a8675f6..0a84ef1bbd 100644 --- a/wiretap/visual.c +++ b/wiretap/visual.c @@ -25,7 +25,6 @@ #include #include "wtap-int.h" #include "file_wrappers.h" -#include #include "visual.h" /* diff --git a/wiretap/vms.c b/wiretap/vms.c index db5848f770..ebcfefb78c 100644 --- a/wiretap/vms.c +++ b/wiretap/vms.c @@ -27,11 +27,9 @@ */ #include "config.h" #include "wtap-int.h" -#include #include "vms.h" #include "file_wrappers.h" -#include #include #include diff --git a/wiretap/vwr.c b/wiretap/vwr.c index 10c8bf8ffa..6c7ad0127b 100644 --- a/wiretap/vwr.c +++ b/wiretap/vwr.c @@ -26,7 +26,6 @@ #include "wtap-int.h" #include "file_wrappers.h" -#include #include "vwr.h"