Put the structure of a capture_file back in cfile.h.
authorGuy Harris <guy@alum.mit.edu>
Mon, 4 Dec 2017 05:33:59 +0000 (21:33 -0800)
committerGuy Harris <guy@alum.mit.edu>
Mon, 4 Dec 2017 05:35:36 +0000 (05:35 +0000)
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:
Makefile.am
cfile-int.h
cfile.c
cfile.h
epan/tap.h
file.c
file.h
globals.h
summary.c
ui/capture.c
ui/export_pdu_ui_utils.c
ui/gtk/main_titlebar.c
ui/packet_list_utils.c
ui/packet_range.c
ui/proto_hier_stats.c
ui/qt/address_editor_frame.cpp
ui/qt/byte_view_tab.cpp
ui/qt/capture_file_dialog.cpp
ui/qt/capture_file_properties_dialog.cpp
ui/qt/conversation_dialog.cpp
ui/qt/endpoint_dialog.cpp
ui/qt/expert_info_dialog.cpp
ui/qt/file_set_dialog.cpp
ui/qt/follow_stream_dialog.cpp
ui/qt/iax2_analysis_dialog.cpp
ui/qt/io_graph_dialog.cpp
ui/qt/lbm_lbtrm_transport_dialog.h
ui/qt/lbm_lbtru_transport_dialog.h
ui/qt/lbm_stream_dialog.h
ui/qt/main_status_bar.cpp
ui/qt/main_window.cpp
ui/qt/main_window_slots.cpp
ui/qt/models/decode_as_delegate.cpp
ui/qt/models/decode_as_model.cpp
ui/qt/models/packet_list_model.cpp
ui/qt/models/packet_list_record.cpp
ui/qt/packet_dialog.cpp
ui/qt/packet_list.cpp
ui/qt/packet_range_group_box.cpp
ui/qt/print_dialog.cpp
ui/qt/proto_tree.cpp
ui/qt/protocol_hierarchy_dialog.cpp
ui/qt/resolved_addresses_dialog.cpp
ui/qt/rtp_analysis_dialog.cpp
ui/qt/rtp_analysis_dialog.h
ui/qt/sctp_assoc_analyse_dialog.cpp
ui/qt/search_frame.cpp
ui/qt/sequence_dialog.cpp
ui/qt/show_packet_bytes_dialog.cpp
ui/qt/time_shift_dialog.cpp
ui/qt/traffic_table_dialog.cpp
ui/qt/utils/frame_information.cpp
ui/qt/voip_calls_dialog.cpp
ui/tap-rlc-graph.c
ui/tap-tcp-stream.c
ui/time_shift.c
ui/voip_calls.c
ui/win32/file_dlg_win32.c
wireshark-qt.cpp

index d1c1754fbde3a5590e451b4bf85e3bb91e781223..63968c3e0edf263d911797e8406041a49498f9e6 100644 (file)
@@ -698,7 +698,6 @@ dumpcap_LDADD = \
 
 pkginclude_HEADERS = \
        cfile.h                 \
-       cfile-int.h             \
        file.h                  \
        globals.h               \
        log.h                   \
index c658b23702d312b920ac839b26fd29121d4688fb..ffad251e6edb1692aaa307261996a2d9f784bf30 100644 (file)
 #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 73cc47e8b851aa9eeb9abcae5bdd4c6e5f480ed3..3e257c933fe33f89484b0a0207f4395bc21b7cc8 100644 (file)
--- 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 51602944e3abf0874820bbdde7352eeb124dd745..809e9c80816a126336dc0850fa4b34a8cc4b38fd 100644 (file)
--- a/cfile.h
+++ b/cfile.h
 #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);
 
index 395bf19ce8d16ca74c0e1b084b0f6b034d5636d3..edaaa314741547226648e40c678b10f6d42c9f1b 100644 (file)
@@ -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 05cbdbd8b5c6c987a3e51f3c070a5c07d47adfcc..0bc3023527d85a49ff8ddf2d0592253b5598ac36 100644 (file)
--- 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 a29c9953c1f6c7ec26df678e02bb6b026f5abf8c..198e20a23011578452077df81349bb9943a1ba97 100644 (file)
--- 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>
 
