diff options
Diffstat (limited to 'wiretap/libpcap.c')
| -rw-r--r-- | wiretap/libpcap.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 7d467cb06c..fe9c111261 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -63,9 +63,9 @@ typedef enum { } libpcap_try_t; static libpcap_try_t libpcap_try(wtap *wth, int *err); -static int libpcap_read(wtap *wth, int *err, gchar **err_info, +static gboolean libpcap_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); -static int libpcap_seek_read(wtap *wth, gint64 seek_off, +static gboolean libpcap_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); static int libpcap_read_header(wtap *wth, FILE_T fh, int *err, gchar **err_info, struct pcaprec_ss990915_hdr *hdr); @@ -590,15 +590,13 @@ static libpcap_try_t libpcap_try(wtap *wth, int *err) } /* Read the next packet */ -static int libpcap_read(wtap *wth, int *err, gchar **err_info, +static gboolean libpcap_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { *data_offset = file_tell(wth->fh); - if (!libpcap_read_packet(wth, wth->fh, &wth->phdr, - wth->frame_buffer, err, err_info)) - return -1; - return REC_TYPE_PACKET; + return libpcap_read_packet(wth, wth->fh, &wth->phdr, + wth->frame_buffer, err, err_info); } static gboolean @@ -606,15 +604,15 @@ libpcap_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; if (!libpcap_read_packet(wth, wth->random_fh, 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 |