sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

Merge from HEAD - pull_ucs2_talloc() should pull to a char**, not a void**

Browse Source 
Jeremy.
(This used to be commit 81437e2ad0)
This commit is contained in:
Jeremy Allison 2003-02-12 01:09:35 +00:00
parent 4403a1655c
commit cba08587d3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/lib/charcnv.c
View File

@ -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);
}
/**