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-pana.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-pana.c')
-rw-r--r-- | epan/dissectors/packet-pana.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index 4525b27d17..e6b937c57c 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -541,12 +541,12 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Do we already have a state structure for this conv */ - pana_info = conversation_get_proto_data(conversation, proto_pana); + pana_info = (pana_conv_info_t *)conversation_get_proto_data(conversation, proto_pana); if (!pana_info) { /* No. Attach that information to the conversation, and add * it to the list of information structures. */ - pana_info = se_alloc(sizeof(pana_conv_info_t)); + pana_info = se_new(pana_conv_info_t); pana_info->pdus=se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "pana_pdus"); conversation_add_proto_data(conversation, proto_pana, pana_info); @@ -555,24 +555,24 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(!pinfo->fd->flags.visited){ if(flags&PANA_FLAG_R){ /* This is a request */ - pana_trans=se_alloc(sizeof(pana_transaction_t)); + pana_trans=se_new(pana_transaction_t); pana_trans->req_frame=pinfo->fd->num; pana_trans->rep_frame=0; pana_trans->req_time=pinfo->fd->abs_ts; se_tree_insert32(pana_info->pdus, seq_num, (void *)pana_trans); } else { - pana_trans=se_tree_lookup32(pana_info->pdus, seq_num); + pana_trans=(pana_transaction_t *)se_tree_lookup32(pana_info->pdus, seq_num); if(pana_trans){ pana_trans->rep_frame=pinfo->fd->num; } } } else { - pana_trans=se_tree_lookup32(pana_info->pdus, seq_num); + pana_trans=(pana_transaction_t *)se_tree_lookup32(pana_info->pdus, seq_num); } if(!pana_trans){ /* create a "fake" pana_trans structure */ - pana_trans=ep_alloc(sizeof(pana_transaction_t)); + pana_trans=ep_new(pana_transaction_t); pana_trans->req_frame=0; pana_trans->rep_frame=0; pana_trans->req_time=pinfo->fd->abs_ts; |