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, 42 insertions, 45 deletions

diff --git a/capinfos.c b/capinfos.c
index a24a6ae5a2..bad557e2dd 100644
--- a/capinfos.c
+++ b/capinfos.c
@@ -803,7 +803,6 @@ static int
 process_cap_file(wtap *wth, const char *filename)
 {
   int                   status = 0;
-  int                   rec_type;
   int                   err;
   gchar                *err_info;
   gint64                size;
@@ -829,53 +828,51 @@ process_cap_file(wtap *wth, const char *filename)
   cf_info.encap_counts = g_new0(int,WTAP_NUM_ENCAP_TYPES);
 
   /* Tally up data that we need to parse through the file to find */
-  while ((rec_type = wtap_read(wth, &err, &err_info, &data_offset)) != -1)  {
-    if (rec_type == REC_TYPE_PACKET) {
-      phdr = wtap_phdr(wth);
-      if (phdr->presence_flags & WTAP_HAS_TS) {
-        prev_time = cur_time;
-        cur_time = nstime_to_sec(&phdr->ts);
-        if (packet == 0) {
-          start_time = cur_time;
-          stop_time  = cur_time;
-          prev_time  = cur_time;
-        }
-        if (cur_time < prev_time) {
-          order = NOT_IN_ORDER;
-        }
-        if (cur_time < start_time) {
-          start_time = cur_time;
-        }
-        if (cur_time > stop_time) {
-          stop_time = cur_time;
-        }
-      } else {
-        have_times = FALSE; /* at least one packet has no time stamp */
-        if (order != NOT_IN_ORDER)
-          order = ORDER_UNKNOWN;
+  while (wtap_read(wth, &err, &err_info, &data_offset))  {
+    phdr = wtap_phdr(wth);
+    if (phdr->presence_flags & WTAP_HAS_TS) {
+      prev_time = cur_time;
+      cur_time = nstime_to_sec(&phdr->ts);
+      if (packet == 0) {
+        start_time = cur_time;
+        stop_time  = cur_time;
+        prev_time  = cur_time;
       }
-
-      bytes+=phdr->len;
-      packet++;
-
-      /* If caplen < len for a rcd, then presumably           */
-      /* 'Limit packet capture length' was done for this rcd. */
-      /* Keep track as to the min/max actual snapshot lengths */
-      /*  seen for this file.                                 */
-      if (phdr->caplen < phdr->len) {
-        if (phdr->caplen < snaplen_min_inferred)
-          snaplen_min_inferred = phdr->caplen;
-        if (phdr->caplen > snaplen_max_inferred)
-          snaplen_max_inferred = phdr->caplen;
+      if (cur_time < prev_time) {
+        order = NOT_IN_ORDER;
+      }
+      if (cur_time < start_time) {
+        start_time = cur_time;
       }
+      if (cur_time > stop_time) {
+        stop_time = cur_time;
+      }
+    } else {
+      have_times = FALSE; /* at least one packet has no time stamp */
+      if (order != NOT_IN_ORDER)
+        order = ORDER_UNKNOWN;
+    }
 
-      /* Per-packet encapsulation */
-      if (wtap_file_encap(wth) == WTAP_ENCAP_PER_PACKET) {
-        if ((phdr->pkt_encap > 0) && (phdr->pkt_encap < WTAP_NUM_ENCAP_TYPES)) {
-          cf_info.encap_counts[phdr->pkt_encap] += 1;
-        } else {
-          fprintf(stderr, "capinfos: Unknown per-packet encapsulation: %d [frame number: %d]\n", phdr->pkt_encap, packet);
-        }
+    bytes+=phdr->len;
+    packet++;
+
+    /* If caplen < len for a rcd, then presumably           */
+    /* 'Limit packet capture length' was done for this rcd. */
+    /* Keep track as to the min/max actual snapshot lengths */
+    /*  seen for this file.                                 */
+    if (phdr->caplen < phdr->len) {
+      if (phdr->caplen < snaplen_min_inferred)
+        snaplen_min_inferred = phdr->caplen;
+      if (phdr->caplen > snaplen_max_inferred)
+        snaplen_max_inferred = phdr->caplen;
+    }
+
+    /* Per-packet encapsulation */
+    if (wtap_file_encap(wth) == WTAP_ENCAP_PER_PACKET) {
+      if ((phdr->pkt_encap > 0) && (phdr->pkt_encap < WTAP_NUM_ENCAP_TYPES)) {
+        cf_info.encap_counts[phdr->pkt_encap] += 1;
+      } else {
+        fprintf(stderr, "capinfos: Unknown per-packet encapsulation: %d [frame number: %d]\n", phdr->pkt_encap, packet);
       }
     }