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, 10 insertions, 12 deletions

diff --git a/wiretap/toshiba.c b/wiretap/toshiba.c
index 6e8ab1a178..6fcf40270b 100644
--- a/wiretap/toshiba.c
+++ b/wiretap/toshiba.c
@@ -105,9 +105,9 @@ static const char toshiba_rec_magic[]  = { '[', 'N', 'o', '.' };
  */
 #define TOSHIBA_MAX_PACKET_LEN	16384
 
-static int toshiba_read(wtap *wth, int *err, gchar **err_info,
+static gboolean toshiba_read(wtap *wth, int *err, gchar **err_info,
 	gint64 *data_offset);
-static int toshiba_seek_read(wtap *wth, gint64 seek_off,
+static gboolean toshiba_seek_read(wtap *wth, gint64 seek_off,
 	struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info);
 static gboolean parse_single_hex_dump_line(char* rec, guint8 *buf,
 	guint byte_offset);
@@ -214,7 +214,7 @@ int toshiba_open(wtap *wth, int *err, gchar **err_info)
 }
 
 /* Find the next packet and parse it; called from wtap_read(). */
-static int toshiba_read(wtap *wth, int *err, gchar **err_info,
+static gboolean toshiba_read(wtap *wth, int *err, gchar **err_info,
     gint64 *data_offset)
 {
 	gint64	offset;
@@ -222,31 +222,29 @@ static int toshiba_read(wtap *wth, int *err, gchar **err_info,
 	/* Find the next packet */
 	offset = toshiba_seek_next_packet(wth, err, err_info);
 	if (offset < 1)
-		return -1;
+		return FALSE;
 	*data_offset = offset;
 
 	/* Parse the packet */
-	if (!parse_toshiba_packet(wth->fh, &wth->phdr, wth->frame_buffer,
-	    err, err_info))
-		return -1;
-	return REC_TYPE_PACKET;
+	return parse_toshiba_packet(wth->fh, &wth->phdr, wth->frame_buffer,
+	    err, err_info);
 }
 
 /* Used to read packets in random-access fashion */
-static int
+static gboolean
 toshiba_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 - 1, SEEK_SET, err) == -1)
-		return -1;
+		return FALSE;
 
 	if (!parse_toshiba_packet(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;
 }
 
 /* Parses a packet. */