aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-12-03 21:33:59 -0800
committerGuy Harris <guy@alum.mit.edu>2017-12-04 05:35:36 +0000
commitccc55bc80cb8965a73fae980d6e1babf6d8a8823 (patch)
treea729cd74ca58f112e8a2afae7510cbe572615311
parent1834dca3654ccec238bae130715871be3d8fa344 (diff)
Put the structure of a capture_file back in cfile.h.
The split isn't necessary now that epan no longer uses the capture_file structure. Change-Id: Ia232712a2fb5db511865805518e8d03509b2167f Reviewed-on: https://code.wireshark.org/review/24693 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--Makefile.am1
-rw-r--r--cfile-int.h70
-rw-r--r--cfile.c1
-rw-r--r--cfile.h71
-rw-r--r--epan/tap.h1
-rw-r--r--file.c1
-rw-r--r--file.h1
-rw-r--r--globals.h1
-rw-r--r--summary.c1
-rw-r--r--ui/capture.c2
-rw-r--r--ui/export_pdu_ui_utils.c1
-rw-r--r--ui/gtk/main_titlebar.c1
-rw-r--r--ui/packet_list_utils.c1
-rw-r--r--ui/packet_range.c2
-rw-r--r--ui/proto_hier_stats.c1
-rw-r--r--ui/qt/address_editor_frame.cpp2
-rw-r--r--ui/qt/byte_view_tab.cpp1
-rw-r--r--ui/qt/capture_file_dialog.cpp1
-rw-r--r--ui/qt/capture_file_properties_dialog.cpp2
-rw-r--r--ui/qt/conversation_dialog.cpp2
-rw-r--r--ui/qt/endpoint_dialog.cpp2
-rw-r--r--ui/qt/expert_info_dialog.cpp1
-rw-r--r--ui/qt/file_set_dialog.cpp1
-rw-r--r--ui/qt/follow_stream_dialog.cpp2
-rw-r--r--ui/qt/iax2_analysis_dialog.cpp1
-rw-r--r--ui/qt/io_graph_dialog.cpp1
-rw-r--r--ui/qt/lbm_lbtrm_transport_dialog.h1
-rw-r--r--ui/qt/lbm_lbtru_transport_dialog.h1
-rw-r--r--ui/qt/lbm_stream_dialog.h1
-rw-r--r--ui/qt/main_status_bar.cpp2
-rw-r--r--ui/qt/main_window.cpp2
-rw-r--r--ui/qt/main_window_slots.cpp2
-rw-r--r--ui/qt/models/decode_as_delegate.cpp2
-rw-r--r--ui/qt/models/decode_as_model.cpp2
-rw-r--r--ui/qt/models/packet_list_model.cpp1
-rw-r--r--ui/qt/models/packet_list_record.cpp1
-rw-r--r--ui/qt/packet_dialog.cpp2
-rw-r--r--ui/qt/packet_list.cpp1
-rw-r--r--ui/qt/packet_range_group_box.cpp1
-rw-r--r--ui/qt/print_dialog.cpp2
-rw-r--r--ui/qt/proto_tree.cpp2
-rw-r--r--ui/qt/protocol_hierarchy_dialog.cpp1
-rw-r--r--ui/qt/resolved_addresses_dialog.cpp1
-rw-r--r--ui/qt/rtp_analysis_dialog.cpp1
-rw-r--r--ui/qt/rtp_analysis_dialog.h1
-rw-r--r--ui/qt/sctp_assoc_analyse_dialog.cpp2
-rw-r--r--ui/qt/search_frame.cpp1
-rw-r--r--ui/qt/sequence_dialog.cpp1
-rw-r--r--ui/qt/show_packet_bytes_dialog.cpp2
-rw-r--r--ui/qt/time_shift_dialog.cpp2
-rw-r--r--ui/qt/traffic_table_dialog.cpp2
-rw-r--r--ui/qt/utils/frame_information.cpp1
-rw-r--r--ui/qt/voip_calls_dialog.cpp1
-rw-r--r--ui/tap-rlc-graph.c2
-rw-r--r--ui/tap-tcp-stream.c2
-rw-r--r--ui/time_shift.c2
-rw-r--r--ui/voip_calls.c1
-rw-r--r--ui/win32/file_dlg_win32.c1
-rw-r--r--wireshark-qt.cpp1
59 files changed, 68 insertions, 152 deletions
diff --git a/Makefile.am b/Makefile.am
index d1c1754..63968c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -698,7 +698,6 @@ dumpcap_LDADD = \
pkginclude_HEADERS = \
cfile.h \
- cfile-int.h \
file.h \
globals.h \
log.h \
diff --git a/cfile-int.h b/cfile-int.h
index c658b23..ffad251 100644
--- a/cfile-int.h
+++ b/cfile-int.h
@@ -11,80 +11,10 @@
#ifndef __CFILE_INT_H__
#define __CFILE_INT_H__
-#include <epan/epan.h>
-#include <epan/column-info.h>
-#include <epan/dfilter/dfilter.h>
-#include <epan/frame_data.h>
-#include <epan/frame_data_sequence.h>
-#include <epan/frame_set.h>
-#include <wiretap/wtap.h>
-
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-struct _capture_file {
- epan_t *epan;
- file_state state; /* Current state of capture file */
- gchar *filename; /* Name of capture file */
- gchar *source; /* Temp file source, e.g. "Pipe from elsewhere" */
- gboolean is_tempfile; /* Is capture file a temporary file? */
- gboolean unsaved_changes; /* Does the capture file have changes that have not been saved? */
- gboolean stop_flag; /* Stop current processing (loading, searching, etc.) */
-
- gint64 f_datalen; /* Size of capture file data (uncompressed) */
- guint16 cd_t; /* File type of capture file */
- unsigned int open_type; /* open_routine index+1 used, if selected, or WTAP_TYPE_AUTO */
- gboolean iscompressed; /* TRUE if the file is compressed */
- int lnk_t; /* File link-layer type; could be WTAP_ENCAP_PER_PACKET */
- GArray *linktypes; /* Array of packet link-layer types */
- guint32 count; /* Total number of frames */
- guint64 packet_comment_count; /* Number of comments in frames (could be >1 per frame... */
- guint32 displayed_count; /* Number of displayed frames */
- guint32 marked_count; /* Number of marked frames */
- guint32 ignored_count; /* Number of ignored frames */
- guint32 ref_time_count; /* Number of time referenced frames */
- gboolean drops_known; /* TRUE if we know how many packets were dropped */
- guint32 drops; /* Dropped packets */
- nstime_t elapsed_time; /* Elapsed time */
- int snap; /* Maximum captured packet length; 0 if unknown */
- dfilter_t *rfcode; /* Compiled read filter program */
- dfilter_t *dfcode; /* Compiled display filter program */
- gchar *dfilter; /* Display filter string */
- gboolean redissecting; /* TRUE if currently redissecting (cf_redissect_packets) */
- /* search */
- gchar *sfilter; /* Filter, hex value, or string being searched */
- gboolean hex; /* TRUE if "Hex value" search was last selected */
- gboolean string; /* TRUE if "String" search was last selected */
- gboolean summary_data; /* TRUE if "String" search in "Packet list" (Info column) was last selected */
- gboolean decode_data; /* TRUE if "String" search in "Packet details" was last selected */
- gboolean packet_data; /* TRUE if "String" search in "Packet data" was last selected */
- guint32 search_pos; /* Byte position of last byte found in a hex search */
- guint32 search_len; /* Length of bytes matching the search */
- gboolean case_type; /* TRUE if case-insensitive text search */
- GRegex *regex; /* Set if regular expression search */
- search_charset_t scs_type; /* Character set for text search */
- search_direction dir; /* Direction in which to do searches */
- gboolean search_in_progress; /* TRUE if user just clicked OK in the Find dialog or hit <control>N/B */
- /* packet data */
- struct wtap_pkthdr phdr; /* Packet header */
- Buffer buf; /* Packet data */
- /* frames */
- frame_set frame_set_info; /* fjfff */
- guint32 first_displayed; /* Frame number of first frame displayed */
- guint32 last_displayed; /* Frame number of last frame displayed */
- column_info cinfo; /* Column formatting information */
- gboolean columns_changed; /**< Have the columns been changed in the prefs? (GTK+ only) */
- frame_data *current_frame; /* Frame data for current frame */
- gint current_row; /* Row number for current frame */
- epan_dissect_t *edt; /* Protocol dissection for currently selected packet */
- field_info *finfo_selected; /* Field info for currently selected field */
- gpointer window; /* Top-level window associated with file */
- gulong computed_elapsed; /* Elapsed time to load the file (in msec). */
-
- guint32 cum_bytes;
-};
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/cfile.c b/cfile.c
index 73cc47e..3e257c9 100644
--- a/cfile.c
+++ b/cfile.c
@@ -17,7 +17,6 @@
#include <wiretap/pcapng.h>
#include "cfile.h"
-#include "cfile-int.h"
void
cap_file_init(capture_file *cf)
diff --git a/cfile.h b/cfile.h
index 5160294..809e9c8 100644
--- a/cfile.h
+++ b/cfile.h
@@ -11,7 +11,13 @@
#ifndef __CFILE_H__
#define __CFILE_H__
-#include <glib.h>
+#include <epan/epan.h>
+#include <epan/column-info.h>
+#include <epan/dfilter/dfilter.h>
+#include <epan/frame_data.h>
+#include <epan/frame_data_sequence.h>
+#include <epan/frame_set.h>
+#include <wiretap/wtap.h>
#ifdef __cplusplus
extern "C" {
@@ -38,8 +44,67 @@ typedef enum {
SD_BACKWARD
} search_direction;
-struct _capture_file;
-typedef struct _capture_file capture_file;
+typedef struct _capture_file {
+ epan_t *epan;
+ file_state state; /* Current state of capture file */
+ gchar *filename; /* Name of capture file */
+ gchar *source; /* Temp file source, e.g. "Pipe from elsewhere" */
+ gboolean is_tempfile; /* Is capture file a temporary file? */
+ gboolean unsaved_changes; /* Does the capture file have changes that have not been saved? */
+ gboolean stop_flag; /* Stop current processing (loading, searching, etc.) */
+
+ gint64 f_datalen; /* Size of capture file data (uncompressed) */
+ guint16 cd_t; /* File type of capture file */
+ unsigned int open_type; /* open_routine index+1 used, if selected, or WTAP_TYPE_AUTO */
+ gboolean iscompressed; /* TRUE if the file is compressed */
+ int lnk_t; /* File link-layer type; could be WTAP_ENCAP_PER_PACKET */
+ GArray *linktypes; /* Array of packet link-layer types */
+ guint32 count; /* Total number of frames */
+ guint64 packet_comment_count; /* Number of comments in frames (could be >1 per frame... */
+ guint32 displayed_count; /* Number of displayed frames */
+ guint32 marked_count; /* Number of marked frames */
+ guint32 ignored_count; /* Number of ignored frames */
+ guint32 ref_time_count; /* Number of time referenced frames */
+ gboolean drops_known; /* TRUE if we know how many packets were dropped */
+ guint32 drops; /* Dropped packets */
+ nstime_t elapsed_time; /* Elapsed time */
+ int snap; /* Maximum captured packet length; 0 if unknown */
+ dfilter_t *rfcode; /* Compiled read filter program */
+ dfilter_t *dfcode; /* Compiled display filter program */
+ gchar *dfilter; /* Display filter string */
+ gboolean redissecting; /* TRUE if currently redissecting (cf_redissect_packets) */
+ /* search */
+ gchar *sfilter; /* Filter, hex value, or string being searched */
+ gboolean hex; /* TRUE if "Hex value" search was last selected */
+ gboolean string; /* TRUE if "String" search was last selected */
+ gboolean summary_data; /* TRUE if "String" search in "Packet list" (Info column) was last selected */
+ gboolean decode_data; /* TRUE if "String" search in "Packet details" was last selected */
+ gboolean packet_data; /* TRUE if "String" search in "Packet data" was last selected */
+ guint32 search_pos; /* Byte position of last byte found in a hex search */
+ guint32 search_len; /* Length of bytes matching the search */
+ gboolean case_type; /* TRUE if case-insensitive text search */
+ GRegex *regex; /* Set if regular expression search */
+ search_charset_t scs_type; /* Character set for text search */
+ search_direction dir; /* Direction in which to do searches */
+ gboolean search_in_progress; /* TRUE if user just clicked OK in the Find dialog or hit <control>N/B */
+ /* packet data */
+ struct wtap_pkthdr phdr; /* Packet header */
+ Buffer buf; /* Packet data */
+ /* frames */
+ frame_set frame_set_info; /* fjfff */
+ guint32 first_displayed; /* Frame number of first frame displayed */
+ guint32 last_displayed; /* Frame number of last frame displayed */
+ column_info cinfo; /* Column formatting information */
+ gboolean columns_changed; /**< Have the columns been changed in the prefs? (GTK+ only) */
+ frame_data *current_frame; /* Frame data for current frame */
+ gint current_row; /* Row number for current frame */
+ epan_dissect_t *edt; /* Protocol dissection for currently selected packet */
+ field_info *finfo_selected; /* Field info for currently selected field */
+ gpointer window; /* Top-level window associated with file */
+ gulong computed_elapsed; /* Elapsed time to load the file (in msec). */
+
+ guint32 cum_bytes;
+} capture_file;
extern void cap_file_init(capture_file *cf);
diff --git a/epan/tap.h b/epan/tap.h
index 395bf19..edaaa31 100644
--- a/epan/tap.h
+++ b/epan/tap.h
@@ -24,7 +24,6 @@
#define __TAP_H__
#include <epan/epan.h>
-#include <epan/packet_info.h>
#include "ws_symbol_export.h"
#ifdef __cplusplus
diff --git a/file.c b/file.c
index 05cbdbd..0bc3023 100644
--- a/file.c
+++ b/file.c
@@ -44,7 +44,6 @@
#include <epan/color_filters.h>
#include "cfile.h"
-#include "cfile-int.h"
#include "file.h"
#include "fileset.h"
#include "frame_tvbuff.h"
diff --git a/file.h b/file.h
index a29c995..198e20a 100644
--- a/file.h
+++ b/file.h
@@ -15,7 +15,6 @@
#include <wiretap/wtap.h>
#include <epan/epan.h>
-#include <epan/dfilter/dfilter.h>
#include <epan/print.h>
#include <ui/packet_range.h>
diff --git a/globals.h b/globals.h
index 4d32614..246c829 100644
--- a/globals.h
+++ b/globals.h
@@ -12,7 +12,6 @@
#define __GLOBALS_H__
#include "file.h"
-#include "cfile-int.h"
#include <epan/timestamp.h>
#ifdef __cplusplus
diff --git a/summary.c b/summary.c
index d3e2212..4e0bd7b 100644
--- a/summary.c
+++ b/summary.c
@@ -16,7 +16,6 @@
#include <epan/packet.h>
#include "cfile.h"
-#include "cfile-int.h"
#include "summary.h"
static void
diff --git a/ui/capture.c b/ui/capture.c
index 36e2781..1e1c837 100644
--- a/ui/capture.c
+++ b/ui/capture.c
@@ -21,8 +21,6 @@
#include <epan/packet.h>
#include <epan/dfilter/dfilter.h>
#include "file.h"
-#include "cfile.h"
-#include "cfile-int.h"
#include "ui/capture.h"
#include "caputils/capture_ifinfo.h"
#include <capchild/capture_sync.h>
diff --git a/ui/export_pdu_ui_utils.c b/ui/export_pdu_ui_utils.c
index b43a883..8a56fee 100644
--- a/ui/export_pdu_ui_utils.c
+++ b/ui/export_pdu_ui_utils.c
@@ -40,7 +40,6 @@
#include "ui/alert_box.h"
#include "ui/simple_dialog.h"
#include "tap_export_pdu.h"
-#include "cfile-int.h"
#include "export_pdu_ui_utils.h"
static void
diff --git a/ui/gtk/main_titlebar.c b/ui/gtk/main_titlebar.c
index b04c998..9b8ee56 100644
--- a/ui/gtk/main_titlebar.c
+++ b/ui/gtk/main_titlebar.c
@@ -27,7 +27,6 @@
#include <gtk/gtk.h>
#include "file.h"
-#include "cfile-int.h"
#include "gtkglobals.h"
#include "gui_utils.h"
diff --git a/ui/packet_list_utils.c b/ui/packet_list_utils.c
index 3fba27c..3084e5b 100644
--- a/ui/packet_list_utils.c
+++ b/ui/packet_list_utils.c
@@ -27,7 +27,6 @@
#include "packet_list_utils.h"
#include <epan/column.h>
-#include "cfile-int.h"
gboolean
right_justify_column (gint col, capture_file *cf)
diff --git a/ui/packet_range.c b/ui/packet_range.c
index a39af2c..90b8946 100644
--- a/ui/packet_range.c
+++ b/ui/packet_range.c
@@ -33,8 +33,6 @@
#include "packet_range.h"
-#include "cfile-int.h"
-
/* (re-)calculate the packet counts (except the user specified range) */
static void packet_range_calc(packet_range_t *range) {
guint32 framenum;
diff --git a/ui/proto_hier_stats.c b/ui/proto_hier_stats.c
index f4ee190..66a8c53 100644
--- a/ui/proto_hier_stats.c
+++ b/ui/proto_hier_stats.c
@@ -18,7 +18,6 @@
#include "ui/progress_dlg.h"
#include "epan/epan_dissect.h"
#include "epan/proto.h"
-#include "cfile-int.h"
/* Update the progress bar this many times when scanning the packet list. */
#define N_PROGBAR_UPDATES 100
diff --git a/ui/qt/address_editor_frame.cpp b/ui/qt/address_editor_frame.cpp
index c3a16fe..a56464b 100644
--- a/ui/qt/address_editor_frame.cpp
+++ b/ui/qt/address_editor_frame.cpp
@@ -30,8 +30,6 @@
#include "epan/epan_dissect.h"
#include "epan/frame_data.h"
-#include "cfile-int.h"
-
#include "address_editor_frame.h"
#include <ui_address_editor_frame.h>
diff --git a/ui/qt/byte_view_tab.cpp b/ui/qt/byte_view_tab.cpp
index 742cac1..a038f63 100644
--- a/ui/qt/byte_view_tab.cpp
+++ b/ui/qt/byte_view_tab.cpp
@@ -28,7 +28,6 @@
#include <QTreeWidgetItem>
#include "cfile.h"
-#include "cfile-int.h"
#include "epan/epan_dissect.h"
#include "epan/tvbuff-int.h"
diff --git a/ui/qt/capture_file_dialog.cpp b/ui/qt/capture_file_dialog.cpp
index 6935c2b..22ff4ea 100644
--- a/ui/qt/capture_file_dialog.cpp
+++ b/ui/qt/capture_file_dialog.cpp
@@ -32,7 +32,6 @@
#include <errno.h>
#include "file.h"
-#include "cfile-int.h"
#include "wsutil/filesystem.h"
#include "wsutil/nstime.h"
#include "wsutil/str_util.h"
diff --git a/ui/qt/capture_file_properties_dialog.cpp b/ui/qt/capture_file_properties_dialog.cpp
index 21de728..477ce66 100644
--- a/ui/qt/capture_file_properties_dialog.cpp
+++ b/ui/qt/capture_file_properties_dialog.cpp
@@ -33,8 +33,6 @@
#include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h"
-#include "cfile-int.h"
-
#include <QPushButton>
#include <QScrollBar>
#include <QTextStream>
diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp
index eddd172..a66ceb5 100644
--- a/ui/qt/conversation_dialog.cpp
+++ b/ui/qt/conversation_dialog.cpp
@@ -24,8 +24,6 @@
#include <epan/prefs.h>
#include <epan/dissectors/packet-tcp.h>
-#include "cfile-int.h"
-
#include "ui/recent.h"
#include "ui/tap-tcp-stream.h"
#include "ui/traffic_table_ui.h"
diff --git a/ui/qt/endpoint_dialog.cpp b/ui/qt/endpoint_dialog.cpp
index d01299d..001f3d6 100644
--- a/ui/qt/endpoint_dialog.cpp
+++ b/ui/qt/endpoint_dialog.cpp
@@ -29,8 +29,6 @@
#include <epan/prefs.h>
-#include "cfile-int.h"
-
#include "ui/recent.h"
#include "ui/traffic_table_ui.h"
diff --git a/ui/qt/expert_info_dialog.cpp b/ui/qt/expert_info_dialog.cpp
index 83184c9..b099e56 100644
--- a/ui/qt/expert_info_dialog.cpp
+++ b/ui/qt/expert_info_dialog.cpp
@@ -23,7 +23,6 @@
#include <ui_expert_info_dialog.h>
#include "file.h"
-#include "cfile-int.h"
#include <epan/epan_dissect.h>
#include <epan/expert.h>
diff --git a/ui/qt/file_set_dialog.cpp b/ui/qt/file_set_dialog.cpp
index f1a81e8..808163a 100644
--- a/ui/qt/file_set_dialog.cpp
+++ b/ui/qt/file_set_dialog.cpp
@@ -25,7 +25,6 @@
#include "file.h"
#include "fileset.h"
-#include "cfile-int.h"
#include "ui/help_url.h"
diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp
index 51997cc..6e0bf46 100644
--- a/ui/qt/follow_stream_dialog.cpp
+++ b/ui/qt/follow_stream_dialog.cpp
@@ -34,8 +34,6 @@
#include "epan/epan_dissect.h"
#include "epan/tap.h"
-#include "cfile-int.h"
-
#include "ui/alert_box.h"
#include "ui/simple_dialog.h"
#include <wsutil/utf8_entities.h>
diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp
index f7e1676..92707f8 100644
--- a/ui/qt/iax2_analysis_dialog.cpp
+++ b/ui/qt/iax2_analysis_dialog.cpp
@@ -23,7 +23,6 @@
#include <ui_iax2_analysis_dialog.h>
#include "file.h"
-#include "cfile-int.h"
#include "frame_tvbuff.h"
#include <epan/epan_dissect.h>
diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp
index f666a99..0a69f9c 100644
--- a/ui/qt/io_graph_dialog.cpp
+++ b/ui/qt/io_graph_dialog.cpp
@@ -23,7 +23,6 @@
#include <ui_io_graph_dialog.h>
#include "file.h"
-#include "cfile-int.h"
#include <epan/stat_tap_ui.h>
#include "epan/stats_tree_priv.h"
diff --git a/ui/qt/lbm_lbtrm_transport_dialog.h b/ui/qt/lbm_lbtrm_transport_dialog.h
index 1562724..bb0f759 100644
--- a/ui/qt/lbm_lbtrm_transport_dialog.h
+++ b/ui/qt/lbm_lbtrm_transport_dialog.h
@@ -29,7 +29,6 @@
#include <glib.h>
#include "cfile.h"
-#include <epan/epan.h>
#include <epan/packet_info.h>
#include <QDialog>
diff --git a/ui/qt/lbm_lbtru_transport_dialog.h b/ui/qt/lbm_lbtru_transport_dialog.h
index ea823e9..25d3ac6 100644
--- a/ui/qt/lbm_lbtru_transport_dialog.h
+++ b/ui/qt/lbm_lbtru_transport_dialog.h
@@ -29,7 +29,6 @@
#include <glib.h>
#include "cfile.h"
-#include <epan/epan.h>
#include <epan/packet_info.h>
#include <QDialog>
diff --git a/ui/qt/lbm_stream_dialog.h b/ui/qt/lbm_stream_dialog.h
index 0cee88d..8310b0a 100644
--- a/ui/qt/lbm_stream_dialog.h
+++ b/ui/qt/lbm_stream_dialog.h
@@ -29,7 +29,6 @@
#include <glib.h>
#include "cfile.h"
-#include <epan/epan.h>
#include <epan/packet_info.h>
#include <QDialog>
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp
index 091f509..4ebd58e 100644
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@@ -41,8 +41,6 @@
#include <ui/qt/utils/stock_icon.h>
#include <ui/qt/utils/tango_colors.h>
-#include "cfile-int.h"
-
#include <QAction>
#include <QHBoxLayout>
#include <QSplitter>
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index c75a388..2dee41a 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -39,8 +39,6 @@ DIAG_ON(frame-larger-than=)
#include <epan/plugin_if.h>
#include <epan/export_object.h>
-#include "cfile-int.h"
-
#include "ui/iface_toolbar.h"
#ifdef HAVE_LIBPCAP
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 851411d..facf70e 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -71,8 +71,6 @@ DIAG_ON(frame-larger-than=)
#include <epan/wslua/init_wslua.h>
#endif
-#include "cfile-int.h"
-
#include "ui/alert_box.h"
#ifdef HAVE_LIBPCAP
#include "ui/capture_ui_utils.h"
diff --git a/ui/qt/models/decode_as_delegate.cpp b/ui/qt/models/decode_as_delegate.cpp
index 1dc806f..bc632f5 100644
--- a/ui/qt/models/decode_as_delegate.cpp
+++ b/ui/qt/models/decode_as_delegate.cpp
@@ -25,8 +25,6 @@
#include "epan/decode_as.h"
#include "epan/epan_dissect.h"
-#include "cfile-int.h"
-
#include <ui/qt/utils/variant_pointer.h>
#include <QComboBox>
diff --git a/ui/qt/models/decode_as_model.cpp b/ui/qt/models/decode_as_model.cpp
index 653c513..bc73784 100644
--- a/ui/qt/models/decode_as_model.cpp
+++ b/ui/qt/models/decode_as_model.cpp
@@ -29,8 +29,6 @@
#include <epan/prefs-int.h>
#include <epan/dissectors/packet-dcerpc.h>
-#include "cfile-int.h"
-
#include <ui/qt/utils/qt_ui_utils.h>
static const char *DEFAULT_TABLE = "tcp.port"; // Arbitrary
diff --git a/ui/qt/models/packet_list_model.cpp b/ui/qt/models/packet_list_model.cpp
index 91c7e81..d2d5b2f 100644
--- a/ui/qt/models/packet_list_model.cpp
+++ b/ui/qt/models/packet_list_model.cpp
@@ -24,7 +24,6 @@
#include "packet_list_model.h"
#include "file.h"
-#include "cfile-int.h"
#include <wsutil/nstime.h>
#include <epan/column.h>
diff --git a/ui/qt/models/packet_list_record.cpp b/ui/qt/models/packet_list_record.cpp
index a5b6203..8e15510 100644
--- a/ui/qt/models/packet_list_record.cpp
+++ b/ui/qt/models/packet_list_record.cpp
@@ -22,7 +22,6 @@
#include "packet_list_record.h"
#include <file.h>
-#include <cfile-int.h>
#include <epan/epan_dissect.h>
#include <epan/column-info.h>
diff --git a/ui/qt/packet_dialog.cpp b/ui/qt/packet_dialog.cpp
index 9e3a1ff..ea17a20 100644
--- a/ui/qt/packet_dialog.cpp
+++ b/ui/qt/packet_dialog.cpp
@@ -35,8 +35,6 @@
#include "proto_tree.h"
#include "wireshark_application.h"
-#include "cfile-int.h"
-
#include <ui/qt/utils/field_information.h>
#include <QTreeWidgetItemIterator>
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index ffa4de7..556c37e 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -26,7 +26,6 @@
#include <glib.h>
#include "file.h"
-#include "cfile-int.h"
#include <epan/epan.h>
#include <epan/epan_dissect.h>
diff --git a/ui/qt/packet_range_group_box.cpp b/ui/qt/packet_range_group_box.cpp
index 673d196..de594ce 100644
--- a/ui/qt/packet_range_group_box.cpp
+++ b/ui/qt/packet_range_group_box.cpp
@@ -21,7 +21,6 @@
#include "packet_range_group_box.h"
#include <ui_packet_range_group_box.h>
-#include "cfile-int.h"
PacketRangeGroupBox::PacketRangeGroupBox(QWidget *parent) :
QGroupBox(parent),
diff --git a/ui/qt/print_dialog.cpp b/ui/qt/print_dialog.cpp
index 9b8ee8b..8c4feca 100644
--- a/ui/qt/print_dialog.cpp
+++ b/ui/qt/print_dialog.cpp
@@ -22,8 +22,6 @@
#include "print_dialog.h"
#include <ui_print_dialog.h>
-#include "cfile-int.h"
-
#include <wsutil/utf8_entities.h>
#include <QPrintDialog>
diff --git a/ui/qt/proto_tree.cpp b/ui/qt/proto_tree.cpp
index 9f505ce..401d948 100644
--- a/ui/qt/proto_tree.cpp
+++ b/ui/qt/proto_tree.cpp
@@ -26,8 +26,6 @@
#include <epan/ftypes/ftypes.h>
#include <epan/prefs.h>
-#include "cfile-int.h"
-
#include <ui/qt/utils/color_utils.h>
#include <ui/qt/utils/variant_pointer.h>
#include <ui/qt/utils/wireshark_mime_data.h>
diff --git a/ui/qt/protocol_hierarchy_dialog.cpp b/ui/qt/protocol_hierarchy_dialog.cpp
index 3edad82..0e235b1 100644
--- a/ui/qt/protocol_hierarchy_dialog.cpp
+++ b/ui/qt/protocol_hierarchy_dialog.cpp
@@ -23,7 +23,6 @@
#include <ui_protocol_hierarchy_dialog.h>
#include "cfile.h"
-#include "cfile-int.h"
#include "ui/proto_hier_stats.h"
diff --git a/ui/qt/resolved_addresses_dialog.cpp b/ui/qt/resolved_addresses_dialog.cpp
index 4f9c464..1c16003 100644
--- a/ui/qt/resolved_addresses_dialog.cpp
+++ b/ui/qt/resolved_addresses_dialog.cpp
@@ -27,7 +27,6 @@
#include <glib.h>
#include "file.h"
-#include "cfile-int.h"
#include "epan/addr_resolv.h"
#include <wiretap/wtap.h>
diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp
index fc89111..145fad1f 100644
--- a/ui/qt/rtp_analysis_dialog.cpp
+++ b/ui/qt/rtp_analysis_dialog.cpp
@@ -23,7 +23,6 @@
#include <ui_rtp_analysis_dialog.h>
#include "file.h"
-#include "cfile-int.h"
#include "frame_tvbuff.h"
#include "epan/epan_dissect.h"
diff --git a/ui/qt/rtp_analysis_dialog.h b/ui/qt/rtp_analysis_dialog.h
index 0bf00e3..0251281 100644
--- a/ui/qt/rtp_analysis_dialog.h
+++ b/ui/qt/rtp_analysis_dialog.h
@@ -27,7 +27,6 @@
#include <glib.h>
#include "epan/address.h"
-#include "epan/proto.h"
#include "ui/rtp_stream.h"
#include "ui/tap-rtp-analysis.h"
diff --git a/ui/qt/sctp_assoc_analyse_dialog.cpp b/ui/qt/sctp_assoc_analyse_dialog.cpp
index 8aed815..f1fe800 100644
--- a/ui/qt/sctp_assoc_analyse_dialog.cpp
+++ b/ui/qt/sctp_assoc_analyse_dialog.cpp
@@ -30,8 +30,6 @@
#include "sctp_graph_byte_dialog.h"
#include "sctp_chunk_statistics_dialog.h"
-#include "cfile-int.h"
-
SCTPAssocAnalyseDialog::SCTPAssocAnalyseDialog(QWidget *parent, sctp_assoc_info_t *assoc, capture_file *cf, SCTPAllAssocsDialog* caller) :
QDialog(parent),
ui(new Ui::SCTPAssocAnalyseDialog),
diff --git a/ui/qt/search_frame.cpp b/ui/qt/search_frame.cpp
index c380f16..f63f63f 100644
--- a/ui/qt/search_frame.cpp
+++ b/ui/qt/search_frame.cpp
@@ -23,7 +23,6 @@
#include <ui_search_frame.h>
#include "file.h"
-#include "cfile-int.h"
#include <epan/proto.h>
#include <epan/strutil.h>
diff --git a/ui/qt/sequence_dialog.cpp b/ui/qt/sequence_dialog.cpp
index 463ce3f..83e685b 100644
--- a/ui/qt/sequence_dialog.cpp
+++ b/ui/qt/sequence_dialog.cpp
@@ -25,7 +25,6 @@
#include "epan/addr_resolv.h"
#include "file.h"
-#include "cfile-int.h"
#include "wsutil/nstime.h"
#include "wsutil/utf8_entities.h"
diff --git a/ui/qt/show_packet_bytes_dialog.cpp b/ui/qt/show_packet_bytes_dialog.cpp
index e87e4d1..738f3ff 100644
--- a/ui/qt/show_packet_bytes_dialog.cpp
+++ b/ui/qt/show_packet_bytes_dialog.cpp
@@ -27,8 +27,6 @@
#include "epan/charsets.h"
-#include "cfile-int.h"
-
#include "wsutil/base64.h"
#include "wsutil/utf8_entities.h"
diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp
index 5d9eb6d..ccd664a 100644
--- a/ui/qt/time_shift_dialog.cpp
+++ b/ui/qt/time_shift_dialog.cpp
@@ -24,8 +24,6 @@
#include "wireshark_application.h"
-#include "cfile-int.h"
-
#include <ui/time_shift.h>
#include <ui/qt/utils/tango_colors.h>
diff --git a/ui/qt/traffic_table_dialog.cpp b/ui/qt/traffic_table_dialog.cpp
index e5d957c..3b83625 100644
--- a/ui/qt/traffic_table_dialog.cpp
+++ b/ui/qt/traffic_table_dialog.cpp
@@ -26,8 +26,6 @@
#include <epan/addr_resolv.h>
#include <epan/prefs.h>
-#include "cfile-int.h"
-
#include "ui/recent.h"
#include "progress_frame.h"
diff --git a/ui/qt/utils/frame_information.cpp b/ui/qt/utils/frame_information.cpp
index c52212d..c81b673 100644
--- a/ui/qt/utils/frame_information.cpp
+++ b/ui/qt/utils/frame_information.cpp
@@ -27,7 +27,6 @@
#include "wiretap/wtap.h"
#include "cfile.h"
-#include "cfile-int.h"
#include "file.h"
#include <ui/qt/capture_file.h>
diff --git a/ui/qt/voip_calls_dialog.cpp b/ui/qt/voip_calls_dialog.cpp
index d3c061c..9cf547f 100644
--- a/ui/qt/voip_calls_dialog.cpp
+++ b/ui/qt/voip_calls_dialog.cpp
@@ -23,7 +23,6 @@
#include <ui_voip_calls_dialog.h>
#include "file.h"
-#include "cfile-int.h"
#include "epan/addr_resolv.h"
#include "epan/dissectors/packet-h225.h"
diff --git a/ui/tap-rlc-graph.c b/ui/tap-rlc-graph.c
index 419a3d1..5ff9676 100644
--- a/ui/tap-rlc-graph.c
+++ b/ui/tap-rlc-graph.c
@@ -37,8 +37,6 @@
#include <epan/packet.h>
#include <epan/tap.h>
-#include "cfile-int.h"
-
/* Return TRUE if the 2 sets of parameters refer to the same channel. */
int compare_rlc_headers(guint16 ueid1, guint16 channelType1, guint16 channelId1, guint8 rlcMode1, guint8 direction1,
guint16 ueid2, guint16 channelType2, guint16 channelId2, guint8 rlcMode2, guint8 direction2,
diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c
index da58dc7..69b7a87 100644
--- a/ui/tap-tcp-stream.c
+++ b/ui/tap-tcp-stream.c
@@ -38,8 +38,6 @@
#include "ui/simple_dialog.h"
-#include "cfile-int.h"
-
#include "tap-tcp-stream.h"
typedef struct _tcp_scan_t {
diff --git a/ui/time_shift.c b/ui/time_shift.c
index 47e9cb0..1dae293 100644
--- a/ui/time_shift.c
+++ b/ui/time_shift.c
@@ -31,8 +31,6 @@
#include "ui/ws_ui_util.h"
-#include "cfile-int.h"
-
#ifndef HAVE_FLOORL
#define floorl(x) floor((double)x)
#endif
diff --git a/ui/voip_calls.c b/ui/voip_calls.c
index fba4cad..4ab23e1 100644
--- a/ui/voip_calls.c
+++ b/ui/voip_calls.c
@@ -37,7 +37,6 @@
#include <string.h>
#include "epan/epan_dissect.h"
-#include "epan/column-info.h"
#include "epan/packet.h"
#include "epan/proto_data.h"
#include "epan/to_str.h"
diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c
index 39b7bc6..5ac3afe 100644
--- a/ui/win32/file_dlg_win32.c
+++ b/ui/win32/file_dlg_win32.c
@@ -20,7 +20,6 @@
#include <strsafe.h>
#include "file.h"
-#include "cfile-int.h"
#include "wsutil/file_util.h"
#include "wsutil/str_util.h"
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index f1c0539..a4341e5 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -63,7 +63,6 @@
/* general (not Qt specific) */
#include "file.h"
-#include "cfile-int.h"
#include "epan/color_filters.h"
#include "log.h"