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-tn3270.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-tn3270.c')
| -rw-r--r-- | epan/dissectors/packet-tn3270.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index 87bef37706..55f07ab341 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -5269,7 +5269,7 @@ dissect_tn3270(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->destport, 0); if (conversation != NULL) { /* Do we already have a type and mechanism? */ - tn3270_info = conversation_get_proto_data(conversation, proto_tn3270); + tn3270_info = (tn3270_conv_info_t *)conversation_get_proto_data(conversation, proto_tn3270); } if (tn3270_info == NULL) @@ -5317,12 +5317,12 @@ add_tn3270_conversation(packet_info *pinfo, int tn3270e, gint model) /* * Do we already have a type and mechanism? */ - tn3270_info = conversation_get_proto_data(conversation, proto_tn3270); + tn3270_info = (tn3270_conv_info_t *)conversation_get_proto_data(conversation, proto_tn3270); if (tn3270_info == NULL) { /* No. Attach that information to the conversation, and add * it to the list of information structures. */ - tn3270_info = se_alloc(sizeof(tn3270_conv_info_t)); + tn3270_info = se_new(tn3270_conv_info_t); COPY_ADDRESS(&(tn3270_info->outbound_addr), &(pinfo->dst)); tn3270_info->outbound_port = pinfo->destport; @@ -5373,7 +5373,7 @@ find_tn3270_conversation(packet_info *pinfo) pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation != NULL) { - tn3270_info = conversation_get_proto_data(conversation, proto_tn3270); + tn3270_info = (tn3270_conv_info_t *)conversation_get_proto_data(conversation, proto_tn3270); if (tn3270_info != NULL) { /* * Do we already have a type and mechanism? |