Removed duplicated #include lines
authorDario Lombardo <lomato@gmail.com>
Fri, 26 Dec 2014 22:48:39 +0000 (23:48 +0100)
committerPascal Quantin <pascal.quantin@gmail.com>
Sun, 28 Dec 2014 00:02:39 +0000 (00:02 +0000)
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:
asn1/rrc/packet-rrc-template.c
asn1/spnego/packet-spnego-template.c
captype.c
codecs/codecs.c
dumpcap.c
echld/echld-int.h
epan/dissectors/packet-cell_broadcast.c
epan/dissectors/packet-rrc.c
epan/dissectors/packet-smb.c
epan/dissectors/packet-spnego.c
epan/except.c
rawshark.c
tfshark.c
tools/lemon/lempar.c
tshark.c
ui/gtk/about_dlg.c
ui/gtk/compare_stat.c
ui/gtk/follow_tcp.c
ui/gtk/iax2_analysis.c
ui/gtk/io_stat.c
ui/gtk/memory_dlg.c
ui/gtk/pixmap_save.c
ui/gtk/prefs_dlg.c
ui/gtk/rtp_player.c
ui/gtk/rtp_stream.c
ui/gtk/sctp_error_dlg.c
ui/proto_hier_stats.c
ui/qt/about_dialog.cpp
ui/qt/follow_stream_dialog.cpp
ui/qt/preferences_dialog.cpp
wsutil/privileges.c
wsutil/sha1.c

index f27cb9359f081bea255acd3cc3c9c00e451c8881..3e235b2ef215881a1b050abb60ac402b19ff2fe7 100644 (file)
@@ -180,7 +180,6 @@ static void rrc_free_value(gpointer value ){
 }
 #include "packet-rrc-fn.c"
 
-#include "packet-rrc.h"
 
 
 static void
index 813014ea3a44a1dfa5146352a24a29a8c64ee17d..e6caf1af44f557d0c47ea3c63234d0297688a02a 100644 (file)
@@ -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"
index d52b186f36e844a8ad8e56f13195eec436434b24..d7372a0ab889255a2b159f22ebf48788ae466194 100644 (file)
--- a/captype.c
+++ b/captype.c
@@ -62,7 +62,6 @@
 
 #include "wtap.h"
 #include <wsutil/report_err.h>
-#include <wsutil/privileges.h>
 #include <wsutil/str_util.h>
 
 #ifdef _WIN32
index a7c00047ae8f8595c1b7ea25c4044b36d0e520b8..07a183ff7a0970ebb86ce6dead9f672dfa883f7c 100644 (file)
@@ -24,7 +24,6 @@
 
 #include <glib.h>
 #include "codecs.h"
-#include "config.h"
 
 #include "G711a/G711adecode.h"
 #include "G711u/G711udecode.h"
index b3fb1128d5ae0c7ca4495fb32b877faf3a83c343..5fb069528ea32e231ce1c5f8446f80aa8efcde54 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
 #include "pcapio.h"
 
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
 #include <wsutil/unicode-utils.h>
 #endif
 
index 8bbd1f9a14ab19347e53466176496508758b4abb..a002fb88bfba032979c590d29f89928beac36f26 100644 (file)
@@ -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"
index 0a58dfda30e391b6e5ba20f4a7814528a130bd84..afbf20aeab4fe0ccd720b36b2f826cb886ac4077 100644 (file)
@@ -28,7 +28,6 @@
 
 #include <epan/asn1.h>
 
-#include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/reassemble.h>
 
index 1b8682e9c0766a9dd5cca57850714d4a72709aa1..666a6ab9dd0570969dde301d9acdb6f3b4402c35 100644 (file)
@@ -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
index 3a98e407663ac3b6f99181098b49af805f0fb912..a1396b96c15508b313b027fd97df5a38361272ce 100644 (file)
@@ -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"
index 250010469e9c7ce0dc467e0ed77e8179d9f14f7f..ffe133700bdb4a4e2ac72db69deec45eaa54c6d6 100644 (file)
@@ -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"
index 9efbb00c4828c367c08e97d78f9edc1c03cf1dc5..0efe53b45d8a9e7ea43a31f86335ee9747171253 100644 (file)
@@ -378,7 +378,6 @@ void except_free(void *ptr)
 
 #ifdef KAZLIB_TEST_MAIN
 
