diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-12-05 10:24:37 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-12-05 10:24:37 +0000 |
commit | da6614540b7b4291962ac14c60df330cc2ff4751 (patch) | |
tree | b0060cb374a9befce4292158f0331f05ea5ab84d /merge.c | |
parent | 013115270a3b997ce56378068270b686664c7d49 (diff) |
The first component of a "wtap_nstime" is a "time_t", which could be an
"int" or a "long"; initialize it with LONG_MAX cast to "time_t".
The second argument is an "int"; initialize it with INT_MAX.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23764 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'merge.c')
-rw-r--r-- | merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 wtap_nstime tv = {LONG_MAX, LONG_MAX}; + struct wtap_nstime tv = {(time_t)LONG_MAX, INT_MAX}; struct wtap_pkthdr *phdr; /* |