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>

1 files changed, 11 insertions, 11 deletions

diff --git a/wiretap/aethra.c b/wiretap/aethra.c
index bab0091fb0..a0b783b349 100644
--- a/wiretap/aethra.c
+++ b/wiretap/aethra.c
@@ -112,9 +112,9 @@ typedef struct {
 	time_t	start;
 } aethra_t;
 
-static int aethra_read(wtap *wth, int *err, gchar **err_info,
+static gboolean aethra_read(wtap *wth, int *err, gchar **err_info,
     gint64 *data_offset);
-static int aethra_seek_read(wtap *wth, gint64 seek_off,
+static gboolean aethra_seek_read(wtap *wth, gint64 seek_off,
     struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info);
 static gboolean aethra_read_rec_header(wtap *wth, FILE_T fh, struct aethrarec_hdr *hdr,
     struct wtap_pkthdr *phdr, int *err, gchar **err_info);
@@ -182,7 +182,7 @@ static guint packet = 0;
 #endif
 
 /* Read the next packet */
-static int aethra_read(wtap *wth, int *err, gchar **err_info,
+static gboolean aethra_read(wtap *wth, int *err, gchar **err_info,
     gint64 *data_offset)
 {
 	struct aethrarec_hdr hdr;
@@ -196,7 +196,7 @@ static int aethra_read(wtap *wth, int *err, gchar **err_info,
 
 		/* Read record header. */
 		if (!aethra_read_rec_header(wth, wth->fh, &hdr, &wth->phdr, err, err_info))
-			return -1;
+			return FALSE;
 
 		/*
 		 * XXX - if this is big, we might waste memory by
@@ -205,7 +205,7 @@ static int aethra_read(wtap *wth, int *err, gchar **err_info,
 		if (wth->phdr.caplen != 0) {
 			if (!wtap_read_packet_bytes(wth->fh, wth->frame_buffer,
 			    wth->phdr.caplen, err, err_info))
-				return -1;	/* Read error */
+				return FALSE;	/* Read error */
 		}
 #if 0
 packet++;
@@ -270,32 +270,32 @@ packet, hdr.rec_type, wth->phdr.caplen, hdr.flags);
 	}
 
 found:
-	return REC_TYPE_PACKET;
+	return TRUE;
 }
 
-static int
+static gboolean
 aethra_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr,
     Buffer *buf, int *err, gchar **err_info)
 {
 	struct aethrarec_hdr hdr;
 
 	if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
-		return -1;
+		return FALSE;
 
 	if (!aethra_read_rec_header(wth, wth->random_fh, &hdr, phdr, err,
 	    err_info)) {
 		if (*err == 0)
 			*err = WTAP_ERR_SHORT_READ;
-		return -1;
+		return FALSE;
 	}
 
 	/*
 	 * Read the packet data.
 	 */
 	if (!wtap_read_packet_bytes(wth->random_fh, buf, phdr->caplen, err, err_info))
-		return -1;	/* failed */
+		return FALSE;	/* failed */
 
-	return REC_TYPE_PACKET;
+	return TRUE;
 }
 
 static gboolean