forked from osmocom/wireshark
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. svn path=/trunk/; revision=23764
This commit is contained in:
parent
d31730a21b
commit
a46aade746
2
merge.c
2
merge.c
|
@ -157,7 +157,7 @@ merge_read_packet(int in_file_count, merge_in_file_t in_files[], int *err,
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int ei = -1;
|
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;
|
struct wtap_pkthdr *phdr;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue