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/nettl.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/nettl.c')
-rw-r--r-- | wiretap/nettl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/wiretap/nettl.c b/wiretap/nettl.c index 0e3c9a9f97..0c6898bbdb 100644 --- a/wiretap/nettl.c +++ b/wiretap/nettl.c @@ -175,9 +175,9 @@ typedef struct { gboolean is_hpux_11; } nettl_t; -static int nettl_read(wtap *wth, int *err, gchar **err_info, +static gboolean nettl_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); -static int nettl_seek_read(wtap *wth, gint64 seek_off, +static gboolean nettl_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); static gboolean nettl_read_rec(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, @@ -287,7 +287,7 @@ int nettl_open(wtap *wth, int *err, gchar **err_info) } /* Read the next packet */ -static int nettl_read(wtap *wth, int *err, gchar **err_info, +static gboolean nettl_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { /* Read record header. */ @@ -295,7 +295,7 @@ static int nettl_read(wtap *wth, int *err, gchar **err_info, if (!nettl_read_rec(wth, wth->fh, &wth->phdr, wth->frame_buffer, err, err_info)) { /* Read error or EOF */ - return -1; + return FALSE; } /* @@ -313,15 +313,15 @@ static int nettl_read(wtap *wth, int *err, gchar **err_info, wth->file_encap = WTAP_ENCAP_PER_PACKET; } - return REC_TYPE_PACKET; + return TRUE; } -static int +static gboolean nettl_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 header. */ if (!nettl_read_rec(wth, wth->random_fh, phdr, buf, err, err_info)) { @@ -330,9 +330,9 @@ nettl_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr, /* 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 |