"Bytes left to read" is an unsigned quantity. Changed FT_INT64 to FT_UINT64 as sugge...

[obnox/wireshark/wip.git] / epan / frame_data.c

diff --git a/epan/frame_data.c b/epan/frame_data.c
index 18b71e52df8e3ba04099ae0041083f6513f2c899..a233c75127517d98746c503718be30bd9e3b9c5f 100644 (file)
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -32,7 +32,6 @@
 #include <epan/packet.h>
 #include <epan/emem.h>
 #include <epan/timestamp.h>
-#include "cfile.h"
 
 #include <glib.h>
 
@@ -144,6 +143,8 @@ frame_data_compare(const frame_data *fdata1, const frame_data *fdata2, int field
             switch (timestamp_get_type()) {
                 case TS_ABSOLUTE:
                 case TS_ABSOLUTE_WITH_DATE:
+                case TS_UTC:
+                case TS_UTC_WITH_DATE:
                 case TS_EPOCH:
                     return COMPARE_TS(abs_ts);
 
@@ -163,6 +164,8 @@ frame_data_compare(const frame_data *fdata1, const frame_data *fdata2, int field
 
         case COL_ABS_TIME:
         case COL_ABS_DATE_TIME:
+        case COL_UTC_TIME:
+        case COL_UTC_DATE_TIME:
             return COMPARE_TS(abs_ts);
 
         case COL_REL_TIME:
@@ -189,19 +192,19 @@ frame_data_init(frame_data *fdata, guint32 num,
                 const struct wtap_pkthdr *phdr, gint64 offset,
                 guint32 cum_bytes)
 {
-  fdata->next = NULL;
-  fdata->prev = NULL;
   fdata->pfd = NULL;
   fdata->num = num;
   fdata->pkt_len = phdr->len;
   fdata->cum_bytes = cum_bytes + phdr->len;
   fdata->cap_len = phdr->caplen;
   fdata->file_off = offset;
-  /* To save some memory, we coarcese it into a gint8 */
-  g_assert(phdr->pkt_encap <= G_MAXINT8);
-  fdata->lnk_t = (gint8) phdr->pkt_encap;
+  /* To save some memory, we coerce it into a gint16 */
+  g_assert(phdr->pkt_encap <= G_MAXINT16);
+  fdata->lnk_t = (gint16) phdr->pkt_encap;
   fdata->abs_ts.secs = phdr->ts.secs;
   fdata->abs_ts.nsecs = phdr->ts.nsecs;
+  fdata->shift_offset.secs = 0;
+  fdata->shift_offset.nsecs = 0;
   fdata->flags.passed_dfilter = 0;
   fdata->flags.encoding = PACKET_CHAR_ENC_CHAR_ASCII;
   fdata->flags.visited = 0;
@@ -209,10 +212,6 @@ frame_data_init(frame_data *fdata, guint32 num,
   fdata->flags.ref_time = 0;
   fdata->flags.ignored = 0;
   fdata->color_filter = NULL;
-#ifdef NEW_PACKET_LIST
-  fdata->col_text_len = NULL;
-  fdata->col_text = NULL;
-#endif
 }
 
 void