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-fcfcs.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-fcfcs.c')
| -rw-r--r-- | epan/dissectors/packet-fcfcs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index f7b32b6dc4..d3cb2db466 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -96,8 +96,8 @@ static dissector_handle_t data_handle; static gint fcfcs_equal(gconstpointer v, gconstpointer w) { - const fcfcs_conv_key_t *v1 = v; - const fcfcs_conv_key_t *v2 = w; + const fcfcs_conv_key_t *v1 = (const fcfcs_conv_key_t *)v; + const fcfcs_conv_key_t *v2 = (const fcfcs_conv_key_t *)w; return (v1->conv_idx == v2->conv_idx); } @@ -105,7 +105,7 @@ fcfcs_equal(gconstpointer v, gconstpointer w) static guint fcfcs_hash (gconstpointer v) { - const fcfcs_conv_key_t *key = v; + const fcfcs_conv_key_t *key = (const fcfcs_conv_key_t *)v; guint val; val = key->conv_idx; @@ -817,10 +817,10 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cdata->opcode = opcode; } else { - req_key = se_alloc (sizeof(fcfcs_conv_key_t)); + req_key = se_new(fcfcs_conv_key_t); req_key->conv_idx = conversation->index; - cdata = se_alloc (sizeof(fcfcs_conv_data_t)); + cdata = se_new(fcfcs_conv_data_t); cdata->opcode = opcode; g_hash_table_insert (fcfcs_req_hash, req_key, cdata); |