summaryrefslogtreecommitdiff
path: root/lib/util/charset/charcnv.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-03-25 08:37:00 +1100
committerAndrew Tridgell <tridge@samba.org>2011-03-25 04:37:06 +0100
commitb5616adc8adbcee61bb670378f9c066225d9dcf3 (patch)
tree29cf788ade306c9ec3eb95493a6db71a7936f898 /lib/util/charset/charcnv.c
parent7824111d07ae12b34e03da1e72884d421a9f9f33 (diff)
downloadsamba-b5616adc8adbcee61bb670378f9c066225d9dcf3.tar.gz
samba-b5616adc8adbcee61bb670378f9c066225d9dcf3.tar.bz2
samba-b5616adc8adbcee61bb670378f9c066225d9dcf3.zip
lib/util/charset rename iconv_convenience to iconv_handle
This better reflects what this structure is Andrew Bartlett
Diffstat (limited to 'lib/util/charset/charcnv.c')
-rw-r--r--lib/util/charset/charcnv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c
index 88f464c2c2..887cc9d989 100644
--- a/lib/util/charset/charcnv.c
+++ b/lib/util/charset/charcnv.c
@@ -124,7 +124,7 @@ convert:
* @returns the number of bytes occupied in the destination
* on error, returns -1, and sets errno
**/
-_PUBLIC_ ssize_t convert_string_error(struct smb_iconv_convenience *ic,
+_PUBLIC_ ssize_t convert_string_error(struct smb_iconv_handle *ic,
charset_t from, charset_t to,
void const *src, size_t srclen,
void *dest, size_t destlen, size_t *converted_size)
@@ -167,7 +167,7 @@ _PUBLIC_ ssize_t convert_string_error(struct smb_iconv_convenience *ic,
* @param destlen maximal length allowed for string
* @returns the number of bytes occupied in the destination
**/
-_PUBLIC_ bool convert_string_convenience(struct smb_iconv_convenience *ic,
+_PUBLIC_ bool convert_string_handle(struct smb_iconv_handle *ic,
charset_t from, charset_t to,
void const *src, size_t srclen,
void *dest, size_t destlen, size_t *converted_size)
@@ -214,8 +214,8 @@ _PUBLIC_ bool convert_string_convenience(struct smb_iconv_convenience *ic,
* @returns Size in bytes of the converted string; or -1 in case of error.
**/
-_PUBLIC_ bool convert_string_talloc_convenience(TALLOC_CTX *ctx,
- struct smb_iconv_convenience *ic,
+_PUBLIC_ bool convert_string_talloc_handle(TALLOC_CTX *ctx,
+ struct smb_iconv_handle *ic,
charset_t from, charset_t to,
void const *src, size_t srclen,
void *dst, size_t *converted_size)