charcnv: ensure convert_string_error doesn't conflict with s3 function

use _handle for handle based functions

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Fri Mar 25 05:22:24 CET 2011 on sn-devel-104

diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c
index 887cc9d989de929e8fe2f307a2b0addab9c8d2d6..3b7dbb30748224a1a907eb23f3359db9bbc38165 100644 (file)
--- a/lib/util/charset/charcnv.c
+++ b/lib/util/charset/charcnv.c
@@ -124,10 +124,10 @@ 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_handle *ic,
-                                     charset_t from, charset_t to,
-                                     void const *src, size_t srclen,
-                                     void *dest, size_t destlen, size_t *converted_size)
+_PUBLIC_ ssize_t convert_string_error_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)
 {
        size_t i_len, o_len;
        ssize_t retval;
@@ -174,7 +174,7 @@ _PUBLIC_ bool convert_string_handle(struct smb_iconv_handle *ic,
 {
        ssize_t retval;
 
-       retval = convert_string_error(ic, from, to, src, srclen, dest, destlen, converted_size);
+       retval = convert_string_error_handle(ic, from, to, src, srclen, dest, destlen, converted_size);
        if(retval==(size_t)-1) {
                const char *reason;
                switch(errno) {