Sync smb_iconv_t type, convert_string return type with Samba 3 equivalents.
[ira/wip.git] / lib / util / charset / charset.h
index 82484b780503dceaa4ce0c40837b9a85fb37cff7..3acdde30ad87f3e45bc05c441dff1b30a93caf80 100644 (file)
@@ -61,6 +61,7 @@ typedef struct smb_iconv_s {
        size_t (*push)(void *cd, const char **inbuf, size_t *inbytesleft,
                       char **outbuf, size_t *outbytesleft);
        void *cd_direct, *cd_pull, *cd_push;
+       char *from_name, *to_name;
 } *smb_iconv_t;
 
 /* string manipulation flags */
@@ -119,7 +120,7 @@ ssize_t convert_string_talloc(TALLOC_CTX *ctx,
                                       void const *src, size_t srclen, 
                                       void **dest, bool allow_badcharcnv);
 
-ssize_t convert_string(charset_t from, charset_t to,
+size_t convert_string(charset_t from, charset_t to,
                                void const *src, size_t srclen, 
                                void *dest, size_t destlen, bool allow_badcharcnv);