From 1f9fb57773b55fe127eb022ae50430c07e0640df Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Mon, 28 Sep 2015 15:11:44 +0200 Subject: editcap/reordercap: rename time to frame_time. According to checkAPI. Change-Id: Iddad6253fc4711ed7870eccadb91d94e5fecd24d Reviewed-on: https://code.wireshark.org/review/10672 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- editcap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'editcap.c') diff --git a/editcap.c b/editcap.c index 7db59ac57b..ba924ae33c 100644 --- a/editcap.c +++ b/editcap.c @@ -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); } } -- cgit v1.2.3