diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-06-16 00:20:00 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-06-16 00:20:00 +0000 |
| commit | 8c9edf12800bc6d68894dc457e7ebaf994429da8 (patch) | |
| tree | ec6efefbd4e7f8227a7b96661f721ff4ba2986c3 /wiretap/mime_file.c | |
| parent | 3846abe34d6861c6ee0bba61fcd5baa4d213885c (diff) | |
| download | wireshark-8c9edf12800bc6d68894dc457e7ebaf994429da8.tar.gz | |
Have the seek-read routines take a Buffer rather than a guint8 pointer
as the "where to put the packet data" argument.
This lets more of the libwiretap code be common between the read and
seek-read code paths, and also allows for more flexibility in the "fill
in the data" path - we can expand the buffer as needed in both cases.
svn path=/trunk/; revision=49949
Diffstat (limited to 'wiretap/mime_file.c')
| -rw-r--r-- | wiretap/mime_file.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/wiretap/mime_file.c b/wiretap/mime_file.c index 315b0240a6..015a6aa7d6 100644 --- a/wiretap/mime_file.c +++ b/wiretap/mime_file.c @@ -137,20 +137,17 @@ mime_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) } static gboolean -mime_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr, guint8 *pd, int length, int *err, gchar **err_info) +mime_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr, Buffer *buf, int length, int *err, gchar **err_info) { if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) { *err_info = NULL; return FALSE; } - wtap_file_read_expected_bytes(pd, length, wth->random_fh, err, err_info); - mime_set_pkthdr(phdr, length); - *err = 0; - *err_info = NULL; - return TRUE; + return wtap_read_packet_bytes(wth->random_fh, buf, length, err, + err_info); } int |