diff options
Diffstat (limited to 'strings')
-rw-r--r-- | strings/ctype-big5.c | 4 | ||||
-rw-r--r-- | strings/ctype-gbk.c | 4 | ||||
-rw-r--r-- | strings/ctype-sjis.c | 6 | ||||
-rw-r--r-- | strings/ctype-tis620.c | 4 | ||||
-rw-r--r-- | strings/ctype.c | 4 | ||||
-rw-r--r-- | strings/strnlen.c | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index 1fb98273fec..cccf6730046 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -236,7 +236,7 @@ int my_strnncoll_big5(const uchar * s1, int len1, const uchar * s2, int len2) return (int) (len1-len2); } -int my_strnxfrm_big5(uchar * dest, uchar * src, int len, int srclen) +int my_strnxfrm_big5(uchar * dest, const uchar * src, int len, int srclen) { uint16 e; /*uchar *d = dest; XXX: unused*/ @@ -276,7 +276,7 @@ int my_strcoll_big5(const uchar * s1, const uchar * s2) return 0; } -int my_strxfrm_big5(uchar * dest, uchar * src, int len) +int my_strxfrm_big5(uchar * dest, const uchar * src, int len) { uint16 e; uchar *d = dest; diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c index 9628f21b8d4..a5d55789bb8 100644 --- a/strings/ctype-gbk.c +++ b/strings/ctype-gbk.c @@ -2610,7 +2610,7 @@ int my_strcoll_gbk(const uchar * s1, const uchar * s2) s2, (uint) strlen((char*) s2)); } -int my_strnxfrm_gbk(uchar * dest, uchar * src, int len, int srclen) +int my_strnxfrm_gbk(uchar * dest, const uchar * src, int len, int srclen) { uint16 e; @@ -2630,7 +2630,7 @@ int my_strnxfrm_gbk(uchar * dest, uchar * src, int len, int srclen) return srclen; } -int my_strxfrm_gbk(uchar * dest, uchar * src, int len) +int my_strxfrm_gbk(uchar * dest, const uchar * src, int len) { return my_strnxfrm_gbk(dest,src,len,(uint) strlen((char*) src)); } diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index 9a5a91f9265..566271be845 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -228,10 +228,10 @@ int my_strcoll_sjis(const uchar *s1, const uchar *s2) s2,(uint) strlen((char*) s2)); } -int my_strnxfrm_sjis(uchar *dest, uchar *src, int len, int srclen) +int my_strnxfrm_sjis(uchar *dest, const uchar *src, int len, int srclen) { uchar *d_end = dest + len; - uchar *s_end = src + srclen; + uchar *s_end = (uchar*) src + srclen; while (dest < d_end && src < s_end) { if (ismbchar_sjis((char*) src, (char*) s_end)) { *dest++ = *src++; @@ -244,7 +244,7 @@ int my_strnxfrm_sjis(uchar *dest, uchar *src, int len, int srclen) return srclen; } -int my_strxfrm_sjis(uchar *dest, uchar *src, int len) +int my_strxfrm_sjis(uchar *dest, const uchar *src, int len) { return my_strnxfrm_sjis(dest, src, len, (uint) strlen((char*) src)); } diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c index 321487c85cb..1c0acc38e24 100644 --- a/strings/ctype-tis620.c +++ b/strings/ctype-tis620.c @@ -535,7 +535,7 @@ int my_strnncoll_tis620(const uchar * s1, int len1, const uchar * s2, int len2) Arg: Destination buffer, source string, dest length and source length Ret: Conveted string size */ -int my_strnxfrm_tis620(uchar * dest, uchar * src, int len, int srclen) +int my_strnxfrm_tis620(uchar * dest, const uchar * src, int len, int srclen) { uint bufSize; uchar *tmp; @@ -567,7 +567,7 @@ int my_strcoll_tis620(const uchar * s1, const uchar * s2) Arg: Destination buffer, String and dest buffer size Ret: Converting string size */ -int my_strxfrm_tis620(uchar * dest, uchar * src, int len) +int my_strxfrm_tis620(uchar * dest, const uchar * src, int len) { uint bufSize; uchar *tmp; diff --git a/strings/ctype.c b/strings/ctype.c index 16b652d42f1..d6f02ec5054 100644 --- a/strings/ctype.c +++ b/strings/ctype.c @@ -47,7 +47,7 @@ CHARSET_INFO *find_compiled_charset_by_name(const char *name) return NULL; } -uint8 compiled_charset_number(const char *name) +uint compiled_charset_number(const char *name) { CHARSET_INFO *cs; for (cs = compiled_charsets; cs->number > 0; cs++) @@ -57,7 +57,7 @@ uint8 compiled_charset_number(const char *name) return 0; /* this mimics find_type() */ } -const char *compiled_charset_name(uint8 charset_number) +const char *compiled_charset_name(uint charset_number) { CHARSET_INFO *cs; for (cs = compiled_charsets; cs->number > 0; cs++) diff --git a/strings/strnlen.c b/strings/strnlen.c index 6eb872ee08d..3d625f7d48a 100644 --- a/strings/strnlen.c +++ b/strings/strnlen.c @@ -29,7 +29,7 @@ uint strnlen(register const char *s, register uint maxlen) { - const char *end= memchr(s, '\0', maxlen); + const char *end= (const char *)memchr(s, '\0', maxlen); return end ? (uint) (end - s) : maxlen; } |