diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-18 21:16:23 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-18 21:16:23 +0000 |
| commit | 55c498169dfc04c1539f8a659113c8f30e53862d (patch) | |
| tree | 1749e181d23ec9a28c3a98c7d3294ff9b270d54c /epan/dissectors/packet-smb-common.c | |
| parent | 84241f46ada962c7b4b9b3cf0f1be134ee99b00c (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48400
Diffstat (limited to 'epan/dissectors/packet-smb-common.c')
| -rw-r--r-- | epan/dissectors/packet-smb-common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-smb-common.c b/epan/dissectors/packet-smb-common.c index c45f0ac0fb..b937a53ea8 100644 --- a/epan/dissectors/packet-smb-common.c +++ b/epan/dissectors/packet-smb-common.c @@ -100,7 +100,7 @@ int display_unicode_string(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_i * Allocate a buffer for the string; "len" is the length in * bytes, not the length in characters. */ - str = ep_alloc(len/2); + str = (char *)ep_alloc(len/2); /* * XXX - this assumes the string is just ISO 8859-1; we need @@ -163,7 +163,7 @@ unicode_to_str(tvbuff_t *tvb, int offset, int *us_lenp, gboolean exactlen, int us_len; gboolean overflow = FALSE; - cur=ep_alloc(MAX_UNICODE_STR_LEN+3+1); + cur=(gchar *)ep_alloc(MAX_UNICODE_STR_LEN+3+1); p = cur; len = MAX_UNICODE_STR_LEN; us_len = 0; @@ -265,7 +265,7 @@ get_unicode_or_ascii_string(tvbuff_t *tvb, int *offsetp, /* * The string we return must be null-terminated. */ - cur=ep_alloc(MAX_UNICODE_STR_LEN+3+1); + cur=(gchar *)ep_alloc(MAX_UNICODE_STR_LEN+3+1); copylen = *len; if (copylen < 0) { |