diff options
| author | Gerald Carter <jerry@samba.org> | 2002-10-01 18:26:00 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-10-01 18:26:00 +0000 |
| commit | f2d1f19a66ebaf9b88d23c0faa2412536cc74cda (patch) | |
| tree | 781120ed548c3f38de9d40795a426de525e7865b /source3/lib/charcnv.c | |
| parent | 2fb5c7c580a3fff3c7d477b65a1c4852af86433b (diff) | |
| download | samba-f2d1f19a66ebaf9b88d23c0faa2412536cc74cda.tar.gz samba-f2d1f19a66ebaf9b88d23c0faa2412536cc74cda.tar.bz2 samba-f2d1f19a66ebaf9b88d23c0faa2412536cc74cda.zip | |
syncing up with HEAD. Seems to be a lot of differences creeping in
(i ignored the new SAMBA stuff, but the rest of this looks like it should
have been merged already).
(This used to be commit 3de09e5cf1f667e410ee8b9516a956860ce7290f)
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 cd8aa4fe55..d0cef52c92 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -522,12 +522,12 @@ int push_utf8_talloc(TALLOC_CTX *ctx, char **dest, const char *src) * * @retval The number of bytes occupied by the string in the destination **/ -int push_utf8_allocate(void **dest, const char *src) +int push_utf8_allocate(char **dest, const char *src) { int src_len = strlen(src)+1; *dest = NULL; - return convert_string_allocate(CH_UNIX, CH_UTF8, src, src_len, dest); + return convert_string_allocate(CH_UNIX, CH_UTF8, src, src_len, (void **)dest); } /**************************************************************************** |