diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-06-27 20:39:15 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-06-28 03:39:54 +0000 |
| commit | 8304f69fd7f02cb5fe79010170c7550d441ad6e7 (patch) | |
| tree | 5b95441afcd9ff732999054dffb13939e03cdce9 /wiretap/merge.c | |
| parent | c8518753c8d3f7bb809d2615adc9f6f2e5e89530 (diff) | |
Add macros to initialize nstime_t values and use them.
This allows code to initialize them without having to know the details
of the structure; the initializes should, and will, be changed if the
members of the structure are changed.
Change-Id: I93e6ebfcde9ceca17df696fcba4e8410c5afb175
Reviewed-on: https://code.wireshark.org/review/28501
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/merge.c')
| -rw-r--r-- | wiretap/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/merge.c b/wiretap/merge.c index bf26d8dde6..d706f79ae8 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -245,7 +245,7 @@ merge_read_packet(int in_file_count, merge_in_file_t in_files[], { int i; int ei = -1; - nstime_t tv = { sizeof(time_t) > sizeof(int) ? LONG_MAX : INT_MAX, INT_MAX }; + nstime_t tv = NSTIME_INIT_MAX; wtap_rec *rec; /* |