summaryrefslogtreecommitdiff
path: root/ringbuffer.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2005-08-19 19:40:00 +0000
committerGuy Harris <guy@alum.mit.edu>2005-08-19 19:40:00 +0000
commit38ec1644e68721d6b5afb84dce1684b943b1aee0 (patch)
tree8ffe4f642463b43885354f4dd755e59b4daf3823 /ringbuffer.c
parent06823cdce8a0e63cf888c449a1b37071d622f1c3 (diff)
downloadwireshark-38ec1644e68721d6b5afb84dce1684b943b1aee0.tar.gz
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
Diffstat (limited to 'ringbuffer.c')
-rw-r--r--ringbuffer.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/ringbuffer.c b/ringbuffer.c
index 02c66138a2..1400420a68 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -56,10 +56,6 @@
#include <fcntl.h>
#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -69,7 +65,7 @@
#include <time.h>
#include <errno.h>
-#include "wiretap/wtap.h"
+#include <wiretap/wtap.h>
#include "ringbuffer.h"
/* Win32 needs the O_BINARY flag for open() */