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-msrp.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-msrp.c')
| -rw-r--r-- | epan/dissectors/packet-msrp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index 2cc15940f0..7aaef8a539 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -192,14 +192,14 @@ msrp_add_address( packet_info *pinfo, /* * Check if the conversation has data associated with it. */ - p_conv_data = conversation_get_proto_data(p_conv, proto_msrp); + p_conv_data = (struct _msrp_conversation_info *)conversation_get_proto_data(p_conv, proto_msrp); /* * If not, add a new data item. */ if (!p_conv_data) { /* Create conversation data */ - p_conv_data = se_alloc0(sizeof(struct _msrp_conversation_info)); + p_conv_data = se_new0(struct _msrp_conversation_info); conversation_add_proto_data(p_conv, proto_msrp, p_conv_data); } @@ -222,7 +222,7 @@ show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) struct _msrp_conversation_info *p_conv_data = NULL; /* Use existing packet data if available */ - p_conv_data = p_get_proto_data(pinfo->fd, proto_msrp); + p_conv_data = (struct _msrp_conversation_info *)p_get_proto_data(pinfo->fd, proto_msrp); if (!p_conv_data) { @@ -235,12 +235,12 @@ show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* Look for data in conversation */ struct _msrp_conversation_info *p_conv_packet_data; - p_conv_data = conversation_get_proto_data(p_conv, proto_msrp); + p_conv_data = (struct _msrp_conversation_info *)conversation_get_proto_data(p_conv, proto_msrp); if (p_conv_data) { /* Save this conversation info into packet info */ - p_conv_packet_data = se_memdup(p_conv_data, + p_conv_packet_data = (struct _msrp_conversation_info *)se_memdup(p_conv_data, sizeof(struct _msrp_conversation_info)); p_add_proto_data(pinfo->fd, proto_msrp, p_conv_packet_data); |