From a344c9736efe5519543da1290e1ad9065d0b0cff Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 23 May 2014 10:50:02 +0000 Subject: Revert "Allow wtap_read() and wtap_seek_read() to return non-packet records." This reverts commit c0c480d08c175eed4524ea9e73ec86298f468cf4. A better way to do this is to have the record type be part of struct wtap_pkthdr; that keeps the metadata for the record together and requires fewer API changes. That is in-progress. Change-Id: Ic558f163a48e2c6d0df7f55e81a35a5e24b53bc6 Reviewed-on: https://code.wireshark.org/review/1741 Reviewed-by: Guy Harris --- wiretap/radcom.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'wiretap/radcom.c') diff --git a/wiretap/radcom.c b/wiretap/radcom.c index 16df1397e7..e056cdd691 100644 --- a/wiretap/radcom.c +++ b/wiretap/radcom.c @@ -84,9 +84,9 @@ struct radcomrec_hdr { char xxw[9]; /* unknown */ }; -static int radcom_read(wtap *wth, int *err, gchar **err_info, +static gboolean radcom_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); -static int radcom_seek_read(wtap *wth, gint64 seek_off, +static gboolean radcom_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); static gboolean radcom_read_rec(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); @@ -252,8 +252,8 @@ read_error: } /* Read the next packet */ -static int radcom_read(wtap *wth, int *err, gchar **err_info, - gint64 *data_offset) +static gboolean radcom_read(wtap *wth, int *err, gchar **err_info, + gint64 *data_offset) { int bytes_read; char fcs[2]; @@ -264,7 +264,7 @@ static int radcom_read(wtap *wth, int *err, gchar **err_info, if (!radcom_read_rec(wth, wth->fh, &wth->phdr, wth->frame_buffer, err, err_info)) { /* Read error or EOF */ - return -1; + return FALSE; } if (wth->file_encap == WTAP_ENCAP_LAPB) { @@ -278,20 +278,20 @@ static int radcom_read(wtap *wth, int *err, gchar **err_info, *err = file_error(wth->fh, err_info); if (*err == 0) *err = WTAP_ERR_SHORT_READ; - return -1; + return FALSE; } } - return REC_TYPE_PACKET; + return TRUE; } -static int +static gboolean radcom_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info) { if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) - return -1; + return FALSE; /* Read record. */ if (!radcom_read_rec(wth, wth->random_fh, phdr, buf, err, @@ -301,9 +301,9 @@ radcom_seek_read(wtap *wth, gint64 seek_off, /* EOF means "short read" in random-access mode */ *err = WTAP_ERR_SHORT_READ; } - return -1; + return FALSE; } - return REC_TYPE_PACKET; + return TRUE; } static gboolean -- cgit v1.2.1