path: root/merge.c
diff options
authorUlf Lamping <ulf.lamping@web.de>2005-08-24 21:31:56 +0000
committerUlf Lamping <ulf.lamping@web.de>2005-08-24 21:31:56 +0000
commit6f43fbb2f088438dae20d4007df830863391b1c6 (patch)
tree7be99a00405385c14e1606c31906463d60107655 /merge.c
parentef81f7d060f39b43cc8eadf86c8e965a3e820225 (diff)
I've done more than a day to change the timestamp resolution from microseconds to nanoseconds. As I really don't want to loose those changes, I'm going to check in the changes I've done so far. Hopefully someone else will give me a helping hand with the things left ... What's done: I've changed the timestamp resolution from usec to nsec in almost any place in the sources. I've changed parts of the implementation in nstime.s/.h and a lot of places elsewhere. As I don't understand the editcap source (well, I'm maybe just too tired right now), hopefully someone else might be able to fix this soon. Doing all those changes, we get native nanosecond timestamp resolution in Ethereal. After fixing all the remaining issues, I'll take a look how to display this in a convenient way... As I've also changed the wiretap timestamp resolution from usec to nsec we might want to change the wiretap version number... svn path=/trunk/; revision=15520
Diffstat (limited to 'merge.c')
1 files changed, 5 insertions, 5 deletions
diff --git a/merge.c b/merge.c
index f2fb294aa2..8fd1c63af0 100644
--- a/merge.c
+++ b/merge.c
@@ -133,12 +133,12 @@ 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 timeval *l, struct timeval *r) {
- if (l->tv_sec > r->tv_sec) { /* left is later */
+is_earlier(struct wtap_nstime *l, struct wtap_nstime *r) {
+ if (l->secs > r->secs) { /* left is later */
return FALSE;
- } else if (l->tv_sec < r->tv_sec) { /* left is earlier */
+ } else if (l->secs < r->secs) { /* left is earlier */
return TRUE;
- } else if (l->tv_usec > r->tv_usec) { /* tv_sec equal, l.usec later */
+ } else if (l->nsecs > r->nsecs) { /* tv_sec equal, l.usec later */
return FALSE;
/* either one < two or one == two
@@ -157,7 +157,7 @@ merge_read_packet(int in_file_count, merge_in_file_t in_files[], int *err,
int i;
int ei = -1;
- struct timeval tv = {LONG_MAX, LONG_MAX};
+ struct wtap_nstime tv = {LONG_MAX, LONG_MAX};
struct wtap_pkthdr *phdr;