diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-03-23 12:37:19 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-03-23 12:37:19 +0400 |
| commit | 1170d23ca38fb85778ba7acfcdc83ef046fbe3f3 (patch) | |
| tree | 540c75f8ab659fdaa8d20227a640c25a764b733c | |
| parent | aa77bc5c625a8c0386e2e7356d1682379c189ed4 (diff) | |
| download | mariadb-git-1170d23ca38fb85778ba7acfcdc83ef046fbe3f3.tar.gz | |
Fixing compilation warnings introduced in:
> commit e09299511e83f11f7476f7ea6c81ee12b00d7050
> Author: Alexander Barkov <bar@mariadb.org>
> Date: Wed Mar 16 10:55:12 2016 +0400
>
> MDEV-9665 Remove cs->cset->ismbchar()
> Using a more powerfull cs->cset->charlen() instead.
| -rw-r--r-- | strings/ctype-big5.c | 2 | ||||
| -rw-r--r-- | strings/ctype-gbk.c | 2 | ||||
| -rw-r--r-- | strings/ctype-mb.c | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index 3351fb6ef2f..327b808309f 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -862,7 +862,7 @@ my_strnxfrm_big5(CHARSET_INFO *cs, for (; dst < de && src < se && nweights; nweights--) { - if (my_charlen(cs, src, se) > 1) + if (my_charlen(cs, (const char *) src, (const char *) se) > 1) { /* Note, it is safe not to check (src < se) diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c index b617a759718..88c09763513 100644 --- a/strings/ctype-gbk.c +++ b/strings/ctype-gbk.c @@ -3463,7 +3463,7 @@ my_strnxfrm_gbk(CHARSET_INFO *cs, for (; dst < de && src < se && nweights; nweights--) { - if (my_charlen(cs, src, se) > 1) + if (my_charlen(cs, (const char *) src, (const char *) se) > 1) { /* Note, it is safe not to check (src < se) diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c index ad2b7d0d36f..9049596c7a4 100644 --- a/strings/ctype-mb.c +++ b/strings/ctype-mb.c @@ -668,7 +668,7 @@ my_strnncollsp_mb_bin(CHARSET_INFO * cs __attribute__((unused)), */ #define my_strnxfrm_mb_non_ascii_char(cs, dst, src, se) \ { \ - switch (my_ismbchar(cs, src, se)) { \ + switch (my_ismbchar(cs, (const char *) src, (const char *) se)) { \ case 4: \ *dst++= *src++; \ /* fall through */ \ @@ -740,7 +740,8 @@ my_strnxfrm_mb(CHARSET_INFO *cs, for (; src < se && nweights && dst < de; nweights--) { int chlen; - if (*src < 128 || !(chlen= my_ismbchar(cs, src, se))) + if (*src < 128 || !(chlen= my_ismbchar(cs, (const char *) src, + (const char *) se))) { /* Single byte character */ *dst++= sort_order ? sort_order[*src++] : *src++; |