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/daintree-sna.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/daintree-sna.c')
| -rw-r--r-- | wiretap/daintree-sna.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/daintree-sna.c b/wiretap/daintree-sna.c index b4e32ae066..03a782bc30 100644 --- a/wiretap/daintree-sna.c +++ b/wiretap/daintree-sna.c @@ -58,8 +58,8 @@ static const char daintree_magic_text[] = "#Format="; #define COMMENT_LINE daintree_magic_text[0] -static gboolean daintree_sna_read(wtap *wth, int *err, gchar **err_info, - gint64 *data_offset); +static gboolean daintree_sna_read(wtap *wth, wtap_rec *rec, + Buffer *buf, int *err, gchar **err_info, gint64 *data_offset); static gboolean daintree_sna_seek_read(wtap *wth, gint64 seek_off, wtap_rec *rec, Buffer *buf, int *err, gchar **err_info); @@ -110,13 +110,13 @@ wtap_open_return_val daintree_sna_open(wtap *wth, int *err, gchar **err_info) /* Read the capture file sequentially * Wireshark scans the file with sequential reads during preview and initial display. */ static gboolean -daintree_sna_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) +daintree_sna_read(wtap *wth, wtap_rec *rec, Buffer *buf, + int *err, gchar **err_info, gint64 *data_offset) { *data_offset = file_tell(wth->fh); /* parse that line and the following packet data */ - return daintree_sna_read_packet(wth->fh, &wth->rec, - wth->rec_data, err, err_info); + return daintree_sna_read_packet(wth->fh, rec, buf, err, err_info); } /* Read the capture file randomly |