diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-08 06:57:52 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-08 06:57:52 +0100 |
| commit | f992416e23c9baf0e20848ff3c12fcafe1d492aa (patch) | |
| tree | 15248f8319e35e90d74f77f036e725bbf1072833 /source3 | |
| parent | 5ce523bbed4196fda6716b71ef6080c3c5522838 (diff) | |
| download | samba-f992416e23c9baf0e20848ff3c12fcafe1d492aa.tar.gz samba-f992416e23c9baf0e20848ff3c12fcafe1d492aa.tar.bz2 samba-f992416e23c9baf0e20848ff3c12fcafe1d492aa.zip | |
Revert accidental reintroduction of void ** bug.
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/lib/charcnv.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index ffdef43d19..95806d2d9d 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -347,9 +347,6 @@ size_t convert_string(charset_t from, charset_t to, bool convert_string_allocate(TALLOC_CTX *ctx, charset_t from, charset_t to, void const *src, size_t srclen, void *dst, size_t *converted_size, bool allow_bad_conv); -bool convert_string_talloc(TALLOC_CTX *ctx, charset_t from, charset_t to, - void const *src, size_t srclen, void **dst, - size_t *converted_size, bool allow_bad_conv); size_t unix_strupper(const char *src, size_t srclen, char *dest, size_t destlen); char *strdup_upper(const char *s); char *talloc_strdup_upper(TALLOC_CTX *ctx, const char *s); 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; |