diff options
author | Sergei Golubchik <serg@mariadb.org> | 2014-11-19 09:13:38 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2014-12-04 10:41:51 +0100 |
commit | 2ae7541bcf93985302bc7efb2629e6f623ccfc64 (patch) | |
tree | d0b14c1dba4bffc2ae82f2d51f1f9ef4ebf7035a /strings | |
parent | 0d30423900dd3a384f061c32f6ec3de9c11cdde9 (diff) | |
download | mariadb-git-2ae7541bcf93985302bc7efb2629e6f623ccfc64.tar.gz |
cleanup: s/const CHARSET_INFO/CHARSET_INFO/
as CHARSET_INFO is already const, using const on it
is redundant and results in compiler warnings (on Windows)
Diffstat (limited to 'strings')
-rw-r--r-- | strings/ctype-cp932.c | 2 | ||||
-rw-r--r-- | strings/ctype-mb.c | 2 | ||||
-rw-r--r-- | strings/ctype-sjis.c | 2 | ||||
-rw-r--r-- | strings/ctype-tis620.c | 2 | ||||
-rw-r--r-- | strings/ctype-uca.c | 2 | ||||
-rw-r--r-- | strings/ctype-ucs2.c | 6 |
6 files changed, 8 insertions, 8 deletions
diff --git a/strings/ctype-cp932.c b/strings/ctype-cp932.c index b3d08c5a54c..86f450718d7 100644 --- a/strings/ctype-cp932.c +++ b/strings/ctype-cp932.c @@ -1709,7 +1709,7 @@ MY_UNICASE_INFO my_caseinfo_cp932= my_caseinfo_pages_cp932 }; -static int my_strnncoll_cp932_internal(const CHARSET_INFO *cs, +static int my_strnncoll_cp932_internal(CHARSET_INFO *cs, const uchar **a_res, size_t a_length, const uchar **b_res, size_t b_length) { diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c index 02a9a91ca6a..cc0513dbc90 100644 --- a/strings/ctype-mb.c +++ b/strings/ctype-mb.c @@ -63,7 +63,7 @@ size_t my_casedn_str_mb(CHARSET_INFO * cs, char *str) static inline MY_UNICASE_CHARACTER* -get_case_info_for_ch(const CHARSET_INFO *cs, uint page, uint offs) +get_case_info_for_ch(CHARSET_INFO *cs, uint page, uint offs) { MY_UNICASE_CHARACTER *p; return cs->caseinfo && (p= cs->caseinfo->page[page]) ? &p[offs] : NULL; diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index dce9e5ad37f..c6e55879102 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -1079,7 +1079,7 @@ static MY_UNICASE_INFO my_caseinfo_sjis= }; -static int my_strnncoll_sjis_internal(const CHARSET_INFO *cs, +static int my_strnncoll_sjis_internal(CHARSET_INFO *cs, const uchar **a_res, size_t a_length, const uchar **b_res, size_t b_length) { diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c index c2ed01a0603..61477f177c1 100644 --- a/strings/ctype-tis620.c +++ b/strings/ctype-tis620.c @@ -618,7 +618,7 @@ ret: */ static size_t -my_strnxfrm_tis620(const CHARSET_INFO *cs, +my_strnxfrm_tis620(CHARSET_INFO *cs, uchar *dst, size_t dstlen, uint nweights, const uchar *src, size_t srclen, uint flags) { diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index 60de0a106a1..b3a7c6afde9 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -20714,7 +20714,7 @@ static int my_strnncoll_uca(CHARSET_INFO *cs, static inline int -my_space_weight(const CHARSET_INFO *cs) /* W3-TODO */ +my_space_weight(CHARSET_INFO *cs) /* W3-TODO */ { return cs->uca->level[0].weights[0][0x20 * cs->uca->level[0].lengths[0]]; } diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index 593f9a12950..a560eb08bae 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -1753,7 +1753,7 @@ struct charset_info_st my_charset_utf16_bin= static int -my_utf16le_uni(const CHARSET_INFO *cs __attribute__((unused)), +my_utf16le_uni(CHARSET_INFO *cs __attribute__((unused)), my_wc_t *pwc, const uchar *s, const uchar *e) { my_wc_t lo; @@ -1783,7 +1783,7 @@ my_utf16le_uni(const CHARSET_INFO *cs __attribute__((unused)), static int -my_uni_utf16le(const CHARSET_INFO *cs __attribute__((unused)), +my_uni_utf16le(CHARSET_INFO *cs __attribute__((unused)), my_wc_t wc, uchar *s, uchar *e) { uint32 first, second, total; @@ -1813,7 +1813,7 @@ my_uni_utf16le(const CHARSET_INFO *cs __attribute__((unused)), static size_t -my_lengthsp_utf16le(const CHARSET_INFO *cs __attribute__((unused)), +my_lengthsp_utf16le(CHARSET_INFO *cs __attribute__((unused)), const char *ptr, size_t length) { const char *end= ptr + length; |