diff options
| author | Evan Huus <eapache@gmail.com> | 2014-05-17 08:02:45 -0400 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-05-17 12:04:29 +0000 |
| commit | 8129c2d13d836a299ce8fbabf7ee98cad12eafe2 (patch) | |
| tree | fe4573902681d976fa11b65685d4902e1974d307 /epan/dissectors/packet-dis.c | |
| parent | 89a72f328a9bc5498c628182bb38e8e61e985bd4 (diff) | |
| download | wireshark-8129c2d13d836a299ce8fbabf7ee98cad12eafe2.tar.gz | |
Add casts to fix OSX 10.6 buildbot
Change-Id: Ice852356201ba222290d2705d9f5526ce242b031
Reviewed-on: https://code.wireshark.org/review/1668
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-dis.c')
| -rw-r--r-- | epan/dissectors/packet-dis.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c index fed654def2..5a4a7cd85d 100644 --- a/epan/dissectors/packet-dis.c +++ b/epan/dissectors/packet-dis.c @@ -3363,7 +3363,7 @@ static int dissect_DIS_FIELDS_CLOCK_TIME(tvbuff_t *tvb, proto_tree *tree, int of ms = (uintVal >> 1) * MSEC_PER_HOUR / FSV; tv.secs = (time_t)ms/1000; - tv.nsecs = (ms%1000)*1000000; + tv.nsecs = (int)(ms%1000)*1000000; /* add hour */ tv.secs += (hour*3600); @@ -3661,7 +3661,7 @@ static gint parse_DIS_FIELDS_SIGNAL_LINK16_NETWORK_HEADER(tvbuff_t *tvb, proto_t offset += 4; tv.secs = tvb_get_ntohl(tvb, offset); - if (tv.secs == 0xFFFFFFFF) + if (tv.secs == (time_t)0xFFFFFFFF) { tv.nsecs = 0; proto_tree_add_time_format_value(sub_tree, hf_dis_signal_link16_ptt, tvb, offset, 8, &tv, "NO STATEMENT"); @@ -5260,7 +5260,7 @@ static gint parseField_Timestamp(tvbuff_t *tvb, proto_tree *tree, gint offset, i ms = (uintVal >> 1) * MSEC_PER_HOUR / FSV; tv.secs = (time_t)ms/1000; - tv.nsecs = (ms%1000)*1000000; + tv.nsecs = (int)(ms%1000)*1000000; ti = proto_tree_add_time(tree, hf_relative, tvb, offset, 4, &tv); |