Revert "Refactor Wiretap"

This reverts commit 1abeb277f5e6bd27fbaebfecc8184e37ba9d008a.

This isn't building, and looks as if it requires significant work to fix.

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

1 files changed, 9 insertions, 9 deletions

diff --git a/capinfos.c b/capinfos.c
index dc2a2c9faf..bad557e2dd 100644
--- a/capinfos.c
+++ b/capinfos.c
@@ -408,7 +408,7 @@ time_string(time_t timer, capture_info *cf_info, gboolean want_lf)
       g_snprintf(time_string_buf, 20, "%lu%s", (unsigned long)timer, lf);
       return time_string_buf;
     } else {
-      time_string_ctime = asctime(localtime(&timer));
+      time_string_ctime = ctime(&timer);
       if (time_string_ctime == NULL) {
         g_snprintf(time_string_buf, 20, "Not representable%s", lf);
         return time_string_buf;
@@ -800,7 +800,7 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
 }
 
 static int
-process_cap_file(wftap *wth, const char *filename)
+process_cap_file(wtap *wth, const char *filename)
 {
   int                   status = 0;
   int                   err;
@@ -868,7 +868,7 @@ process_cap_file(wftap *wth, const char *filename)
     }
 
     /* Per-packet encapsulation */
-    if (wftap_file_encap(wth) == WTAP_ENCAP_PER_PACKET) {
+    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 {
@@ -905,7 +905,7 @@ process_cap_file(wftap *wth, const char *filename)
   }
 
   /* File size */
-  size = wftap_file_size(wth, &err);
+  size = wtap_file_size(wth, &err);
   if (size == -1) {
     fprintf(stderr,
         "capinfos: Can't get size of \"%s\": %s.\n",
@@ -917,14 +917,14 @@ process_cap_file(wftap *wth, const char *filename)
   cf_info.filesize = size;
 
   /* File Type */
-  cf_info.file_type = wftap_file_type_subtype(wth);
-  cf_info.iscompressed = wftap_iscompressed(wth);
+  cf_info.file_type = wtap_file_type_subtype(wth);
+  cf_info.iscompressed = wtap_iscompressed(wth);
 
   /* File Encapsulation */
-  cf_info.file_encap = wftap_file_encap(wth);
+  cf_info.file_encap = wtap_file_encap(wth);
 
   /* Packet size limit (snaplen) */
-  cf_info.snaplen = wftap_snapshot_length(wth);
+  cf_info.snaplen = wtap_snapshot_length(wth);
   if (cf_info.snaplen > 0)
     cf_info.snap_set = TRUE;
   else
@@ -1098,7 +1098,7 @@ hash_to_str(const unsigned char *hash, size_t length, char *str) {
 int
 main(int argc, char *argv[])
 {
-  wftap *wth;
+  wtap  *wth;
   int    err;
   gchar *err_info;
   int    opt;