aboutsummaryrefslogtreecommitdiffstats
path: root/editcap.c
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2015-09-28 15:11:44 +0200
committerMichael Mann <mmann78@netscape.net>2015-09-28 17:18:38 +0000
commit1f9fb57773b55fe127eb022ae50430c07e0640df (patch)
treee40cc7179c8ad2508f2bb30464e297d331c0c393 /editcap.c
parent76f03c4e75d5195d33103ae6d3103b83e0335ecc (diff)
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 <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'editcap.c')
-rw-r--r--editcap.c12
1 files changed, 6 insertions, 6 deletions
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);
}
}