summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-02-12 00:39:36 +0000
committerAndrew Tridgell <tridge@samba.org>2003-02-12 00:39:36 +0000
commitc713b6aaf55b73d46737d96be360ae78128db6e6 (patch)
tree374eda3fd391bd375d3fb34c73ee3eba6186408d /source3
parent5b709467441dd79a206d1542d86be9085322b0cc (diff)
downloadsamba-c713b6aaf55b73d46737d96be360ae78128db6e6.tar.gz
samba-c713b6aaf55b73d46737d96be360ae78128db6e6.tar.bz2
samba-c713b6aaf55b73d46737d96be360ae78128db6e6.zip
pull_ucs2_talloc() should pull to a char**, not a void**
(This used to be commit 3cf539421fa2a5c276baeedbdbf42ced29d9f1e4)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/charcnv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 6dd3cd52d9..54e17bea68 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -605,11 +605,11 @@ size_t pull_ucs2_fstring(char *dest, const void *src)
* @retval The number of bytes occupied by the string in the destination
**/
-size_t pull_ucs2_talloc(TALLOC_CTX *ctx, void **dest, const smb_ucs2_t *src)
+size_t pull_ucs2_talloc(TALLOC_CTX *ctx, char **dest, const smb_ucs2_t *src)
{
size_t src_len = (strlen_w(src)+1) * sizeof(smb_ucs2_t);
*dest = NULL;
- return convert_string_talloc(ctx, CH_UCS2, CH_UNIX, src, src_len, dest);
+ return convert_string_talloc(ctx, CH_UCS2, CH_UNIX, src, src_len, (void **)dest);
}
/**