From 37d885c51a559d2be7dd15f46a80027e4f1dffef Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 24 Oct 2008 14:26:46 +0200 Subject: Remove iconv_convenience argument from convert_string{,talloc}() but make them wrappers around convert_string{,talloc}_convenience(). --- lib/util/charset/charcnv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/util/charset/charcnv.c') diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c index 91a16a1cda..d63a9ce194 100644 --- a/lib/util/charset/charcnv.c +++ b/lib/util/charset/charcnv.c @@ -164,7 +164,7 @@ static smb_iconv_t get_conv_handle(struct smb_iconv_convenience *ic, * @param destlen maximal length allowed for string * @returns the number of bytes occupied in the destination **/ -_PUBLIC_ ssize_t convert_string(struct smb_iconv_convenience *ic, +_PUBLIC_ 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) @@ -286,7 +286,7 @@ convert: * @returns Size in bytes of the converted string; or -1 in case of error. **/ -_PUBLIC_ ssize_t convert_string_talloc(TALLOC_CTX *ctx, +_PUBLIC_ ssize_t convert_string_talloc_convenience(TALLOC_CTX *ctx, struct smb_iconv_convenience *ic, charset_t from, charset_t to, void const *src, size_t srclen, -- cgit