Add APIs to Wiretap to return the file of the size as supplied by the OS

(so if the file's gzipped, it's *NOT* the size of the file after
uncompressing), and an approximation of the amount of that data read
sequentially so far.

Use those for various progress bars and the like.

Make the fstat() in the Ascend trace reader directly use wth->fd, as
it's inside Wiretap; that gets rid of the last caller of wtap_fd() (as
we're no longer directly using fstat() or lseek() in Ethereal), so get
rid of wtap_fd().

svn path=/trunk/; revision=15437

1 files changed, 1 insertions, 2 deletions

diff --git a/cfile.h b/cfile.h
index d78461c72d..59f60bb51f 100644
--- a/cfile.h
+++ b/cfile.h
@@ -43,12 +43,11 @@ typedef enum {
 
 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_datalen; /* Size of capture file data (uncompressed) */
-  long         f_len;     /* Length of capture file (compressed if file is) */
+  gint64       f_len;     /* Length of capture file (compressed if file is) */
   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 */