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-xmpp.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-xmpp.c')
| -rw-r--r-- | epan/dissectors/packet-xmpp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c index 2a1cf9c27c..d816048bdc 100644 --- a/epan/dissectors/packet-xmpp.c +++ b/epan/dissectors/packet-xmpp.c @@ -406,7 +406,7 @@ dissect_xmpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_clear(pinfo->cinfo, COL_INFO); conversation = find_or_create_conversation(pinfo); - xmpp_info = conversation_get_proto_data(conversation, proto_xmpp); + xmpp_info = (xmpp_conv_info_t *)conversation_get_proto_data(conversation, proto_xmpp); if (xmpp_info && xmpp_info->ssl_proceed && xmpp_info->ssl_proceed < pinfo->fd->num) @@ -447,7 +447,7 @@ dissect_xmpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { return; if (!xmpp_info) { - xmpp_info = se_alloc(sizeof (xmpp_conv_info_t)); + xmpp_info = se_new(xmpp_conv_info_t); xmpp_info->req_resp = se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "xmpp_req_resp"); xmpp_info->jingle_sessions = se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "xmpp_jingle_sessions"); xmpp_info->ibb_sessions = se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "xmpp_ibb_sessions"); |