summaryrefslogtreecommitdiff
path: root/lib/util/charset/charset.h
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-03-08 06:57:52 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-03-08 06:57:52 +0100
commitf992416e23c9baf0e20848ff3c12fcafe1d492aa (patch)
tree15248f8319e35e90d74f77f036e725bbf1072833 /lib/util/charset/charset.h
parent5ce523bbed4196fda6716b71ef6080c3c5522838 (diff)
downloadsamba-f992416e23c9baf0e20848ff3c12fcafe1d492aa.tar.gz
samba-f992416e23c9baf0e20848ff3c12fcafe1d492aa.tar.bz2
samba-f992416e23c9baf0e20848ff3c12fcafe1d492aa.zip
Revert accidental reintroduction of void ** bug.
Diffstat (limited to 'lib/util/charset/charset.h')
-rw-r--r--lib/util/charset/charset.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index 655bae7bcd..37c5acafaf 100644
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -136,7 +136,7 @@ ssize_t pull_string(char *dest, const void *src, size_t dest_len, size_t src_len
bool convert_string_talloc(TALLOC_CTX *ctx,
charset_t from, charset_t to,
void const *src, size_t srclen,
- void **dest, size_t *converted_size,
+ void *dest, size_t *converted_size,
bool allow_badcharcnv);
size_t convert_string(charset_t from, charset_t to,
@@ -146,7 +146,7 @@ size_t convert_string(charset_t from, charset_t to,
ssize_t iconv_talloc(TALLOC_CTX *mem_ctx,
smb_iconv_t cd,
void const *src, size_t srclen,
- void **dest);
+ void *dest);
extern struct smb_iconv_convenience *global_iconv_convenience;
@@ -176,7 +176,7 @@ 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, bool allow_badcharcnv);
+ void *dest, size_t *converted_size, bool allow_badcharcnv);
/* iconv */
smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode);
int smb_iconv_close(smb_iconv_t cd);