diff options
| -rw-r--r-- | editcap.c | 12 | ||||
| -rw-r--r-- | reordercap.c | 12 |
2 files changed, 12 insertions, 12 deletions
@@ -104,7 +104,7 @@ struct select_item { typedef struct _fd_hash_t { md5_byte_t digest[16]; guint32 len; - nstime_t time; + nstime_t frame_time; } fd_hash_t; #define DEFAULT_DUP_DEPTH 5 /* Used with -d */ @@ -592,8 +592,8 @@ is_duplicate_rel_time(guint8* fd, guint32 len, const nstime_t *current) { md5_finish(&ms, fd_hash[cur_dup_entry].digest); fd_hash[cur_dup_entry].len = len; - fd_hash[cur_dup_entry].time.secs = current->secs; - fd_hash[cur_dup_entry].time.nsecs = current->nsecs; + fd_hash[cur_dup_entry].frame_time.secs = current->secs; + fd_hash[cur_dup_entry].frame_time.nsecs = current->nsecs; /* * Look for relative time related duplicates. @@ -631,7 +631,7 @@ is_duplicate_rel_time(guint8* fd, guint32 len, const nstime_t *current) { break; } - if (nstime_is_unset(&(fd_hash[i].time))) { + if (nstime_is_unset(&(fd_hash[i].frame_time))) { /* * We've decremented to an unused fd_hash[] entry. * Check no more! @@ -639,7 +639,7 @@ is_duplicate_rel_time(guint8* fd, guint32 len, const nstime_t *current) { break; } - nstime_delta(&delta, current, &fd_hash[i].time); + nstime_delta(&delta, current, &fd_hash[i].frame_time); if (delta.secs < 0 || delta.nsecs < 0) { /* @@ -1306,7 +1306,7 @@ DIAG_ON(cast-qual) for (i = 0; i < dup_window; i++) { memset(&fd_hash[i].digest, 0, 16); fd_hash[i].len = 0; - nstime_set_unset(&fd_hash[i].time); + nstime_set_unset(&fd_hash[i].frame_time); } } diff --git a/reordercap.c b/reordercap.c index 53e7f45c20..3cc3a60765 100644 --- a/reordercap.c +++ b/reordercap.c @@ -68,7 +68,7 @@ typedef struct FrameRecord_t { gint64 offset; guint num; - nstime_t time; + nstime_t frame_time; } FrameRecord_t; @@ -115,7 +115,7 @@ frame_write(FrameRecord_t *frame, wtap *wth, wtap_dumper *pdh, /* Copy, and set length and timestamp from item. */ /* TODO: remove when wtap_seek_read() fills in phdr, including time stamps, for all file types */ - phdr->ts = frame->time; + phdr->ts = frame->frame_time; /* Dump frame to outfile */ if (!wtap_dump(pdh, phdr, ws_buffer_start_ptr(buf), &err, &err_info)) { @@ -140,8 +140,8 @@ frames_compare(gconstpointer a, gconstpointer b) const FrameRecord_t *frame1 = *(const FrameRecord_t *const *) a; const FrameRecord_t *frame2 = *(const FrameRecord_t *const *) b; - const nstime_t *time1 = &frame1->time; - const nstime_t *time2 = &frame2->time; + const nstime_t *time1 = &frame1->frame_time; + const nstime_t *time2 = &frame2->frame_time; return nstime_cmp(time1, time2); } @@ -305,9 +305,9 @@ DIAG_ON(cast-qual) newFrameRecord->num = frames->len + 1; newFrameRecord->offset = data_offset; if (phdr->presence_flags & WTAP_HAS_TS) { - newFrameRecord->time = phdr->ts; + newFrameRecord->frame_time = phdr->ts; } else { - nstime_set_unset(&newFrameRecord->time); + nstime_set_unset(&newFrameRecord->frame_time); } if (prevFrame && frames_compare(&newFrameRecord, &prevFrame) < 0) { |