diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-03-03 18:45:23 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-03-03 18:45:23 +0000 |
| commit | 4d63de1b411884cd5abb043733c0db5ca3068bb2 (patch) | |
| tree | 50d3d7a99569756b24cb9448c0fc9ef9f4d82a19 /plugins/profinet/packet-pn-dcp.c | |
| parent | 85973068cc09855aa510e9cea6dc54c05fe0420d (diff) | |
| download | wireshark-4d63de1b411884cd5abb043733c0db5ca3068bb2.tar.gz | |
From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from profinet plugin
svn path=/trunk/; revision=48039
Diffstat (limited to 'plugins/profinet/packet-pn-dcp.c')
| -rw-r--r-- | plugins/profinet/packet-pn-dcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c index 1b240b82dc..b05fcedcd4 100644 --- a/plugins/profinet/packet-pn-dcp.c +++ b/plugins/profinet/packet-pn-dcp.c @@ -465,7 +465,7 @@ dissect_PNDCP_Suboption_Device(tvbuff_t *tvb, int offset, packet_info *pinfo, switch (suboption) { case PNDCP_SUBOPTION_DEVICE_MANUF: - typeofstation = ep_alloc(block_length+1); + typeofstation = (char *)ep_alloc(block_length+1); tvb_memcpy(tvb, (guint8 *) typeofstation, offset, block_length); typeofstation[block_length] = '\0'; proto_tree_add_string (tree, hf_pn_dcp_suboption_device_typeofstation, tvb, offset, block_length, typeofstation); @@ -483,7 +483,7 @@ dissect_PNDCP_Suboption_Device(tvbuff_t *tvb, int offset, packet_info *pinfo, offset += block_length; break; case PNDCP_SUBOPTION_DEVICE_NAMEOFSTATION: - nameofstation = ep_alloc(block_length+1); + nameofstation = (char *)ep_alloc(block_length+1); tvb_memcpy(tvb, (guint8 *) nameofstation, offset, block_length); nameofstation[block_length] = '\0'; proto_tree_add_string (tree, hf_pn_dcp_suboption_device_nameofstation, tvb, offset, block_length, nameofstation); @@ -554,7 +554,7 @@ dissect_PNDCP_Suboption_Device(tvbuff_t *tvb, int offset, packet_info *pinfo, } break; case PNDCP_SUBOPTION_DEVICE_ALIAS_NAME: - aliasname = ep_alloc(block_length+1); + aliasname = (char *)ep_alloc(block_length+1); tvb_memcpy(tvb, (guint8 *) aliasname, offset, block_length); aliasname[block_length] = '\0'; proto_tree_add_string (tree, hf_pn_dcp_suboption_device_aliasname, tvb, offset, block_length, aliasname); |