Allow wtap_read() and wtap_seek_read() to return non-packet records.

This is the first step towards implementing the mechanisms requestd in
bug 8590; currently, we don't return any records other than packet
records from libwiretap, and just ignore non-packet records in the rest
of Wireshark, but this at least gets the ball rolling.

Change-Id: I34a45b54dd361f69fdad1a758d8ca4f42d67d574
Reviewed-on: https://code.wireshark.org/review/1736
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 10 insertions, 8 deletions

diff --git a/wiretap/vms.c b/wiretap/vms.c
index 3684c3bbbe..90d5e24acc 100644
--- a/wiretap/vms.c
+++ b/wiretap/vms.c
@@ -139,9 +139,9 @@ to handle them.
 #define VMS_HEADER_LINES_TO_CHECK    200
 #define VMS_LINE_LENGTH              240
 
-static gboolean vms_read(wtap *wth, int *err, gchar **err_info,
+static int vms_read(wtap *wth, int *err, gchar **err_info,
     gint64 *data_offset);
-static gboolean vms_seek_read(wtap *wth, gint64 seek_off,
+static int vms_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,
     long byte_offset, int in_off, int remaining_bytes);
@@ -255,7 +255,7 @@ int vms_open(wtap *wth, int *err, gchar **err_info)
 }
 
 /* Find the next packet and parse it; called from wtap_read(). */
-static gboolean vms_read(wtap *wth, int *err, gchar **err_info,
+static int vms_read(wtap *wth, int *err, gchar **err_info,
     gint64 *data_offset)
 {
     gint64   offset = 0;
@@ -268,12 +268,14 @@ static gboolean vms_read(wtap *wth, int *err, gchar **err_info,
 #endif
     if (offset < 1) {
         *err = file_error(wth->fh, err_info);
-        return FALSE;
+        return -1;
     }
     *data_offset = offset;
 
     /* Parse the packet */
-    return parse_vms_packet(wth->fh, &wth->phdr, wth->frame_buffer, err, err_info);
+    if (!parse_vms_packet(wth->fh, &wth->phdr, wth->frame_buffer, err, err_info))
+        return -1;
+    return REC_TYPE_PACKET;
 }
 
 /* Used to read packets in random-access fashion */
@@ -282,14 +284,14 @@ vms_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 FALSE;
+        return -1;
 
     if (!parse_vms_packet(wth->random_fh, phdr, buf, err, err_info)) {
         if (*err == 0)
             *err = WTAP_ERR_SHORT_READ;
-        return FALSE;
+        return -1;
     }
-    return TRUE;
+    return REC_TYPE_PACKET;
 }
 
 /* isdumpline assumes that dump lines start with some non-alphanumerics