From beroset:

remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48383

1 files changed, 13 insertions, 13 deletions

diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index 5935fe6a6e..b43c864943 100644
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -645,14 +645,14 @@ void srtcp_add_address( packet_info *pinfo,
     /*
      * Check if the conversation has data associated with it.
      */
-    p_conv_data = conversation_get_proto_data(p_conv, proto_rtcp);
+    p_conv_data = (struct _rtcp_conversation_info *)conversation_get_proto_data(p_conv, proto_rtcp);
 
     /*
      * If not, add a new data item.
      */
     if ( ! p_conv_data ) {
         /* Create conversation data */
-        p_conv_data = se_alloc0(sizeof(struct _rtcp_conversation_info));
+        p_conv_data = se_new0(struct _rtcp_conversation_info);
         conversation_add_proto_data(p_conv, proto_rtcp, p_conv_data);
     }
 
@@ -2489,7 +2489,7 @@ void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     struct _rtcp_conversation_info *p_conv_data;
 
     /* Use existing packet data if available */
-    p_conv_data = p_get_proto_data(pinfo->fd, proto_rtcp);
+    p_conv_data = (struct _rtcp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtcp);
 
     if (!p_conv_data)
     {
@@ -2503,12 +2503,12 @@ void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         {
             /* Look for data in conversation */
             struct _rtcp_conversation_info *p_conv_packet_data;
-            p_conv_data = conversation_get_proto_data(p_conv, proto_rtcp);
+            p_conv_data = (struct _rtcp_conversation_info *)conversation_get_proto_data(p_conv, proto_rtcp);
 
             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 _rtcp_conversation_info *)se_memdup(p_conv_data,
                        sizeof(struct _rtcp_conversation_info));
 
                 p_add_proto_data(pinfo->fd, proto_rtcp, p_conv_packet_data);
@@ -2558,7 +2558,7 @@ static void remember_outgoing_sr(packet_info *pinfo, guint32 lsr)
     /* First of all, see if we've already stored this information for this sr */
 
     /* Look first in packet info */
-    p_packet_data = p_get_proto_data(pinfo->fd, proto_rtcp);
+    p_packet_data = (struct _rtcp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtcp);
     if (p_packet_data && p_packet_data->last_received_set &&
         (p_packet_data->last_received_frame_number >= pinfo->fd->num))
     {
@@ -2593,11 +2593,11 @@ static void remember_outgoing_sr(packet_info *pinfo, guint32 lsr)
 
     /****************************************************/
     /* Now find/create conversation data                */
-    p_conv_data = conversation_get_proto_data(p_conv, proto_rtcp);
+    p_conv_data = (struct _rtcp_conversation_info *)conversation_get_proto_data(p_conv, proto_rtcp);
     if (!p_conv_data)
     {
         /* Allocate memory for data */
-        p_conv_data = se_alloc0(sizeof(struct _rtcp_conversation_info));
+        p_conv_data = se_new0(struct _rtcp_conversation_info);
 
         /* Add it to conversation. */
         conversation_add_proto_data(p_conv, proto_rtcp, p_conv_data);
@@ -2617,7 +2617,7 @@ static void remember_outgoing_sr(packet_info *pinfo, guint32 lsr)
     /* Will use/create packet info */
     if (!p_packet_data)
     {
-        p_packet_data = se_alloc0(sizeof(struct _rtcp_conversation_info));
+        p_packet_data = se_new0(struct _rtcp_conversation_info);
 
         p_add_proto_data(pinfo->fd, proto_rtcp, p_packet_data);
     }
@@ -2650,7 +2650,7 @@ static void calculate_roundtrip_delay(tvbuff_t *tvb, packet_info *pinfo,
 
     /*************************************************/
     /* Look for previous result                      */
-    p_packet_data = p_get_proto_data(pinfo->fd, proto_rtcp);
+    p_packet_data = (struct _rtcp_conversation_info *)p_get_proto_data(pinfo->fd, proto_rtcp);
     if (p_packet_data && p_packet_data->lsr_matched)
     {
         /* Show info. */
@@ -2674,7 +2674,7 @@ static void calculate_roundtrip_delay(tvbuff_t *tvb, packet_info *pinfo,
     }
 
     /* Look for conversation data  */
-    p_conv_data = conversation_get_proto_data(p_conv, proto_rtcp);
+    p_conv_data = (struct _rtcp_conversation_info *)conversation_get_proto_data(p_conv, proto_rtcp);
     if (!p_conv_data)
     {
         return;
@@ -2686,7 +2686,7 @@ static void calculate_roundtrip_delay(tvbuff_t *tvb, packet_info *pinfo,
         if (!p_packet_data)
         {
             /* Create packet info if it doesn't exist */
-            p_packet_data = se_alloc0(sizeof(struct _rtcp_conversation_info));
+            p_packet_data = se_new0(struct _rtcp_conversation_info);
 
             /* Set as packet info */
             p_add_proto_data(pinfo->fd, proto_rtcp, p_packet_data);
@@ -2831,7 +2831,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
     if (p_conv)
     {
         struct _rtcp_conversation_info *p_conv_data;
-        p_conv_data = conversation_get_proto_data(p_conv, proto_rtcp);
+        p_conv_data = (struct _rtcp_conversation_info *)conversation_get_proto_data(p_conv, proto_rtcp);
         if (p_conv_data && p_conv_data->srtcp_info)
         {
             gboolean e_bit;