diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:28:57 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:28:57 +0000 |
| commit | 3eb06be97d520daef0bad19bf9c261b01abdc66d (patch) | |
| tree | 521ce26d4bc68c8e4158df7aa2af769ba60e93b9 /epan/dissectors/packet-ntp.c | |
| parent | 089dfcd1085ac242322b8e90845ad9913ac7fcd3 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48425
Diffstat (limited to 'epan/dissectors/packet-ntp.c')
| -rw-r--r-- | epan/dissectors/packet-ntp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index ad3a96ad8e..23d1a3ea63 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -613,7 +613,7 @@ tvb_mip6_fmt_ts(tvbuff_t *tvb, gint offset) } fractime = bd->tm_sec + tempfrac / NTP_FLOAT_DENOM; - buff=ep_alloc(NTP_TS_SIZE); + buff=(char *)ep_alloc(NTP_TS_SIZE); g_snprintf(buff, NTP_TS_SIZE, "%s %2d, %d %02d:%02d:%07.4f UTC", mon_names[bd->tm_mon], @@ -655,7 +655,7 @@ tvb_ntp_fmt_ts(tvbuff_t *tvb, gint offset) } fractime = bd->tm_sec + tempfrac / NTP_FLOAT_DENOM; - buff=ep_alloc(NTP_TS_SIZE); + buff=(char *)ep_alloc(NTP_TS_SIZE); g_snprintf(buff, NTP_TS_SIZE, "%s %2d, %d %02d:%02d:%09.6f UTC", mon_names[bd->tm_mon], @@ -831,7 +831,7 @@ dissect_ntp_std(tvbuff_t *tvb, proto_tree *ntp_tree, guint8 flags) * But, all V3 and V4 servers set this to IP address of their * higher level server. My decision was to resolve this address. */ - buff = ep_alloc(NTP_TS_SIZE); + buff = (gchar *)ep_alloc(NTP_TS_SIZE); if (stratum <= 1) { g_snprintf (buff, NTP_TS_SIZE, "Unidentified reference source '%.4s'", tvb_get_ephemeral_string(tvb, 12, 4)); |