aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-08-18 11:51:36 -0700
committerGuy Harris <guy@alum.mit.edu>2015-08-18 18:52:01 +0000
commitea7cf08368c75f890f52d825560c2b7e5528ecd6 (patch)
tree7dee28f16f6df762e6fb9c4a9afe62fd7d9364bc /epan
parent7a096c38442588ec3613a4166f67d0b454fe7574 (diff)
Cast away 64 -> 32 narrowing complaints.
"secs" in an nstime_t is a time_t; cast the calculated seconds portion to time_t. Change-Id: Ieaad4c18bb21384a5781f50eadd3a537b414a369 Reviewed-on: https://code.wireshark.org/review/10113 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/file-pcapng.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/file-pcapng.c b/epan/dissectors/file-pcapng.c
index 84497016a6..824b07222b 100644
--- a/epan/dissectors/file-pcapng.c
+++ b/epan/dissectors/file-pcapng.c
@@ -1315,7 +1315,7 @@ static gint dissect_block(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
for (i_resolution = 0; i_resolution < (guint32)(interface_description->timestamp_resolution & 0x7F); i_resolution += 1)
resolution *= base;
- timestamp.secs = ts.u64 / resolution;
+ timestamp.secs = (time_t)(ts.u64 / resolution);
timestamp.nsecs = (int)(ts.u64 - (ts.u64 / resolution) * resolution);
proto_tree_add_time(block_data_tree, hf_pcapng_timestamp, tvb, offset, 8, &timestamp);