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-m3ua.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-m3ua.c')
| -rw-r--r-- | epan/dissectors/packet-m3ua.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index c444bd4a38..3d0d2f19f7 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.c @@ -1160,7 +1160,7 @@ dissect_protocol_data_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, pro guint16 ulp_length; tvbuff_t *payload_tvb; proto_item *item, *gen_item; - mtp3_tap_rec_t* mtp3_tap = ep_alloc0(sizeof(mtp3_tap_rec_t)); + mtp3_tap_rec_t* mtp3_tap = ep_new0(mtp3_tap_rec_t); proto_tree *q708_tree; gint heuristic_standard; guint8 si; @@ -1191,13 +1191,13 @@ dissect_protocol_data_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, pro PROTO_ITEM_SET_GENERATED(gen_item); } - mtp3_tap->addr_dpc.type = mtp3_standard; + mtp3_tap->addr_dpc.type = (Standard_Type)mtp3_standard; mtp3_tap->addr_dpc.pc = dpc; mtp3_tap->addr_dpc.ni = tvb_get_guint8(parameter_tvb, DATA_NI_OFFSET); SET_ADDRESS(&pinfo->dst, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) &mtp3_tap->addr_dpc); - mtp3_tap->addr_opc.type = mtp3_standard; + mtp3_tap->addr_opc.type = (Standard_Type)mtp3_standard; mtp3_tap->addr_opc.pc = opc; mtp3_tap->addr_opc.ni = tvb_get_guint8(parameter_tvb, DATA_NI_OFFSET); SET_ADDRESS(&pinfo->src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) &mtp3_tap->addr_opc); |