Remove redundant members from wtap_syscall_header.

No need for len, and call caplen event_filelen and move it after
event_len.

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

1 files changed, 4 insertions, 5 deletions

diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 4ba654637c..09e80b0bf2 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -1258,15 +1258,14 @@ typedef struct {
 
 typedef struct {
     guint     record_type;      /* XXX match ft_specific_record_phdr so that we chain off of packet-pcapng_block for now. */
-    guint32   caplen;           /* data length in the file */
-    guint32   len;              /* data length on the wire */
     int       byte_order;
-    guint16   cpu_id;
     /* guint32 sentinel; */
-    guint64   timestamp;        /* ns since epoch */
+    guint64   timestamp;        /* ns since epoch - XXX dup of ts */
     guint64   thread_id;
-    guint32   event_len;        /* XXX dup of wtap_pkthdr.len */
+    guint32   event_len;        /* length of the event */
+    guint32   event_filelen;    /* event data length in the file */
     guint16   event_type;
+    guint16   cpu_id;
     /* ... Event ... */
 } wtap_syscall_header;