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/lanalyzer.c | |
| parent | b572b65e518937f43b630991c07369d8e0c79f53 (diff) | |
| download | wireshark-8a5b26efb14b7f8f5375383436f03108d52d9aed.tar.gz wireshark-8a5b26efb14b7f8f5375383436f03108d52d9aed.tar.bz2 wireshark-8a5b26efb14b7f8f5375383436f03108d52d9aed.zip | |
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/lanalyzer.c')
| -rw-r--r-- | wiretap/lanalyzer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c index 5f5f573386..dd2d31bc7a 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -258,8 +258,8 @@ typedef struct { time_t start; } lanalyzer_t; -static gboolean lanalyzer_read(wtap *wth, int *err, gchar **err_info, - gint64 *data_offset); +static gboolean lanalyzer_read(wtap *wth, wtap_rec *rec, + Buffer *buf, int *err, gchar **err_info, gint64 *data_offset); static gboolean lanalyzer_seek_read(wtap *wth, gint64 seek_off, wtap_rec *rec, Buffer *buf, int *err, gchar **err_info); static gboolean lanalyzer_dump_finish(wtap_dumper *wdh, int *err); @@ -531,14 +531,14 @@ static gboolean lanalyzer_read_trace_record(wtap *wth, FILE_T fh, } /* Read the next packet */ -static gboolean lanalyzer_read(wtap *wth, int *err, gchar **err_info, - gint64 *data_offset) +static gboolean lanalyzer_read(wtap *wth, wtap_rec *rec, Buffer *buf, + int *err, gchar **err_info, gint64 *data_offset) { *data_offset = file_tell(wth->fh); /* Read the record */ - return lanalyzer_read_trace_record(wth, wth->fh, &wth->rec, - wth->rec_data, err, err_info); + return lanalyzer_read_trace_record(wth, wth->fh, rec, buf, err, + err_info); } static gboolean lanalyzer_seek_read(wtap *wth, gint64 seek_off, |