diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 04:54:30 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 04:54:30 +0000 |
commit | a10b98284c44bcafc86ee440ce936cfe305fe01b (patch) | |
tree | ff1ad5ac23bc527b2cccdff6e73ba401bd04d5f5 /epan/dissectors/packet-fp_hint.c | |
parent | bab72ca73439280d7b83d40495d8a39d46267ddc (diff) |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48412
Diffstat (limited to 'epan/dissectors/packet-fp_hint.c')
-rw-r--r-- | epan/dissectors/packet-fp_hint.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c index bce45f74df..df9c238eaf 100644 --- a/epan/dissectors/packet-fp_hint.c +++ b/epan/dissectors/packet-fp_hint.c @@ -147,14 +147,14 @@ static guint16 assign_rb_info(tvbuff_t *tvb, packet_info *pinfo, guint16 offset, struct umts_mac_info *macinf; struct rlc_info *rlcinf; - macinf = p_get_proto_data(pinfo->fd, proto_umts_mac); - rlcinf = p_get_proto_data(pinfo->fd, proto_rlc); + macinf = (umts_mac_info *)p_get_proto_data(pinfo->fd, proto_umts_mac); + rlcinf = (rlc_info *)p_get_proto_data(pinfo->fd, proto_rlc); if (!macinf) { - macinf = se_alloc0(sizeof(struct umts_mac_info)); + macinf = se_new0(struct umts_mac_info); p_add_proto_data(pinfo->fd, proto_umts_mac, macinf); } if (!rlcinf) { - rlcinf = se_alloc0(sizeof(struct rlc_info)); + rlcinf = se_new0(struct rlc_info); p_add_proto_data(pinfo->fd, proto_rlc, rlcinf); } @@ -428,9 +428,9 @@ static void attach_info(tvbuff_t *tvb, packet_info *pinfo, guint16 offset, guint { fp_info *fpi; - fpi = p_get_proto_data(pinfo->fd, proto_fp); + fpi = (fp_info *)p_get_proto_data(pinfo->fd, proto_fp); if (!fpi) { - fpi = se_alloc0(sizeof(fp_info)); + fpi = se_new0(fp_info); p_add_proto_data(pinfo->fd, proto_fp, fpi); } |