Merge tag 'ldb-1.1.24' into master

[vlendec/samba-autobuild/.git] / lib / util / charset / charset.h

diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index 2040e2a87cc672bf82d7195aa60e420326344de5..ca7a4377455bd846a978c4135f1266371640bec1 100644 (file)
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -59,7 +59,7 @@ struct charset_functions {
                                   char **outbuf, size_t *outbytesleft);
        size_t (*push)(void *, const char **inbuf, size_t *inbytesleft,
                                   char **outbuf, size_t *outbytesleft);
-       struct charset_functions *prev, *next;
+       bool samba_internal_charset;
 };
 
 /* this type is used for manipulating unicode codepoints */
@@ -105,9 +105,12 @@ size_t strlen_m_ext_handle(struct smb_iconv_handle *ic,
 size_t strlen_m_ext(const char *s, charset_t src_charset, charset_t dst_charset);
 size_t strlen_m_ext_term(const char *s, charset_t src_charset,
                         charset_t dst_charset);
+size_t strlen_m_ext_term_null(const char *s,
+                             charset_t src_charset,
+                             charset_t dst_charset);
+size_t strlen_m(const char *s);
 size_t strlen_m_term(const char *s);
 size_t strlen_m_term_null(const char *s);
-size_t strlen_m(const char *s);
 char *alpha_strcpy(char *dest, const char *src, const char *other_safe_chars, size_t maxlength);
 void string_replace_m(char *s, char oldc, char newc);
 bool strcsequal(const char *s1,const char *s2);
@@ -161,30 +164,26 @@ bool convert_string_error(charset_t from, charset_t to,
                          void *dest, size_t destlen,
                          size_t *converted_size);
 
-ssize_t iconv_talloc(TALLOC_CTX *mem_ctx, 
-                                      smb_iconv_t cd,
-                                      void const *src, size_t srclen, 
-                                      void *dest);
-
 extern struct smb_iconv_handle *global_iconv_handle;
 struct smb_iconv_handle *get_iconv_handle(void);
 struct smb_iconv_handle *get_iconv_testing_handle(TALLOC_CTX *mem_ctx, 
                                                  const char *dos_charset, 
                                                  const char *unix_charset,
-                                                 bool native_iconv);
+                                                 bool use_builtin_handlers);
 smb_iconv_t get_conv_handle(struct smb_iconv_handle *ic,
                            charset_t from, charset_t to);
 const char *charset_name(struct smb_iconv_handle *ic, charset_t ch);
 
-codepoint_t next_codepoint_ext(const char *str, charset_t src_charset,
-                              size_t *size);
+codepoint_t next_codepoint_ext(const char *str, size_t len,
+                              charset_t src_charset, size_t *size);
 codepoint_t next_codepoint(const char *str, size_t *size);
 ssize_t push_codepoint(char *str, codepoint_t c);
 
 /* codepoints */
 codepoint_t next_codepoint_handle_ext(struct smb_iconv_handle *ic,
-                           const char *str, charset_t src_charset,
-                           size_t *size);
+                                     const char *str, size_t len,
+                                     charset_t src_charset,
+                                     size_t *size);
 codepoint_t next_codepoint_handle(struct smb_iconv_handle *ic,
                            const char *str, size_t *size);
 ssize_t push_codepoint_handle(struct smb_iconv_handle *ic,
@@ -200,7 +199,7 @@ int codepoint_cmpi(codepoint_t c1, codepoint_t c2);
 struct smb_iconv_handle *smb_iconv_handle_reinit(TALLOC_CTX *mem_ctx,
                                                           const char *dos_charset,
                                                           const char *unix_charset,
-                                                          bool native_iconv,
+                                                          bool use_builtin_handlers,
                                                           struct smb_iconv_handle *old_ic);
 
 bool convert_string_handle(struct smb_iconv_handle *ic,
@@ -225,11 +224,9 @@ size_t smb_iconv(smb_iconv_t cd,
                 const char **inbuf, size_t *inbytesleft,
                 char **outbuf, size_t *outbytesleft);
 smb_iconv_t smb_iconv_open_ex(TALLOC_CTX *mem_ctx, const char *tocode, 
-                             const char *fromcode, bool native_iconv);
+                             const char *fromcode, bool use_builtin_handlers);
 
-void load_case_tables(void);
-void load_case_tables_library(void);
-bool smb_register_charset(const struct charset_functions *funcs_in);
+void smb_init_locale(void);
 
 /* The following definitions come from util_unistr_w.c  */
 
@@ -242,7 +239,6 @@ smb_ucs2_t *strnrchr_w(const smb_ucs2_t *s, smb_ucs2_t c, unsigned int n);
 smb_ucs2_t *strstr_w(const smb_ucs2_t *s, const smb_ucs2_t *ins);
 bool strlower_w(smb_ucs2_t *s);
 bool strupper_w(smb_ucs2_t *s);
-int strcmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b);
 int strcasecmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b);
 int strncasecmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b, size_t len);
 int strcmp_wa(const smb_ucs2_t *a, const char *b);