diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-05-23 10:50:02 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-05-23 10:50:10 +0000 |
| commit | a344c9736efe5519543da1290e1ad9065d0b0cff (patch) | |
| tree | 7757d80d74ae710e5d4e4a1b0cb638d0ec644fc4 /wiretap/erf.c | |
| parent | 716fdc8e398ea7435b23192ab1f7d59e7b21e32b (diff) | |
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 <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/erf.c')
| -rw-r--r-- | wiretap/erf.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/wiretap/erf.c b/wiretap/erf.c index 3513642121..67b7ccab1d 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -64,11 +64,11 @@ static int erf_read_header(FILE_T fh, gchar **err_info, guint32 *bytes_read, guint32 *packet_size); -static int erf_read(wtap *wth, int *err, gchar **err_info, - gint64 *data_offset); -static int erf_seek_read(wtap *wth, gint64 seek_off, - struct wtap_pkthdr *phdr, Buffer *buf, - int *err, gchar **err_info); +static gboolean erf_read(wtap *wth, int *err, gchar **err_info, + gint64 *data_offset); +static gboolean erf_seek_read(wtap *wth, gint64 seek_off, + struct wtap_pkthdr *phdr, Buffer *buf, + int *err, gchar **err_info); static const struct { int erf_encap_value; @@ -280,7 +280,7 @@ extern int erf_open(wtap *wth, int *err, gchar **err_info) } /* Read the next packet */ -static int erf_read(wtap *wth, int *err, gchar **err_info, +static gboolean erf_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { erf_header_t erf_header; @@ -292,38 +292,36 @@ static int erf_read(wtap *wth, int *err, gchar **err_info, if (!erf_read_header(wth->fh, &wth->phdr, &erf_header, err, err_info, &bytes_read, &packet_size)) { - return -1; + return FALSE; } if (!wtap_read_packet_bytes(wth->fh, wth->frame_buffer, packet_size, err, err_info)) - return -1; + return FALSE; } while ( erf_header.type == ERF_TYPE_PAD ); - return REC_TYPE_PACKET; + return TRUE; } -static int erf_seek_read(wtap *wth, gint64 seek_off, - struct wtap_pkthdr *phdr, Buffer *buf, - int *err, gchar **err_info) +static gboolean erf_seek_read(wtap *wth, gint64 seek_off, + struct wtap_pkthdr *phdr, Buffer *buf, + int *err, gchar **err_info) { erf_header_t erf_header; guint32 packet_size; if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) - return -1; + return FALSE; do { if (!erf_read_header(wth->random_fh, phdr, &erf_header, err, err_info, NULL, &packet_size)) - return -1; + return FALSE; } while ( erf_header.type == ERF_TYPE_PAD ); - if (!wtap_read_packet_bytes(wth->random_fh, buf, packet_size, - err, err_info)) - return -1; - return REC_TYPE_PACKET; + return wtap_read_packet_bytes(wth->random_fh, buf, packet_size, + err, err_info); } static int erf_read_header(FILE_T fh, |