diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 22:03:00 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 22:03:00 +0000 |
| commit | ae747e4c4b34c2d6889df335a439b9fba77538d0 (patch) | |
| tree | 3586ed7bc3e608af6db8bf6eff87fb3990c45b35 /epan/dissectors/packet-zbee-zdp-discovery.c | |
| parent | 7c56677cf9e703e6dde30529b24e27dd2a4960a9 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48430
Diffstat (limited to 'epan/dissectors/packet-zbee-zdp-discovery.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zdp-discovery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-zbee-zdp-discovery.c b/epan/dissectors/packet-zbee-zdp-discovery.c index a2e2a80057..c759e2fd52 100644 --- a/epan/dissectors/packet-zbee-zdp-discovery.c +++ b/epan/dissectors/packet-zbee-zdp-discovery.c @@ -418,8 +418,8 @@ dissect_zbee_zdp_req_set_user_desc(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* No Length field in ZigBee 2003 & earlier, uses a fixed length of 16. */ user_length = 16; } - user = ep_alloc(user_length+1); - user = tvb_memcpy(tvb, user, offset, user_length); + user = (gchar *)ep_alloc(user_length+1); + user = (gchar *)tvb_memcpy(tvb, user, offset, user_length); user[user_length] = '\0'; if (tree) { proto_tree_add_string(tree, hf_zbee_zdp_user, tvb, offset, user_length, user); |