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 /source3/lib/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 'source3/lib/charcnv.c')
| -rw-r--r-- | source3/lib/charcnv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index 81cb9a5094..c3b345142f 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -763,7 +763,7 @@ bool convert_string_allocate(TALLOC_CTX *ctx, charset_t from, charset_t to, * converted. */ bool convert_string_talloc(TALLOC_CTX *ctx, charset_t from, charset_t to, - void const *src, size_t srclen, void **dst, + void const *src, size_t srclen, void *dst, size_t *converted_size, bool allow_bad_conv) { void **dest = (void **)dst; |