From cba08587d39654e3b64ff6c0977d44f4b77b24bc Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 12 Feb 2003 01:09:35 +0000 Subject: Merge from HEAD - pull_ucs2_talloc() should pull to a char**, not a void** Jeremy. (This used to be commit 81437e2ad034e9b83ae954c17a7a261504c55101) --- source3/lib/charcnv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/lib') 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); } /** -- cgit