index 4d32614538616dc5cafdcbdea6e1f61d6e111004..246c829c1ae2c7c002197430c8c6b6fad66209af 100644 (file)
--- 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
index d3e2212b5b8d27f734429b31ac055e556b45e5aa..4e0bd7bcef9a179e9118efb1a8df5e6ae20122e8 100644 (file)
--- 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
index 36e27811f92ec9f12f37f151f181d5ffcd6917b6..1e1c8374facaf6be0b19b63ab390b7c443f0905e 100644 (file)
@@ -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>
index b43a88323fc49ec2abf4bcbe2fd2f566a375f726..8a56fee2e7d3848ff41ccfd09a253c76f9062de8 100644 (file)
@@ -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
index b04c9989fe2352f47d61d1fdc7f80e868ad17ecc..9b8ee56538ade9ec68517e8e67a3252620a8a5c5 100644 (file)
@@ -27,7 +27,6 @@
 #include <gtk/gtk.h>
 
 #include "file.h"
-#include "cfile-int.h"
 
 #include "gtkglobals.h"
 #include "gui_utils.h"
index 3fba27c0a97646a0c4c3781b69834dc7bcbde3ba..3084e5b22c6acd7926b57f52bb91d50434a47d83 100644 (file)
@@ -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)
index a39af2ced162407e7bdf5beffad5804249ec6efa..90b89467fb6651fb77326cffadc5530420946c85 100644 (file)
@@ -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;
index f4ee190a4d9a02e39062c0c676f86554577f670b..66a8c5379d2a346c6e53ffbf85c1719098b06059 100644 (file)
@@ -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
index c3a16fe6feea0e710315edf1aebe21b9a62dfa29..a56464b76eebb35dda2489833d90e9b477bd87a2 100644 (file)
@@ -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>
 
index 742cac1392b822f484f4d8cbe29b2ee64b330ce4..a038f637df7a8ef933a0fbab81d95a2009eb7c61 100644 (file)
@@ -28,7 +28,6 @@
 #include <QTreeWidgetItem>
 
 #include "cfile.h"
-#include "cfile-int.h"
 #include "epan/epan_dissect.h"
 #include "epan/tvbuff-int.h"
 
index 6935c2b5520f07ca35fa79090b517a0946cf9ec5..22ff4eae73c7f34b4989cff97ad5e2dd41965c06 100644 (file)
@@ -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"
index 21de7285058874cb2d8fd1782dc8e485549e9fee..477ce66236da15a07458c2b4bf17ffb9a1f783ec 100644 (file)
@@ -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>
index eddd1721196a54ec921c7d84c615068273912e0b..a66ceb5974f18cfda83feff5ca41a3b29e6ffb87 100644 (file)
@@ -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"
index d01299db6b73a8498a8957615e566a041325c73d..001f3d67a203c0bb8b10f96c270c446226291927 100644 (file)
@@ -29,8 +29,6 @@
 
 #include <epan/prefs.h>
 
-#include "cfile-int.h"
-
 #include "ui/recent.h"
 #include "ui/traffic_table_ui.h"
 
index 83184c9819f20aac9a9f48c30069bbf8f85e87ef..b099e561deb5f074a6fa884e98a23434f7d93f67 100644 (file)
@@ -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>
index f1a81e83d5076bcc51ae81ad0f50d1ca630dc240..808163a1b0bd68f0e335122b8f89b2f6fa6cc57a 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "file.h"
 #include "fileset.h"
-#include "cfile-int.h"
 
 #include "ui/help_url.h"
 
index 51997cc2db3631bd8caecb9115a03a0cfb8e6a8d..6e0bf460b48feda583da041f62013ba0d0c9dd95 100644 (file)
@@ -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>
index f7e167600f56f547133e70ca592ab92a206339af..92707f8cd3d9b89b11d226e86cf11af3e4151e70 100644 (file)
@@ -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>
index f666a99f3f45e734578c4b3cd50f80891747c078..0a69f9c54127f8d83442f36e4ff01a0ee252ac5a 100644 (file)
@@ -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"
index 1562724bc52ccea01438642b9e4a438628d728b0..bb0f75962e02317299aa441581928e9a471f7ef5 100644 (file)
@@ -29,7 +29,6 @@
 #include <glib.h>
 
 #include "cfile.h"
-#include <epan/epan.h>
 #include <epan/packet_info.h>
 #include <QDialog>
 
