From 38edae1c718f690281958ff43d1154abc1c96247 Mon Sep 17 00:00:00 2001 From: Jakub Zawadzki Date: Sat, 9 Nov 2013 10:38:02 +0000 Subject: Replace wtap_nstime with nstime_t, remove wtap_nstime_to_sec. After r50154 nstime_t is inside wsutil/ so wiretap don't need it's own copy. svn path=/trunk/; revision=53184 --- wiretap/merge.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'wiretap/merge.c') diff --git a/wiretap/merge.c b/wiretap/merge.c index 264f66c3ed..34f71ec7c5 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -150,7 +150,8 @@ merge_max_snapshot_length(int count, merge_in_file_t in_files[]) * returns TRUE if first argument is earlier than second */ static gboolean -is_earlier(struct wtap_nstime *l, struct wtap_nstime *r) { +is_earlier(nstime_t *l, nstime_t *r) /* XXX, move to nstime.c */ +{ if (l->secs > r->secs) { /* left is later */ return FALSE; } else if (l->secs < r->secs) { /* left is earlier */ @@ -183,7 +184,7 @@ merge_read_packet(int in_file_count, merge_in_file_t in_files[], { int i; int ei = -1; - struct wtap_nstime tv = { sizeof(time_t) > sizeof(int) ? LONG_MAX : INT_MAX, INT_MAX }; + nstime_t tv = { sizeof(time_t) > sizeof(int) ? LONG_MAX : INT_MAX, INT_MAX }; struct wtap_pkthdr *phdr; /* -- cgit v1.2.3