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/k12.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/k12.c')
| -rw-r--r-- | wiretap/k12.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/k12.c b/wiretap/k12.c index 9e7c42bc8e..7bc0bc93aa 100644 --- a/wiretap/k12.c +++ b/wiretap/k12.c @@ -658,7 +658,7 @@ process_packet_data(wtap_rec *rec, Buffer *target, guint8 *buffer, return TRUE; } -static gboolean k12_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { +static gboolean k12_read(wtap *wth, wtap_rec *rec, Buffer *buf, int *err, gchar **err_info, gint64 *data_offset) { k12_t *k12 = (k12_t *)wth->priv; k12_src_desc_t* src_desc; guint8* buffer; @@ -721,7 +721,7 @@ static gboolean k12_read(wtap *wth, int *err, gchar **err_info, gint64 *data_off } while ( ((type & K12_MASK_PACKET) != K12_REC_PACKET && (type & K12_MASK_PACKET) != K12_REC_D0020) || !src_id || !src_desc ); - return process_packet_data(&wth->rec, wth->rec_data, buffer, (guint)len, k12, err, err_info); + return process_packet_data(rec, buf, buffer, (guint)len, k12, err, err_info); } |