index ea823e9eeaa3c809e82b4d0bfefacf853e71f4cd..25d3ac64b6a02b0f71551dc4d3c0992d67300ff9 100644 (file)
@@ -29,7 +29,6 @@
 #include <glib.h>
 
 #include "cfile.h"
-#include <epan/epan.h>
 #include <epan/packet_info.h>
 #include <QDialog>
 
index 0cee88d6d97cb7a9d73707e006a0e96ab1d5012b..8310b0a28d121edb3fa53f8902f41781c768e415 100644 (file)
@@ -29,7 +29,6 @@
 #include <glib.h>
 
 #include "cfile.h"
-#include <epan/epan.h>
 #include <epan/packet_info.h>
 #include <QDialog>
 
index 091f509a3a42c4615e4fece47b1b3b045a90213f..4ebd58efab8d7c684f88bfbfd8e8eca4f7388fea 100644 (file)
@@ -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>
index c75a388995bf2d34a7c72fb1d0cdfcd640e90bdb..2dee41a3e5569cd2d83eefc36c425c52ca2c18fe 100644 (file)
@@ -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
index 851411d9c5951768310627e47fbd95b0a93e5f2b..facf70eceb7364a8a6a445842a1868b0424a925f 100644 (file)
@@ -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"
index 1dc806f27260419128a9d1d04568346be96ca01c..bc632f54491f5e14abb99ca43cd377bd2deb61cc 100644 (file)
@@ -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>
index 653c513ed8803132e6bb12a12546b12e26e02805..bc73784f040a491dbf2a37fcdfe7d863b0469b03 100644 (file)
@@ -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
index 91c7e81dca127d832f51e4460a1fa8f7e46f80c7..d2d5b2f15ad9225c8d2cdc452ddb636708703416 100644 (file)
@@ -24,7 +24,6 @@
 #include "packet_list_model.h"
 
 #include "file.h"
-#include "cfile-int.h"
 
 #include <wsutil/nstime.h>
 #include <epan/column.h>
index a5b6203e31593e4cc50646def456459ecc4f5e70..8e1551071bc696074bc77a0fe8b7a7c346f0d630 100644 (file)
@@ -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>
index 9e3a1ff3479a0bc52219254cb87f9175102f289a..ea17a20cd41c80787c205708b93f3f8db0c88979 100644 (file)
@@ -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>
 
index ffa4de730acdcfa1a5976441664e2bd528efcf88..556c37e67550ba91e298eb64a74413d49bc36ca5 100644 (file)
@@ -26,7 +26,6 @@
 #include <glib.h>
 
 #include "file.h"
-#include "cfile-int.h"
 
 #include <epan/epan.h>
 #include <epan/epan_dissect.h>
index 673d196dcda585f03a8b57a079660cc3da4f9d84..de594ce975ec243020533ccc2a7e0b8728cafcc7 100644 (file)
@@ -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),
index 9b8ee8b65b5a9bfdc78e99dcaf537076c69859ce..8c4fecae31e2df46dcf492833d4f2e33439092df 100644 (file)
@@ -22,8 +22,6 @@
 #include "print_dialog.h"
 #include <ui_print_dialog.h>
 
-#include "cfile-int.h"
-
 #include <wsutil/utf8_entities.h>
 
 #include <QPrintDialog>
index 9f505ce510bc849ba92b855f32c8d50d3be5a210..401d948cf80736182563c4c3dbe047f1ac44b4ab 100644 (file)
@@ -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>
index 3edad82758d6d729237f8890acdbf4ca33713023..0e235b11961f1e5c18b136fad20b64fce18b91f2 100644 (file)
@@ -23,7 +23,6 @@
 #include <ui_protocol_hierarchy_dialog.h>
 
 #include "cfile.h"
-#include "cfile-int.h"
 
 #include "ui/proto_hier_stats.h"
 
index 4f9c4642e51b99afa8284e9c951b3d5dc2dee98e..1c16003345f82586688b60a86cc01a034499a448 100644 (file)
@@ -27,7 +27,6 @@
 #include <glib.h>
 
 #include "file.h"
-#include "cfile-int.h"
 
 #include "epan/addr_resolv.h"
 #include <wiretap/wtap.h>
