diff options
Diffstat (limited to 'wiretap/i4btrace.c')
-rw-r--r-- | wiretap/i4btrace.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/wiretap/i4btrace.c b/wiretap/i4btrace.c index d474ec2c8f..00cf9e876c 100644 --- a/wiretap/i4btrace.c +++ b/wiretap/i4btrace.c @@ -33,11 +33,11 @@ typedef struct { gboolean byte_swapped; } i4btrace_t; -static gboolean i4btrace_read(wtap *wth, int *err, gchar **err_info, +static int i4btrace_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); -static gboolean i4btrace_seek_read(wtap *wth, gint64 seek_off, +static int i4btrace_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); -static int i4b_read_rec(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, +static gboolean i4b_read_rec(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); /* @@ -110,21 +110,23 @@ int i4btrace_open(wtap *wth, int *err, gchar **err_info) } /* Read the next packet */ -static gboolean i4btrace_read(wtap *wth, int *err, gchar **err_info, +static int i4btrace_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { *data_offset = file_tell(wth->fh); - return i4b_read_rec(wth, wth->fh, &wth->phdr, wth->frame_buffer, - err, err_info); + if (!i4b_read_rec(wth, wth->fh, &wth->phdr, wth->frame_buffer, + err, err_info)) + return -1; + return REC_TYPE_PACKET; } -static gboolean +static int i4btrace_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 FALSE; + return -1; if (!i4b_read_rec(wth, wth->random_fh, phdr, buf, err, err_info)) { /* Read error or EOF */ @@ -132,12 +134,12 @@ i4btrace_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 FALSE; + return -1; } - return TRUE; + return REC_TYPE_PACKET; } -static int +static gboolean i4b_read_rec(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info) { |