diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 22:03:00 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 22:03:00 +0000 |
| commit | ae747e4c4b34c2d6889df335a439b9fba77538d0 (patch) | |
| tree | 3586ed7bc3e608af6db8bf6eff87fb3990c45b35 /epan/dissectors/packet-rtsp.c | |
| parent | 7c56677cf9e703e6dde30529b24e27dd2a4960a9 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48430
Diffstat (limited to 'epan/dissectors/packet-rtsp.c')
| -rw-r--r-- | epan/dissectors/packet-rtsp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index d2e464b08e..f6ccb39035 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -181,7 +181,7 @@ rtsp_stats_tree_init(stats_tree* st) static int rtsp_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p) { - const rtsp_info_value_t *v = p; + const rtsp_info_value_t *v = (const rtsp_info_value_t *)p; guint i = v->response_code; int resp_grp; const gchar *resp_str; @@ -392,7 +392,7 @@ dissect_rtspinterleaved(tvbuff_t *tvb, int offset, packet_info *pinfo, pinfo->srcport, pinfo->destport, 0); if (conv && - (data = conversation_get_proto_data(conv, proto_rtsp)) && + (data = (rtsp_conversation_data_t *)conversation_get_proto_data(conv, proto_rtsp)) && /* Add the following condition if it is not always true. rf_chan < RTSP_MAX_INTERLEAVED && */ @@ -590,12 +590,12 @@ rtsp_create_conversation(packet_info *pinfo, const guchar *line_begin, conv = find_or_create_conversation(pinfo); /* Look for previous data */ - data = conversation_get_proto_data(conv, proto_rtsp); + data = (rtsp_conversation_data_t *)conversation_get_proto_data(conv, proto_rtsp); /* Create new data if necessary */ if (!data) { - data = se_alloc0(sizeof(rtsp_conversation_data_t)); + data = se_new0(rtsp_conversation_data_t); conversation_add_proto_data(conv, proto_rtsp, data); } @@ -718,7 +718,7 @@ dissect_rtspmessage(tvbuff_t *tvb, int offset, packet_info *pinfo, gchar *session_id = NULL; voip_packet_info_t *stat_info = NULL; - rtsp_stat_info = ep_alloc(sizeof(rtsp_info_value_t)); + rtsp_stat_info = ep_new(rtsp_info_value_t); rtsp_stat_info->framenum = pinfo->fd->num; rtsp_stat_info->response_code = 0; rtsp_stat_info->request_method = NULL; @@ -1146,7 +1146,7 @@ dissect_rtspmessage(tvbuff_t *tvb, int offset, packet_info *pinfo, } if (session_id) { - stat_info = ep_alloc0(sizeof(voip_packet_info_t)); + stat_info = ep_new0(voip_packet_info_t); stat_info->protocol_name = ep_strdup("RTSP"); stat_info->call_id = session_id; stat_info->frame_label = frame_label; |