summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-04-06 13:11:29 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-04-06 13:11:29 +0000
commit6187ebe30c6e3708c1cd5ebcaf053af20a65a310 (patch)
tree47a9fb5add86f81653d8f3ca4ffd9ae15f3319b4 /source3
parent88ed48d0f935db136318fafe6e541cf7cbaed5e2 (diff)
downloadsamba-6187ebe30c6e3708c1cd5ebcaf053af20a65a310.tar.gz
samba-6187ebe30c6e3708c1cd5ebcaf053af20a65a310.tar.bz2
samba-6187ebe30c6e3708c1cd5ebcaf053af20a65a310.zip
Fix the interface of pull_ucs2_charcnv() to take a (char **) arg, not a (void **)
(This used to be commit dc04b732baa0848e391baf7f148218a10e0af032)
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 ad39a6e5dc..f025e93718 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -639,11 +639,11 @@ size_t pull_ucs2_talloc(TALLOC_CTX *ctx, char **dest, const smb_ucs2_t *src)
* @returns The number of bytes occupied by the string in the destination
**/
-size_t pull_ucs2_allocate(void **dest, const smb_ucs2_t *src)
+size_t pull_ucs2_allocate(char **dest, const smb_ucs2_t *src)
{
size_t src_len = (strlen_w(src)+1) * sizeof(smb_ucs2_t);
*dest = NULL;
- return convert_string_allocate(CH_UCS2, CH_UNIX, src, src_len, dest);
+ return convert_string_allocate(CH_UCS2, CH_UNIX, src, src_len, (void **)dest);
}
/**