diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 20:00:52 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 20:00:52 +0000 |
| commit | 6bde91807842874d396f80faf5653e5403c249dc (patch) | |
| tree | 8dc51d6ec7d1ecb0e5d6f8bed87a43ba01fc10a7 /epan/dissectors/packet-gtp.c | |
| parent | 3eb06be97d520daef0bad19bf9c261b01abdc66d (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48426
Diffstat (limited to 'epan/dissectors/packet-gtp.c')
| -rw-r--r-- | epan/dissectors/packet-gtp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 1d42dde485..23596de211 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -7859,12 +7859,12 @@ dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) /* * Do we already know this conversation? */ - gtp_info = conversation_get_proto_data(conversation, proto_gtp); + gtp_info = (gtp_conv_info_t *)conversation_get_proto_data(conversation, proto_gtp); if (gtp_info == NULL) { /* No. Attach that information to the conversation, and add * it to the list of information structures. */ - gtp_info = g_malloc(sizeof(gtp_conv_info_t)); + gtp_info = (gtp_conv_info_t *)g_malloc(sizeof(gtp_conv_info_t)); /*Request/response matching tables*/ gtp_info->matched = g_hash_table_new(gtp_sn_hash, gtp_sn_equal_matched); gtp_info->unmatched = g_hash_table_new(gtp_sn_hash, gtp_sn_equal_unmatched); |