index fc89111f1c51dc4f7d003ae251e27b01b7f492e1..145fad1f7577a0ce7233f931738d8fe64a2b1ca9 100644 (file)
@@ -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"
index 0bf00e3109a9bc3d23554e48b407dcc9e5306823..0251281294e780842893a1205b0a9ac92c38ad92 100644 (file)
@@ -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"
index 8aed8155c2f97f87011de64cd997f22dcb5270f5..f1fe800cb81bb758d78b2ebd03ce9f6ca4366a85 100644 (file)
@@ -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),
index c380f162395c3ffa1d565fcd761ee09bf873f717..f63f63ff1a536a859e3faed5a042f2d997ee65b5 100644 (file)
@@ -23,7 +23,6 @@
 #include <ui_search_frame.h>
 
 #include "file.h"
-#include "cfile-int.h"
 
 #include <epan/proto.h>
 #include <epan/strutil.h>
index 463ce3f2f37242994c7f388e1fe1589a688e1b87..83e685bcb791ed3009ddf4c0156cdfbbc2d9cdde 100644 (file)
@@ -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"
index e87e4d17bf951370fdd174d43554b7e315283460..738f3ffcf9d1610fadb7ac6920e2222782083cc2 100644 (file)
@@ -27,8 +27,6 @@
 
 #include "epan/charsets.h"
 
-#include "cfile-int.h"
-
 #include "wsutil/base64.h"
 #include "wsutil/utf8_entities.h"
 
index 5d9eb6db9296dbdf5e3c068f8e8516df090fabd9..ccd664a6f72303369038abca5c3e130a1daf66ee 100644 (file)
@@ -24,8 +24,6 @@
 
 #include "wireshark_application.h"
 
-#include "cfile-int.h"
-
 #include <ui/time_shift.h>
 #include <ui/qt/utils/tango_colors.h>
 
index e5d957c4995a36e6e053755c516c63c76dfff762..3b836250b10b86b20834ca99a45ee68b11972689 100644 (file)
@@ -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"
index c52212dec9df72ca40e439ce74f817d8c817aca3..c81b6736c2f3717e5cf1747212d80e0179565c5a 100644 (file)
@@ -27,7 +27,6 @@
 #include "wiretap/wtap.h"
 
 #include "cfile.h"
-#include "cfile-int.h"
 #include "file.h"
 #include <ui/qt/capture_file.h>
 
index d3c061c43cdb80a160a4fbc0d5c3b1a0920e75bf..9cf547f2cb7ebe498de0668b90fcdf89840de5d9 100644 (file)
@@ -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"
index 419a3d184dc5803cfac5a087fd62a8070d1f70a0..5ff9676e9dd7546ecfbe1c73fa7c3697c5ba1c81 100644 (file)
@@ -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,
index da58dc70b1a2a798f75215fad892c0a6819fa6ce..69b7a87ee7f5da608a3e2b5a26d32c53580b6523 100644 (file)
@@ -38,8 +38,6 @@
 
 #include "ui/simple_dialog.h"
 
-#include "cfile-int.h"
-
 #include "tap-tcp-stream.h"
 
 typedef struct _tcp_scan_t {
index 47e9cb031b7bad26f72cf771a541d9f08e3f48ef..1dae2932593ebab93294849a70fc3f8bf78cce9c 100644 (file)
@@ -31,8 +31,6 @@
 
 #include "ui/ws_ui_util.h"
 
-#include "cfile-int.h"
-
 #ifndef HAVE_FLOORL
 #define floorl(x) floor((double)x)
 #endif
index fba4cad93b6ce9db136ae4b4da8b485359632971..4ab23e18ef4ccc49553cfddfb4f4ff74157bd284 100644 (file)
@@ -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"
index 39b7bc68999860daf1eac234e0d429378844f388..5ac3afecb9764ce2435b4b977ac1acef779d0c2a 100644 (file)
@@ -20,7 +20,6 @@
 #include <strsafe.h>
 
 #include "file.h"
-#include "cfile-int.h"
 
 #include "wsutil/file_util.h"
 #include "wsutil/str_util.h"
index f1c0539492e9acf8329a4dcdd8bfac24f5eb0cbd..a4341e5835ae4a006086d2183a019d80fcd1b31b 100644 (file)
@@ -63,7 +63,6 @@
 
 /* general (not Qt specific) */
 #include "file.h"
-#include "cfile-int.h"
 #include "epan/color_filters.h"
 #include "log.h"