diff options
Diffstat (limited to 'wiretap/stanag4607.c')
-rw-r--r-- | wiretap/stanag4607.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/wiretap/stanag4607.c b/wiretap/stanag4607.c index 12bc05885c..8c0625c74f 100644 --- a/wiretap/stanag4607.c +++ b/wiretap/stanag4607.c @@ -48,8 +48,8 @@ static gboolean is_valid_id(guint16 version_id) return TRUE; } -static gboolean stanag4607_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, - Buffer *buf, int *err, gchar **err_info) +static int stanag4607_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, + Buffer *buf, int *err, gchar **err_info) { stanag4607_t *stanag4607 = (stanag4607_t *)wth->priv; guint32 millisecs, secs, nsecs; @@ -69,7 +69,7 @@ static gboolean stanag4607_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *p if (!is_valid_id(pntoh16(&stanag_pkt_hdr[0]))) { *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup("Bad version number"); - return FALSE; + return -1; } /* The next 4 bytes are the packet length */ @@ -133,16 +133,19 @@ static gboolean stanag4607_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *p /* wind back to the start of the packet ... */ if (file_seek(fh, - offset, SEEK_CUR, err) == -1) - goto fail; + return -1; - return wtap_read_packet_bytes(fh, buf, packet_size, err, err_info); + if (!wtap_read_packet_bytes(fh, buf, packet_size, err, err_info)) + return -1; + + return REC_TYPE_PACKET; fail: *err = file_error(wth->fh, err_info); - return FALSE; + return -1; } -static gboolean stanag4607_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) +static int stanag4607_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { gint64 offset; @@ -155,12 +158,12 @@ static gboolean stanag4607_read(wtap *wth, int *err, gchar **err_info, gint64 *d return stanag4607_read_file(wth, wth->fh, &wth->phdr, wth->frame_buffer, err, err_info); } -static gboolean stanag4607_seek_read(wtap *wth, gint64 seek_off, - struct wtap_pkthdr *phdr, - Buffer *buf, int *err, gchar **err_info) +static int stanag4607_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; return stanag4607_read_file(wth, wth->random_fh, phdr, buf, err, err_info); } |