diff options
| author | Jeremy Allison <jra@samba.org> | 2003-02-12 01:09:35 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-02-12 01:09:35 +0000 |
| commit | cba08587d39654e3b64ff6c0977d44f4b77b24bc (patch) | |
| tree | 9e1111f9d00b36c1bd3b5b2945d475ae74727ece /source3/lib/charcnv.c | |
| parent | 4403a1655cebd079aec47a8655368d1329748d09 (diff) | |
| download | samba-cba08587d39654e3b64ff6c0977d44f4b77b24bc.tar.gz samba-cba08587d39654e3b64ff6c0977d44f4b77b24bc.tar.xz samba-cba08587d39654e3b64ff6c0977d44f4b77b24bc.zip | |
Merge from HEAD - pull_ucs2_talloc() should pull to a char**, not a void**
Jeremy.
(This used to be commit 81437e2ad034e9b83ae954c17a7a261504c55101)
Diffstat (limited to 'source3/lib/charcnv.c')
| -rw-r--r-- | source3/lib/charcnv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index 6dd3cd52d97..54e17bea686 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); } /** |