From 8e689a9d4ac7504217001359ad030a2d57295930 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 7 Nov 2015 15:12:18 -0800 Subject: [PATCH] Remove some unnecessary includes. Either remove them completely, or put them inside an #ifdef. Change-Id: Iceff4909e250c17812f38d94e067f7c37ab72e1b Reviewed-on: https://code.wireshark.org/review/11630 Reviewed-by: Guy Harris --- epan/conversation.c | 2 -- epan/dfilter/dfilter-macro.c | 3 ++- epan/dfilter/dfvm.h | 1 - epan/dissectors/packet-catapult-dct2000.c | 1 - epan/dissectors/packet-etch.c | 3 --- epan/dissectors/packet-ftp.c | 1 - epan/dissectors/packet-gsm_abis_om2000.c | 4 ---- epan/dissectors/packet-http2.c | 2 -- epan/dissectors/packet-icmp.c | 1 - epan/dissectors/packet-iscsi.c | 1 - epan/dissectors/packet-memcache.c | 1 - epan/dissectors/packet-opensafety.c | 1 - epan/dissectors/packet-rtsp.c | 1 - epan/dissectors/packet-smb-sidsnooping.c | 2 -- epan/dissectors/packet-srvloc.c | 1 - epan/dissectors/packet-tpncp.c | 3 --- 16 files changed, 2 insertions(+), 26 deletions(-) diff --git a/epan/conversation.c b/epan/conversation.c index e664bc7cda..0f48edc9ec 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -22,8 +22,6 @@ #include "config.h" -#include - #include #include #include "packet.h" diff --git a/epan/dfilter/dfilter-macro.c b/epan/dfilter/dfilter-macro.c index cd33b50a7e..6ea88191e3 100644 --- a/epan/dfilter/dfilter-macro.c +++ b/epan/dfilter/dfilter-macro.c @@ -22,8 +22,9 @@ #include "config.h" +#ifdef DUMP_DFILTER_MACRO #include -#include +#endif #include #include "dfilter-int.h" diff --git a/epan/dfilter/dfvm.h b/epan/dfilter/dfvm.h index 5b008081b0..c9ee83f851 100644 --- a/epan/dfilter/dfvm.h +++ b/epan/dfilter/dfvm.h @@ -21,7 +21,6 @@ #ifndef DFVM_H #define DFVM_H -#include #include #include "dfilter-int.h" #include "syntax-tree.h" diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 27137cc4be..316713c5bd 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -23,7 +23,6 @@ #include "config.h" #include -#include #include #include diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c index 8a38f7c435..df28f32c87 100644 --- a/epan/dissectors/packet-etch.c +++ b/epan/dissectors/packet-etch.c @@ -30,9 +30,6 @@ #include "config.h" -#include -#include - #include #include #include diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index a3807182cc..cad498e0c5 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -27,7 +27,6 @@ #include "config.h" #include -#include #include #include diff --git a/epan/dissectors/packet-gsm_abis_om2000.c b/epan/dissectors/packet-gsm_abis_om2000.c index 6f12530667..3cb1fd03cd 100644 --- a/epan/dissectors/packet-gsm_abis_om2000.c +++ b/epan/dissectors/packet-gsm_abis_om2000.c @@ -28,12 +28,8 @@ #include "config.h" -#include - #include - - void proto_register_abis_om2000(void); /* initialize the protocol and registered fields */ diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index e43e8a333a..ac318318c5 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -38,8 +38,6 @@ #include "config.h" -#include - #include #include diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 1d4410929a..c379ffcd51 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -922,7 +922,6 @@ dissect_extensions(tvbuff_t * tvb, gint offset, proto_tree * tree) } } -#include /* ======================================================================= */ static icmp_transaction_t *transaction_start(packet_info * pinfo, proto_tree * tree, diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index 96398f0142..7fd78dd6fd 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -33,7 +33,6 @@ #include "config.h" #include -#include #include #include diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c index 75559dfee6..dbda514678 100644 --- a/epan/dissectors/packet-memcache.c +++ b/epan/dissectors/packet-memcache.c @@ -31,7 +31,6 @@ #include "config.h" #include -#include #include #include diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index cb16f9cb43..e523cedf9b 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -37,7 +37,6 @@ */ #include "config.h" -#include #include #include diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index f3d60ad30b..fabb3a863a 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -30,7 +30,6 @@ #include "config.h" #include -#include #include #include diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c index 52328bc2da..91a56b14b6 100644 --- a/epan/dissectors/packet-smb-sidsnooping.c +++ b/epan/dissectors/packet-smb-sidsnooping.c @@ -23,8 +23,6 @@ #include "config.h" -#include - #include #include #include diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index 8817c2e39a..931809d8c7 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.c @@ -35,7 +35,6 @@ #include "config.h" #include -#include #include #include diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index b4572dc9d0..b42aa9bec3 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -26,9 +26,6 @@ #include "config.h" -#include -#include - #include #include #include