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, 1 deletions

diff --git a/merge.h b/merge.h
index 887e1b866c..209f78bc05 100644
--- a/merge.h
+++ b/merge.h
@@ -44,7 +44,7 @@ typedef struct merge_in_file_s {
   wtap           *wth;
   long            data_offset;
   in_file_state_e state;
-  long            size;		/* file size */
+  gint64          size;		/* file size */
 } merge_in_file_t;
 
 /** Open a number of input files to merge.