From Vassilii Khachaturov, cleanup of redundant code.

svn path=/trunk/; revision=6202

1 files changed, 2 insertions, 53 deletions

diff --git a/file.h b/file.h
index 647c76b7f4..c90b36bbaa 100644
--- a/file.h
+++ b/file.h
@@ -1,7 +1,7 @@
 /* file.h
  * Definitions for file structures and routines
  *
- * $Id: file.h,v 1.97 2002/08/28 21:00:06 jmayer Exp $
+ * $Id: file.h,v 1.98 2002/09/06 22:45:40 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -31,58 +31,7 @@
 #include <errno.h>
 #include <epan/epan.h>
 
-/* Current state of file. */
-typedef enum {
-	FILE_CLOSED,		/* No file open */
-	FILE_READ_IN_PROGRESS,	/* Reading a file we've opened */
-	FILE_READ_ABORTED,	/* Read aborted by user */
-	FILE_READ_DONE		/* Read completed */
-} file_state;
-
-typedef struct _capture_file {
-  file_state   state;     /* Current state of capture file */
-  int          filed;     /* File descriptor of capture file */
-  gchar       *filename;  /* Name of capture file */
-  gboolean     is_tempfile; /* Is capture file a temporary file? */
-  gboolean     user_saved;/* If capture file is temporary, has it been saved by user yet? */
-  long         f_len;     /* Length of capture file */
-  guint16      cd_t;      /* File type of capture file */
-  int          lnk_t;     /* Link-layer type with which to save capture */
-  guint32      vers;      /* Version.  For tcpdump minor is appended to major */
-  int          count;     /* Total number of frames */
-  int          marked_count; /* Number of marked frames */
-  gboolean     drops_known; /* TRUE if we know how many packets were dropped */
-  guint32      drops;     /* Dropped packets */
-  guint32      esec;      /* Elapsed seconds */
-  guint32      eusec;     /* Elapsed microseconds */
-  gboolean     has_snap;  /* TRUE if maximum capture packet length is known */
-  int          snap;      /* Maximum captured packet length */
-  long         progbar_quantum; /* Number of bytes read per progress bar update */
-  long         progbar_nextstep; /* Next point at which to update progress bar */
-  gchar       *iface;     /* Interface */
-  gchar       *save_file; /* File that user saved capture to */
-  int          save_file_fd; /* File descriptor for saved file */
-  wtap        *wth;       /* Wiretap session */
-  dfilter_t   *rfcode;    /* Compiled read filter program */
-  gchar       *dfilter;   /* Display filter string */
-  dfilter_t   *dfcode;    /* Compiled display filter program */
-#ifdef HAVE_LIBPCAP
-  gchar       *cfilter;   /* Capture filter string */
-#endif
-  gchar       *sfilter;   /* Search filter string */
-  gboolean     sbackward;  /* TRUE if search is backward, FALSE if forward */
-  union wtap_pseudo_header pseudo_header;      /* Packet pseudo_header */
-  guint8       pd[WTAP_MAX_PACKET_SIZE];  /* Packet data */
-  GMemChunk   *plist_chunk; /* Memory chunk for frame_data structures */
-  frame_data  *plist;     /* Packet list */
-  frame_data  *plist_end; /* Last packet in list */
-  frame_data  *first_displayed; /* First frame displayed */
-  frame_data  *last_displayed;  /* Last frame displayed */
-  column_info  cinfo;    /* Column formatting information */
-  frame_data  *current_frame;  /* Frame data for current frame */
-  epan_dissect_t *edt; /* Protocol dissection fo rcurrently selected packet */
-  FILE        *print_fh;  /* File we're printing to */
-} capture_file;
+#include "cfile.h"
 
 /* Return values from "read_cap_file()", "continue_tail_cap_file()",
    and "finish_tail_cap_file()". */