summaryrefslogtreecommitdiff
path: root/lib/util/charset/charset.h
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-11-01 20:56:27 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-11-01 20:56:27 +0100
commitfa7bb8ac533e69c3f66541dedbb3e9708e15fa3e (patch)
treeeddf9983563e0ef54ade41eb60a95a2463eab881 /lib/util/charset/charset.h
parent4b74b22c4d034c8c5c018ea3bca4bb3dc364524e (diff)
downloadsamba-fa7bb8ac533e69c3f66541dedbb3e9708e15fa3e.tar.gz
samba-fa7bb8ac533e69c3f66541dedbb3e9708e15fa3e.tar.bz2
samba-fa7bb8ac533e69c3f66541dedbb3e9708e15fa3e.zip
Remove convert_string_talloc_descriptor, add iconv_talloc().
Diffstat (limited to 'lib/util/charset/charset.h')
-rw-r--r--lib/util/charset/charset.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index cace79f949..b69bef2d61 100644
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -122,6 +122,11 @@ ssize_t convert_string(charset_t from, charset_t to,
void const *src, size_t srclen,
void *dest, size_t destlen);
+ssize_t iconv_talloc(TALLOC_CTX *mem_ctx,
+ smb_iconv_t cd,
+ void const *src, size_t srclen,
+ void **dest);
+
extern struct smb_iconv_convenience *global_iconv_convenience;
codepoint_t next_codepoint(const char *str, size_t *size);
@@ -145,7 +150,6 @@ ssize_t convert_string_convenience(struct smb_iconv_convenience *ic,
charset_t from, charset_t to,
void const *src, size_t srclen,
void *dest, size_t destlen);
-ssize_t convert_string_talloc_descriptor(TALLOC_CTX *ctx, smb_iconv_t descriptor, void const *src, size_t srclen, void **dest);
ssize_t convert_string_talloc_convenience(TALLOC_CTX *ctx,
struct smb_iconv_convenience *ic,
charset_t from, charset_t to,