← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/charset.h

  • Committer: Mark Atwood
  • Date: 2011-07-07 02:23:07 UTC
  • mfrom: (2318.6.116 refactor18)
  • Revision ID: me@mark.atwood.name-20110707022307-4db00nqaaczzc3jv
merge lp:~olafvdspek/drizzle/refactor18

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/charset.h
28
28
#include <drizzled/visibility.h>
29
29
#include <drizzled/definitions.h>
30
30
 
31
 
namespace drizzled
32
 
{
 
31
namespace drizzled {
33
32
 
34
33
#define MY_CS_NAME_SIZE                 32
35
34
#define MY_CS_CTYPE_TABLE_SIZE          257
167
166
/* See strings/charset_info_st.txt for information about this structure  */
168
167
typedef struct my_collation_handler_st
169
168
{
170
 
  bool (*init)(struct charset_info_st *, unsigned char *(*alloc)(size_t));
 
169
  bool (*init)(charset_info_st&, unsigned char *(*alloc)(size_t));
171
170
  /* Collation routines */
172
171
  int     (*strnncoll)(const struct charset_info_st * const,
173
172
                       const unsigned char *, size_t, const unsigned char *, size_t, bool);
205
204
/* See strings/charset_info_st.txt about information on this structure  */
206
205
typedef struct my_charset_handler_st
207
206
{
208
 
  bool (*init)(struct charset_info_st *, unsigned char *(*alloc)(size_t));
 
207
  void (*init_unused)();
209
208
  /* Multibyte routines */
210
209
  uint32_t    (*ismbchar)(const struct charset_info_st * const, const char *, const char *);
211
210
  uint32_t    (*mbcharlen)(const struct charset_info_st * const, uint32_t c);
320
319
extern bool resolve_collation(const char *cl_name,
321
320
                             const charset_info_st *default_cl,
322
321
                             const charset_info_st **cl);
323
 
extern void free_charsets(void);
 
322
extern void free_charsets();
324
323
extern char *get_charsets_dir(char *buf);
325
324
extern bool my_charset_same(const charset_info_st *cs1, const charset_info_st *cs2);
326
 
extern bool init_compiled_charsets(myf flags);
327
 
extern void add_compiled_collation(charset_info_st *cs);
328
325
extern size_t escape_string_for_drizzle(const charset_info_st *charset_info,
329
326
                                        char *to, size_t to_length,
330
327
                                        const char *from, size_t length);
577
574
                  char *dst, size_t dstlen);
578
575
 
579
576
 
580
 
bool my_coll_init_uca(charset_info_st *cs, cs_alloc_func alloc);
581
 
 
582
577
int my_strnncoll_any_uca(const charset_info_st * const cs,
583
578
                         const unsigned char *s, size_t slen,
584
579
                         const unsigned char *t, size_t tlen,