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, 14 deletions

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