diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-04-04 18:56:27 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-04-05 02:49:43 +0000 |
| commit | 8a5b26efb14b7f8f5375383436f03108d52d9aed (patch) | |
| tree | eb57791fc53deab1c618b259e11092f122a8ee97 /wiretap/peektagged.c | |
| parent | b572b65e518937f43b630991c07369d8e0c79f53 (diff) | |
Have wtap_read() fill in a wtap_rec and Buffer.
That makes it - and the routines that implement it - work more like the
seek-read routine.
Change-Id: I0cace2d0e4c9ebfc21ac98fd1af1ec70f60a240d
Reviewed-on: https://code.wireshark.org/review/32727
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/peektagged.c')
| -rw-r--r-- | wiretap/peektagged.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c index 0187d10e41..c45580ccd8 100644 --- a/wiretap/peektagged.c +++ b/wiretap/peektagged.c @@ -153,8 +153,8 @@ typedef struct { gboolean has_fcs; } peektagged_t; -static gboolean peektagged_read(wtap *wth, int *err, gchar **err_info, - gint64 *data_offset); +static gboolean peektagged_read(wtap *wth, wtap_rec *rec, Buffer *buf, + int *err, gchar **err_info, gint64 *data_offset); static gboolean peektagged_seek_read(wtap *wth, gint64 seek_off, wtap_rec *rec, Buffer *buf, int *err, gchar **err_info); @@ -828,16 +828,15 @@ peektagged_read_packet(wtap *wth, FILE_T fh, wtap_rec *rec, return skip_len; } -static gboolean peektagged_read(wtap *wth, int *err, gchar **err_info, - gint64 *data_offset) +static gboolean peektagged_read(wtap *wth, wtap_rec *rec, Buffer *buf, + int *err, gchar **err_info, gint64 *data_offset) { int skip_len; *data_offset = file_tell(wth->fh); /* Read the packet. */ - skip_len = peektagged_read_packet(wth, wth->fh, &wth->rec, - wth->rec_data, err, err_info); + skip_len = peektagged_read_packet(wth, wth->fh, rec, buf, err, err_info); if (skip_len == -1) return FALSE; |