diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-12-03 21:33:59 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-12-04 05:35:36 +0000 |
| commit | ccc55bc80cb8965a73fae980d6e1babf6d8a8823 (patch) | |
| tree | a729cd74ca58f112e8a2afae7510cbe572615311 | |
| parent | 1834dca3654ccec238bae130715871be3d8fa344 (diff) | |
| download | wireshark-ccc55bc80cb8965a73fae980d6e1babf6d8a8823.tar.gz wireshark-ccc55bc80cb8965a73fae980d6e1babf6d8a8823.tar.bz2 wireshark-ccc55bc80cb8965a73fae980d6e1babf6d8a8823.zip | |
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>
59 files changed, 68 insertions, 152 deletions
diff --git a/Makefile.am b/Makefile.am index d1c1754fbd..63968c3e0e 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 c658b23702..ffad251e6e 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 */ @@ -17,7 +17,6 @@ #include <wiretap/pcapng.h> #include "cfile.h" -#include "cfile-int.h" void cap_file_init(capture_file *cf) @@ -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 395bf19ce8..edaaa31474 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 @@ -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" @@ -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> @@ -12,7 +12,6 @@ #define __GLOBALS_H__ #include "file.h" -#include "cfile-int.h" #include <epan/timestamp.h> #ifdef __cplusplus @@ -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 36e27811f9..1e1c8374fa 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 b43a88323f..8a56fee2e7 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 b04c9989fe..9b8ee56538 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 3fba27c0a9..3084e5b22c 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 a39af2ced1..90b89467fb 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 f4ee190a4d..66a8c5379d 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 c3a16fe6fe..a56464b76e 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 742cac1392..a038f637df 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 6935c2b552..22ff4eae73 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 21de728505..477ce66236 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 eddd172119..a66ceb5974 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 d01299db6b..001f3d67a2 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 83184c9819..b099e561de 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 f1a81e83d5..808163a1b0 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 51997cc2db..6e0bf460b4 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 f7e167600f..92707f8cd3 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 f666a99f3f..0a69f9c541 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 1562724bc5..bb0f75962e 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 ea823e9eea..25d3ac64b6 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 0cee88d6d9..8310b0a28d 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 091f509a3a..4ebd58efab 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 c75a388995..2dee41a3e5 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 851411d9c5..facf70eceb 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 1dc806f272..bc632f5449 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 653c513ed8..bc73784f04 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 91c7e81dca..d2d5b2f15a 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 a5b6203e31..8e1551071b 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 9e3a1ff347..ea17a20cd4 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 ffa4de730a..556c37e675 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 673d196dcd..de594ce975 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 9b8ee8b65b..8c4fecae31 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 9f505ce510..401d948cf8 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 3edad82758..0e235b1196 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 4f9c4642e5..1c16003345 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 fc89111f1c..145fad1f75 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 0bf00e3109..0251281294 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 8aed8155c2..f1fe800cb8 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 c380f16239..f63f63ff1a 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 463ce3f2f3..83e685bcb7 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 e87e4d17bf..738f3ffcf9 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 5d9eb6db92..ccd664a6f7 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 e5d957c499..3b836250b1 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 c52212dec9..c81b6736c2 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 d3c061c43c..9cf547f2cb 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 419a3d184d..5ff9676e9d 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 da58dc70b1..69b7a87ee7 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 47e9cb031b..1dae293259 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 fba4cad93b..4ab23e18ef 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 39b7bc6899..5ac3afecb9 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 f1c0539492..a4341e5835 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" |