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/csids.c | |
| parent | 716fdc8e398ea7435b23192ab1f7d59e7b21e32b (diff) | |
| download | wireshark-a344c9736efe5519543da1290e1ad9065d0b0cff.tar.gz | |
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/csids.c')
| -rw-r--r-- | wiretap/csids.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/wiretap/csids.c b/wiretap/csids.c index 7145b62749..bc640f639d 100644 --- a/wiretap/csids.c +++ b/wiretap/csids.c @@ -44,9 +44,9 @@ typedef struct { gboolean byteswapped; } csids_t; -static int csids_read(wtap *wth, int *err, gchar **err_info, +static gboolean csids_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); -static int csids_seek_read(wtap *wth, gint64 seek_off, +static gboolean csids_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); static gboolean csids_read_packet(FILE_T fh, csids_t *csids, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); @@ -144,21 +144,19 @@ int csids_open(wtap *wth, int *err, gchar **err_info) } /* Find the next packet and parse it; called from wtap_read(). */ -static int csids_read(wtap *wth, int *err, gchar **err_info, +static gboolean csids_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { csids_t *csids = (csids_t *)wth->priv; *data_offset = file_tell(wth->fh); - if (!csids_read_packet( wth->fh, csids, &wth->phdr, wth->frame_buffer, - err, err_info )) - return -1; - return REC_TYPE_PACKET; + return csids_read_packet( wth->fh, csids, &wth->phdr, wth->frame_buffer, + err, err_info ); } /* Used to read packets in random-access fashion */ -static int +static gboolean csids_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr, @@ -169,14 +167,14 @@ csids_seek_read(wtap *wth, csids_t *csids = (csids_t *)wth->priv; if( file_seek( wth->random_fh, seek_off, SEEK_SET, err ) == -1 ) - return -1; + return FALSE; if( !csids_read_packet( wth->random_fh, csids, phdr, buf, err, err_info ) ) { if( *err == 0 ) *err = WTAP_ERR_SHORT_READ; - return -1; + return FALSE; } - return REC_TYPE_PACKET; + return TRUE; } static gboolean |