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-fcswils.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-fcswils.c')
| -rw-r--r-- | epan/dissectors/packet-fcswils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index f286aea450..5eec554b0a 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -435,8 +435,8 @@ static gint get_zoneobj_len(tvbuff_t *tvb, gint offset); static gint fcswils_equal(gconstpointer v, gconstpointer w) { - const fcswils_conv_key_t *v1 = v; - const fcswils_conv_key_t *v2 = w; + const fcswils_conv_key_t *v1 = (const fcswils_conv_key_t *)v; + const fcswils_conv_key_t *v2 = (const fcswils_conv_key_t *)w; return (v1->conv_idx == v2->conv_idx); } @@ -444,7 +444,7 @@ fcswils_equal(gconstpointer v, gconstpointer w) static guint fcswils_hash(gconstpointer v) { - const fcswils_conv_key_t *key = v; + const fcswils_conv_key_t *key = (const fcswils_conv_key_t *)v; guint val; val = key->conv_idx; @@ -758,7 +758,7 @@ dissect_swils_elp(tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_) char *flagsbuf; gint stroff, returned_length; - flagsbuf=ep_alloc(MAX_FLAGS_LEN); + flagsbuf=(char *)ep_alloc(MAX_FLAGS_LEN); stroff = 0; returned_length = g_snprintf(flagsbuf+stroff, MAX_FLAGS_LEN-stroff, @@ -1806,10 +1806,10 @@ dissect_fcswils(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cdata->opcode = opcode; } else { - req_key = se_alloc(sizeof(fcswils_conv_key_t)); + req_key = se_new(fcswils_conv_key_t); req_key->conv_idx = conversation->index; - cdata = se_alloc(sizeof(fcswils_conv_data_t)); + cdata = se_new(fcswils_conv_data_t); cdata->opcode = opcode; g_hash_table_insert(fcswils_req_hash, req_key, cdata); |