diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-03-10 10:59:14 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-03-10 10:59:14 +1100 |
| commit | c218d3e1173355acf025471a10b4b6425b9c086b (patch) | |
| tree | 3e5be3c411ebe2575914f7866c91bad81f711154 /lib/util/charset/charcnv.c | |
| parent | 6ac77d19b5a25a53459a58e4828fa9eac0bf11f4 (diff) | |
| parent | 218ce0e80532b0dbc595e72502d9596a35acdffd (diff) | |
| download | samba-c218d3e1173355acf025471a10b4b6425b9c086b.tar.gz samba-c218d3e1173355acf025471a10b4b6425b9c086b.tar.bz2 samba-c218d3e1173355acf025471a10b4b6425b9c086b.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
Diffstat (limited to 'lib/util/charset/charcnv.c')
| -rw-r--r-- | lib/util/charset/charcnv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c index 258730ec82..94d47a9f7f 100644 --- a/lib/util/charset/charcnv.c +++ b/lib/util/charset/charcnv.c @@ -169,9 +169,10 @@ static smb_iconv_t get_conv_handle(struct smb_iconv_convenience *ic, _PUBLIC_ ssize_t iconv_talloc(TALLOC_CTX *ctx, smb_iconv_t cd, void const *src, size_t srclen, - void **dest) + void *dst) { size_t i_len, o_len, destlen; + void **dest = (void **)dst; size_t retval; const char *inbuf = (const char *)src; char *outbuf, *ob; @@ -314,9 +315,10 @@ _PUBLIC_ bool convert_string_talloc_convenience(TALLOC_CTX *ctx, struct smb_iconv_convenience *ic, charset_t from, charset_t to, void const *src, size_t srclen, - void **dest, size_t *converted_size, + void *dst, size_t *converted_size, bool allow_badcharcnv) { + void **dest = (void **)dst; smb_iconv_t descriptor; ssize_t ret; |