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/radcom.c | |
| parent | 3846abe34d6861c6ee0bba61fcd5baa4d213885c (diff) | |
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/radcom.c')
| -rw-r--r-- | wiretap/radcom.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/wiretap/radcom.c b/wiretap/radcom.c index c76a1dd8d2..ab9b80e14f 100644 --- a/wiretap/radcom.c +++ b/wiretap/radcom.c @@ -89,7 +89,7 @@ struct radcomrec_hdr { static gboolean radcom_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); static gboolean radcom_seek_read(wtap *wth, gint64 seek_off, - struct wtap_pkthdr *phdr, guint8 *pd, int length, + struct wtap_pkthdr *phdr, Buffer *buf, int length, int *err, gchar **err_info); static int radcom_process_rec_header(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, int *err, gchar **err_info); @@ -274,8 +274,7 @@ static gboolean radcom_read(wtap *wth, int *err, gchar **err_info, /* * Read the packet data. */ - buffer_assure_space(wth->frame_buffer, wth->phdr.caplen); - if (!radcom_read_rec_data(wth->fh, buffer_start_ptr(wth->frame_buffer), + if (!wtap_read_packet_bytes(wth->fh, wth->frame_buffer, wth->phdr.caplen, err, err_info)) return FALSE; /* Read error */ @@ -299,7 +298,7 @@ static gboolean radcom_read(wtap *wth, int *err, gchar **err_info, static gboolean radcom_seek_read(wtap *wth, gint64 seek_off, - struct wtap_pkthdr *phdr, guint8 *pd, int length, + struct wtap_pkthdr *phdr, Buffer *buf, int length, int *err, gchar **err_info) { int ret; @@ -322,7 +321,7 @@ radcom_seek_read(wtap *wth, gint64 seek_off, /* * Read the packet data. */ - return radcom_read_rec_data(wth->random_fh, pd, length, err, err_info); + return wtap_read_packet_bytes(wth->random_fh, buf, length, err, err_info); } static int |