diff options
author | Dario Lombardo <lomato@gmail.com> | 2014-12-26 23:48:39 +0100 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-12-28 00:02:39 +0000 |
commit | 63ebe918d994485679e0d29ab7eb9bda84171fa1 (patch) | |
tree | 2077f2a6589190c8af744dca4fe0196f94dadba1 | |
parent | d094fca4601193083ba9d79133259557c4cee8f0 (diff) |
Removed duplicated #include lines
Change-Id: I9cafa3cd5c74121168777d8c656e7e94e89efd3c
Reviewed-on: https://code.wireshark.org/review/6065
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
32 files changed, 1 insertions, 36 deletions
diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c index f27cb9359f..3e235b2ef2 100644 --- a/asn1/rrc/packet-rrc-template.c +++ b/asn1/rrc/packet-rrc-template.c @@ -180,7 +180,6 @@ static void rrc_free_value(gpointer value ){ } #include "packet-rrc-fn.c" -#include "packet-rrc.h" static void diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c index 813014ea3a..e6caf1af44 100644 --- a/asn1/spnego/packet-spnego-template.c +++ b/asn1/spnego/packet-spnego-template.c @@ -35,7 +35,6 @@ #include <epan/expert.h> #include <epan/asn1.h> #include <epan/conversation.h> -#include <epan/asn1.h> #include <wsutil/rc4.h> #include "packet-dcerpc.h" #include "packet-gssapi.h" @@ -62,7 +62,6 @@ #include "wtap.h" #include <wsutil/report_err.h> -#include <wsutil/privileges.h> #include <wsutil/str_util.h> #ifdef _WIN32 diff --git a/codecs/codecs.c b/codecs/codecs.c index a7c00047ae..07a183ff7a 100644 --- a/codecs/codecs.c +++ b/codecs/codecs.c @@ -24,7 +24,6 @@ #include <glib.h> #include "codecs.h" -#include "config.h" #include "G711a/G711adecode.h" #include "G711u/G711udecode.h" @@ -100,7 +100,6 @@ #include "pcapio.h" #ifdef _WIN32 -#include "caputils/capture-wpcap.h" #include <wsutil/unicode-utils.h> #endif diff --git a/echld/echld-int.h b/echld/echld-int.h index 8bbd1f9a14..a002fb88bf 100644 --- a/echld/echld-int.h +++ b/echld/echld-int.h @@ -76,7 +76,6 @@ #include "epan/prefs.h" #include "epan/ex-opt.h" #include "epan/funnel.h" -#include "epan/prefs.h" #include "epan/timestamp.h" #include "epan/disabled_protos.h" #include "echld.h" diff --git a/epan/dissectors/packet-cell_broadcast.c b/epan/dissectors/packet-cell_broadcast.c index 0a58dfda30..afbf20aeab 100644 --- a/epan/dissectors/packet-cell_broadcast.c +++ b/epan/dissectors/packet-cell_broadcast.c @@ -28,7 +28,6 @@ #include <epan/asn1.h> -#include <epan/packet.h> #include <epan/expert.h> #include <epan/reassemble.h> diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 1b8682e9c0..666a6ab9dd 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -143766,7 +143766,6 @@ static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-rrc-fn.c ---*/ #line 182 "../../asn1/rrc/packet-rrc-template.c" -#include "packet-rrc.h" static void diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 3a98e40766..a1396b96c1 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -39,7 +39,6 @@ #include "packet-smb.h" #include "packet-ipx.h" #include "packet-idp.h" -#include "packet-smb.h" #include "packet-smb-common.h" #include "packet-smb-mailslot.h" #include "packet-smb-pipe.h" diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index 250010469e..ffe133700b 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -43,7 +43,6 @@ #include <epan/expert.h> #include <epan/asn1.h> #include <epan/conversation.h> -#include <epan/asn1.h> #include <wsutil/rc4.h> #include "packet-dcerpc.h" #include "packet-gssapi.h" diff --git a/epan/except.c b/epan/except.c index 9efbb00c48..0efe53b45d 100644 --- a/epan/except.c +++ b/epan/except.c @@ -378,7 +378,6 @@ void except_free(void *ptr) #ifdef KAZLIB_TEST_MAIN -#include <stdio.h> static void cleanup(void *arg) { diff --git a/rawshark.c b/rawshark.c index cbb69afb4d..78f2e633c2 100644 --- a/rawshark.c +++ b/rawshark.c @@ -119,10 +119,6 @@ #endif /* HAVE_LIBPCAP */ #include "log.h" -#ifdef _WIN32 -#include <wsutil/unicode-utils.h> -#endif /* _WIN32 */ - #if 0 /* * This is the template for the decode as option; it is shared between the @@ -91,7 +91,6 @@ #include <epan/epan_dissect.h> #include <epan/tap.h> #include <epan/stat_tap_ui.h> -#include <epan/timestamp.h> #include <epan/ex-opt.h> #include <wiretap/wtap-int.h> #include <wiretap/file_wrappers.h> diff --git a/tools/lemon/lempar.c b/tools/lemon/lempar.c index 3c0df385f9..5c82e694ca 100644 --- a/tools/lemon/lempar.c +++ b/tools/lemon/lempar.c @@ -200,7 +200,6 @@ struct yyParser { typedef struct yyParser yyParser; #ifndef NDEBUG -#include <stdio.h> static FILE *yyTraceFILE = 0; static char *yyTracePrompt = 0; #endif /* NDEBUG */ @@ -101,7 +101,6 @@ #include <epan/epan_dissect.h> #include <epan/tap.h> #include <epan/stat_tap_ui.h> -#include <epan/timestamp.h> #include <epan/conversation_table.h> #include <epan/ex-opt.h> @@ -118,7 +117,6 @@ #endif /* _WIN32 */ #include <capchild/capture_session.h> #include <capchild/capture_sync.h> -#include "capture_opts.h" #endif /* HAVE_LIBPCAP */ #include "log.h" #include <epan/funnel.h> diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c index ca3b515b05..6f100c0356 100644 --- a/ui/gtk/about_dlg.c +++ b/ui/gtk/about_dlg.c @@ -54,7 +54,6 @@ #include "ui/gtk/gtkglobals.h" #include "ui/gtk/main.h" #include "ui/gtk/plugins_dlg.h" -#include "ui/gtk/gui_utils.h" #include "ui/gtk/stock_icons.h" #include "ui/gtk/wssplash.h" diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index cffbba7add..ffdee6c8fb 100644 --- a/ui/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -70,7 +70,6 @@ #include "filter_dlg.h" #include "service_response_time_table.h" #include "gtkglobals.h" -#include "gui_utils.h" #include "globals.h" /* Color settings */ diff --git a/ui/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c index 3396ba85d8..29d383d736 100644 --- a/ui/gtk/follow_tcp.c +++ b/ui/gtk/follow_tcp.c @@ -39,7 +39,6 @@ #include <epan/charsets.h> #include <epan/epan_dissect.h> #include <wsutil/filesystem.h> -#include <epan/charsets.h> #include "../file.h" #include "ui/alert_box.h" diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 4684d599e3..69c97c9643 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -84,7 +84,6 @@ #include "ui/rtp_stream.h" #include "ui/gtk/rtp_stream_dlg.h" #include "ui/gtk/old-gtk-compat.h" -#include "ui/gtk/gui_utils.h" #include "ui/gtk/stock_icons.h" #include "frame_tvbuff.h" diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c index 242f3b4f60..1723f64369 100644 --- a/ui/gtk/io_stat.c +++ b/ui/gtk/io_stat.c @@ -52,7 +52,6 @@ #include "ui/main_statusbar.h" #include "ui/gtk/old-gtk-compat.h" -#include "ui/gtk/gui_utils.h" void register_tap_listener_gtk_iostat(void); diff --git a/ui/gtk/memory_dlg.c b/ui/gtk/memory_dlg.c index 357b694532..3e0933f2af 100644 --- a/ui/gtk/memory_dlg.c +++ b/ui/gtk/memory_dlg.c @@ -32,7 +32,6 @@ #include "ui/simple_dialog.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/old-gtk-compat.h" -#include "ui/gtk/gui_utils.h" #include "wsutil/str_util.h" #include "epan/app_mem_usage.h" diff --git a/ui/gtk/pixmap_save.c b/ui/gtk/pixmap_save.c index 877027dab6..862275bc3f 100644 --- a/ui/gtk/pixmap_save.c +++ b/ui/gtk/pixmap_save.c @@ -34,8 +34,8 @@ #include "ui/util.h" #include "ui/gtk/pixmap_save.h" -#include "ui/gtk/gui_utils.h" #include "ui/gtk/file_dlg.h" +#include "ui/gtk/gui_utils.h" #include "ui/gtk/old-gtk-compat.h" #if GTK_CHECK_VERSION(2,22,0) diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c index 769b24505a..8e6f4f69f0 100644 --- a/ui/gtk/prefs_dlg.c +++ b/ui/gtk/prefs_dlg.c @@ -53,7 +53,6 @@ #include "ui/gtk/uat_gui.h" #include "ui/gtk/old-gtk-compat.h" #include "ui/gtk/file_dlg.h" -#include "ui/gtk/dlg_utils.h" #include "ui/gtk/packet_win.h" #include "simple_dialog.h" diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c index 4dad06dd1a..bbb44f81cc 100644 --- a/ui/gtk/rtp_player.c +++ b/ui/gtk/rtp_player.c @@ -81,7 +81,6 @@ #include "ui/gtk/stock_icons.h" #include "ui/gtk/old-gtk-compat.h" -#include "ui/gtk/gui_utils.h" static gboolean initialized = FALSE; diff --git a/ui/gtk/rtp_stream.c b/ui/gtk/rtp_stream.c index 9eb8d8c2a4..602c20971e 100644 --- a/ui/gtk/rtp_stream.c +++ b/ui/gtk/rtp_stream.c @@ -46,7 +46,6 @@ #include "ui/tap-rtp-common.h" #include <wsutil/file_util.h> -#include "ui/rtp_stream.h" #include "ui/gtk/rtp_stream_dlg.h" #include "ui/gtk/main.h" diff --git a/ui/gtk/sctp_error_dlg.c b/ui/gtk/sctp_error_dlg.c index 95be6a4e06..3ccb86022b 100644 --- a/ui/gtk/sctp_error_dlg.c +++ b/ui/gtk/sctp_error_dlg.c @@ -34,7 +34,6 @@ #include "ui/gtk/main.h" #include "ui/tap-sctp-analysis.h" #include "ui/gtk/sctp_stat_gtk.h" -#include "ui/gtk/gui_utils.h" #include "ui/gtk/stock_icons.h" static GtkWidget *sctp_error_dlg=NULL; diff --git a/ui/proto_hier_stats.c b/ui/proto_hier_stats.c index 85d9188879..115501d019 100644 --- a/ui/proto_hier_stats.c +++ b/ui/proto_hier_stats.c @@ -31,7 +31,6 @@ #include <epan/epan_dissect.h> #include <wtap.h> -#include <stdio.h> #include <string.h> #include <glib.h> diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index 73c32396d7..a1acfe5d7d 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -58,7 +58,6 @@ #include <QTextStream> #include <QUrl> -#include "wireshark_application.h" // To do: // - Tweak and enhance ui... diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp index 3d5d2bd24e..4cebbe4314 100644 --- a/ui/qt/follow_stream_dialog.cpp +++ b/ui/qt/follow_stream_dialog.cpp @@ -50,7 +50,6 @@ #include "ui/follow.h" #include "qt_ui_utils.h" -#include "wireshark_application.h" #include <QKeyEvent> #include <QMessageBox> diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp index 486e627dd3..475cd3389f 100644 --- a/ui/qt/preferences_dialog.cpp +++ b/ui/qt/preferences_dialog.cpp @@ -35,7 +35,6 @@ #include <ui/preference_utils.h> #include <main_window.h> -#include "module_preferences_scroll_area.h" #include "syntax_line_edit.h" #include "qt_ui_utils.h" #include "uat_dialog.h" diff --git a/wsutil/privileges.c b/wsutil/privileges.c index 7050e0fdf3..46889885f4 100644 --- a/wsutil/privileges.c +++ b/wsutil/privileges.c @@ -169,7 +169,6 @@ npf_sys_is_running() { #include <grp.h> #endif -#include <glib.h> #include <string.h> #include <errno.h> diff --git a/wsutil/sha1.c b/wsutil/sha1.c index ff8036bd7d..55a9964831 100644 --- a/wsutil/sha1.c +++ b/wsutil/sha1.c @@ -339,7 +339,6 @@ void sha1_hmac( const guint8 *key, guint32 keylen, const guint8 *buf, guint32 bu #include <stdlib.h> #include <stdio.h> -#include <glib.h> #include <errno.h> /* |