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-ppp.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-ppp.c')
| -rw-r--r-- | epan/dissectors/packet-ppp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index d00621e1ee..4decabc4d1 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -3600,7 +3600,7 @@ dissect_vsncp_pdnaddress_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, case 2: { - struct e_in6_addr *ad = ep_alloc0(sizeof (struct e_in6_addr)); + struct e_in6_addr *ad = ep_new0(struct e_in6_addr); tvb_memcpy(tvb, &ad->bytes[8], offset + 3, 8); proto_tree_add_text(field_tree, tvb, offset + 3, length - 3, "%s: %s", @@ -3611,7 +3611,7 @@ dissect_vsncp_pdnaddress_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, case 3: { - struct e_in6_addr *ad = ep_alloc0(sizeof (struct e_in6_addr)); + struct e_in6_addr *ad = ep_new0(struct e_in6_addr); tvb_memcpy(tvb, &ad->bytes[8], offset + 3, 8); proto_tree_add_text(field_tree, tvb, offset + 3, length - 3, "%s: %s", @@ -4548,7 +4548,7 @@ dissect_iphc_crtp_fh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_ensure_bytes_exist (tvb, 0, hdr_len); /* ip_hdr_len + 8 */ /* allocate a copy of the IP packet */ - ip_packet = tvb_memdup(tvb, 0, length); + ip_packet = (guchar *)tvb_memdup(tvb, 0, length); /* restore the proper values to the IP and UDP length fields */ ip_packet[2] = length >> 8; @@ -4904,7 +4904,7 @@ remove_escape_chars(tvbuff_t *tvb, int offset, int length) guint8 octet; tvbuff_t *next_tvb; - buff = g_malloc(length); + buff = (guint8 *)g_malloc(length); i = 0; while (scanned_len < length) { octet = tvb_get_guint8(tvb, offset); |