lib/util/charset use convert_string.c in common

[kai/samba.git] / lib / util / charset / util_unistr.c

diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c
index a1be501c7ced21b3328b22ad0334d55c3f04f5c5..895d958deb8f5a5db821b56a7235242fb0584724 100644 (file)
--- a/lib/util/charset/util_unistr.c
+++ b/lib/util/charset/util_unistr.c
@@ -585,68 +585,3 @@ _PUBLIC_ ssize_t pull_string(char *dest, const void *src, size_t dest_len, size_
                return -1;
        }
 }
-
-
-/**
- * Convert string from one encoding to another, making error checking etc
- *
- * @param src pointer to source string (multibyte or singlebyte)
- * @param srclen length of the source string in bytes
- * @param dest pointer to destination string (multibyte or singlebyte)
- * @param destlen maximal length allowed for string
- * @param converted_size the number of bytes occupied in the destination
- *
- * @returns true on success, false on fail.
- **/
-_PUBLIC_ bool convert_string(charset_t from, charset_t to,
-                              void const *src, size_t srclen, 
-                              void *dest, size_t destlen,
-                              size_t *converted_size)
-{
-       return convert_string_handle(get_iconv_handle(), from, to,
-                                       src, srclen,
-                                       dest, destlen, converted_size);
-}
-
-/**
- * Convert string from one encoding to another, making error checking etc
- *
- * @param src pointer to source string (multibyte or singlebyte)
- * @param srclen length of the source string in bytes
- * @param dest pointer to destination string (multibyte or singlebyte)
- * @param destlen maximal length allowed for string
- * @param converted_size the number of bytes occupied in the destination
- *
- * @returns true on success, false on fail.
- **/
-_PUBLIC_ bool convert_string_error(charset_t from, charset_t to,
-                                  void const *src, size_t srclen,
-                                  void *dest, size_t destlen,
-                                  size_t *converted_size)
-{
-       return convert_string_error_handle(get_iconv_handle(), from, to,
-                                          src, srclen,
-                                          dest, destlen, converted_size);
-}
-
-/**
- * Convert between character sets, allocating a new buffer using talloc for the result.
- *
- * @param srclen length of source buffer.
- * @param dest always set at least to NULL
- * @param converted_size Size in bytes of the converted string
- * @note -1 is not accepted for srclen.
- *
- * @returns boolean indication whether the conversion succeeded
- **/
-
-_PUBLIC_ 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)
-{
-       return convert_string_talloc_handle(ctx, get_iconv_handle(),
-                                                from, to, src, srclen, dest,
-                                                converted_size);
-}
-