diff options
author | Guy Harris <guy@alum.mit.edu> | 2012-05-04 16:56:18 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2012-05-04 16:56:18 +0000 |
commit | 33bb54a9452f4be53377a185195a63194016241a (patch) | |
tree | 9308829e2105b6e51e0dc5cc0af2295d8d97a0a3 /wiretap/erf.c | |
parent | f65cb5f27bab6310e847f88cd763eb08bff1c93b (diff) | |
download | wireshark-33bb54a9452f4be53377a185195a63194016241a.tar.gz |
file_seek() used to be a wrapper around fseek() or gzseek(), both of
which could use lseek() and were thus expensive due to system call
overhead. To avoid making a system call for every packet on a
sequential read, we maintained a data_offset field in the wtap structure
for sequential reads.
It's now a routine that just returns information from the FILE_T data
structure, so it's cheap. Use it, rather than maintaining the data_offset
field.
Readers for some file formats need to maintain file offset themselves;
have them do so in their private data structures.
svn path=/trunk/; revision=42423
Diffstat (limited to 'wiretap/erf.c')
-rw-r--r-- | wiretap/erf.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/wiretap/erf.c b/wiretap/erf.c index 213bd1af31..4f608c6988 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -262,8 +262,6 @@ extern int erf_open(wtap *wth, int *err, gchar **err_info) return -1; } - wth->data_offset = 0; - /* This is an ERF file */ wth->file_type = WTAP_FILE_ERF; wth->snapshot_length = 0; /* not available in header, only in frame */ @@ -287,7 +285,7 @@ static gboolean erf_read(wtap *wth, int *err, gchar **err_info, erf_header_t erf_header; guint32 packet_size, bytes_read; - *data_offset = wth->data_offset; + *data_offset = file_tell(wth->fh); do { if (!erf_read_header(wth->fh, @@ -295,13 +293,11 @@ static gboolean erf_read(wtap *wth, int *err, gchar **err_info, err, err_info, &bytes_read, &packet_size)) { return FALSE; } - wth->data_offset += bytes_read; buffer_assure_space(wth->frame_buffer, packet_size); wtap_file_read_expected_bytes(buffer_start_ptr(wth->frame_buffer), (gint32)(packet_size), wth->fh, err, err_info); - wth->data_offset += packet_size; } while ( erf_header.type == ERF_TYPE_PAD ); |