-#include <stdio.h>
 
 static void cleanup(void *arg)
 {
index cbb69afb4de6489117c979bbac1f64d5ca049625..78f2e633c2ba440ad2826242e78e356b79aa1a18 100644 (file)
 #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
index b0134e72456eb9757a258461debb1538535a94f3..9eccfa65b6b7890503020aa511e28c64861c08cc 100644 (file)
--- a/tfshark.c
+++ b/tfshark.c
@@ -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>
index 3c0df385f94a967331ff67f28b0d8ca57281a3d0..5c82e694cafc5f96bec3943361f5ce2b347b3500 100644 (file)
@@ -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 */
index 9813f0faf236442b3ebb1dd744bdde63ba2f0a12..5ea210f7792178f725e779da0f6ed1df7b645f20 100644 (file)
--- a/tshark.c
+++ b/tshark.c
 #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>
 
 #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>
index ca3b515b05a5e65790a8e519886a69ddfa20eaa4..6f100c03564597205d698d5ab52acdfce9ea1a3e 100644 (file)
@@ -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"
 
index cffbba7add59833542392dfb2edbe7ac44c34f75..ffdee6c8fb2aa1f26c71aa5fbdd6d6c410b0f4fb 100644 (file)
@@ -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 */
index 3396ba85d8c5b6f7a03c2e7dae0e3571680f7fcb..29d383d736464247e3bc3d1739df5d6c407e8b71 100644 (file)
@@ -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"
index 4684d599e3fa898dc10735efe0cf6aa2df6870f6..69c97c964336c3460f6d2b38593d882a7e034e17 100644 (file)
@@ -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"
index 242f3b4f605474b5ed42b55600b1fca735f4bbb8..1723f643696c2bb8f6269b5184b304a09d7eccd8 100644 (file)
@@ -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);
 
index 357b6945326c91e50735624bd77dc234ae8523b3..3e0933f2af3536c11a7e57fe3cafd5402a479a57 100644 (file)
@@ -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"
index 877027dab6faf781900939427f411798bc9827c9..862275bc3f65da035a4443377eb2ccaa5fc9e7eb 100644 (file)
@@ -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)
index 769b24505a67b3e152c46cc76331350cdd4795c4..8e6f4f69f0fed38344a4e1b3ecc092322b6a5e1e 100644 (file)
@@ -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"
 
index 4dad06dd1a0e7bdf0ef386c545e235422e930b07..bbb44f81cc03fd89cc2e7a4cf929d85dd0ed7020 100644 (file)
@@ -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;
 
index 9eb8d8c2a431ad5dc920e99919bd12f3b38b092f..602c20971ebf311e63bc28457b635dc6bbbc9a40 100644 (file)
@@ -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"
 
index 95be6a4e06b1e64fa301be11e00920e3e9aa6bad..3ccb86022bada3e8d39dbedcff4eedfba861fe48 100644 (file)
@@ -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;
index 85d9188879568bb87c2628aaf89e9d99eb2e1447..115501d019dc33f4f2b199cad7c7a00d1ba5ebce 100644 (file)
@@ -31,7 +31,6 @@
 #include <epan/epan_dissect.h>
 #include <wtap.h>
 
-#include <stdio.h>
 #include <string.h>
 #include <glib.h>
 
index 73c32396d775e8911140c7abbd93dc3d3fd680f9..a1acfe5d7d8243dde49326a52fe0c92c30b22e7a 100644 (file)
@@ -58,7 +58,6 @@
 #include <QTextStream>
 #include <QUrl>
 
-#include "wireshark_application.h"
 
 // To do:
 // - Tweak and enhance ui...
index 3d5d2bd24e6f6732a26f78a7b3451937a76db503..4cebbe431494516af38e9198e0f5e17fadf877dc 100644 (file)
@@ -50,7 +50,6 @@
 #include "ui/follow.h"
 
 #include "qt_ui_utils.h"
-#include "wireshark_application.h"
 
 #include <QKeyEvent>
 #include <QMessageBox>
index 486e627dd3b4f92d290a391ff7cd8f366dbfdd09..475cd3389f5a1fba026a9ad271c920e6b21b89e1 100644 (file)
@@ -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"
index 7050e0fdf31a3076737041483fffd43daef86b42..46889885f485d23faab580ea7c518826a31a1a42 100644 (file)
@@ -169,7 +169,6 @@ npf_sys_is_running() {
 #include <grp.h>
 #endif
 
-#include <glib.h>
 #include <string.h>
 #include <errno.h>
 
index ff8036bd7d105acf89567f68126a7371fc22ecb8..55a99648311e2da4b2755634a4d4f3f6d1f28078 100644 (file)
@@ -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>
 
 /*