Changeset 745 for trunk/server/lib/util/charset/charset.h

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/util/charset/charset.h (modified) (5 diffs)

trunk/server/lib/util/charset/charset.h

@@ -40 +40 @@
 typedef uint16_t smb_ucs2_t;
 
+#ifdef WORDS_BIGENDIAN
+#define UCS2_SHIFT 8
+#else
+#define UCS2_SHIFT 0
+#endif
+
+/* turn a 7 bit character into a ucs2 character */
+#define UCS2_CHAR(c) ((c) << UCS2_SHIFT)
+
+/* return an ascii version of a ucs2 character */
+#define UCS2_TO_CHAR(c) (((c) >> UCS2_SHIFT) & 0xff)
+
+/* Copy into a smb_ucs2_t from a possibly unaligned buffer. Return the copied smb_ucs2_t */
+#define COPY_UCS2_CHAR(dest,src) (((unsigned char *)(dest))[0] = ((unsigned char *)(src))[0],\
+                                ((unsigned char *)(dest))[1] = ((unsigned char *)(src))[1], (dest))
+
+
+
 /*
  *   for each charset we have a function that pulls from that charset to
@@ -103 +121 @@
 
 char *strchr_m(const char *s, char c);
+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_term(const char *s);
 size_t strlen_m_term_null(const char *s);
@@ -150 +171 @@
 
 extern struct smb_iconv_convenience *global_iconv_convenience;
-
+struct smb_iconv_convenience *get_iconv_convenience(void);
+smb_iconv_t get_conv_handle(struct smb_iconv_convenience *ic,
+                            charset_t from, charset_t to);
+const char *charset_name(struct smb_iconv_convenience *ic, charset_t ch);
+
+codepoint_t next_codepoint_ext(const char *str, 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_convenience_ext(struct smb_iconv_convenience *ic,
+                            const char *str, charset_t src_charset,
+                            size_t *size);
 codepoint_t next_codepoint_convenience(struct smb_iconv_convenience *ic, 
                             const char *str, size_t *size);
 ssize_t push_codepoint_convenience(struct smb_iconv_convenience *ic, 
                                 char *str, codepoint_t c);
+
 codepoint_t toupper_m(codepoint_t val);
 codepoint_t tolower_m(codepoint_t val);
+bool islower_m(codepoint_t val);
+bool isupper_m(codepoint_t val);
 int codepoint_cmpi(codepoint_t c1, codepoint_t c2);
 
 /* Iconv convenience functions */
-struct smb_iconv_convenience *smb_iconv_convenience_init(TALLOC_CTX *mem_ctx,
-                                                         const char *dos_charset,
-                                                         const char *unix_charset,
-                                                         bool native_iconv);
+struct smb_iconv_convenience *smb_iconv_convenience_reinit(TALLOC_CTX *mem_ctx,
+                                                           const char *dos_charset,
+                                                           const char *unix_charset,
+                                                           const char *display_charset,
+                                                           bool native_iconv,
+                                                           struct smb_iconv_convenience *old_ic);
 
 bool convert_string_convenience(struct smb_iconv_convenience *ic,
@@ -189 +224 @@
 
 void load_case_tables(void);
-bool charset_register_backend(const void *_funcs);
+void load_case_tables_library(void);
+bool smb_register_charset(const struct charset_functions *funcs_in);
 
 /*
@@ -264 +300 @@
 NTSTATUS charset_ ## CHARSETNAME ## _init(void)                                                 \
 {                                                                                               \
-        return smb_register_charset(& CHARSETNAME ## _functions);                               \
-}                                                                                               \
+        if (!smb_register_charset(& CHARSETNAME ## _functions)) {       \
+                return NT_STATUS_INTERNAL_ERROR;                        \
+        }                                                               \
+        return NT_STATUS_OK; \
+}                                               \