diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-10-04 12:10:15 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-10-04 12:10:15 +0500 |
| commit | 249927cde6b4cdc7d203ce601eb8e1e01cd3f9e0 (patch) | |
| tree | 3d70120ca292f1277553aaf9a66d341c3fb9c823 /strings | |
| parent | 3b148edb34fd5ec982089bd3cf26c362742955ba (diff) | |
| parent | 6dc4dfb363ef20f5850a0459d11a8b6ed4777040 (diff) | |
| download | mariadb-git-249927cde6b4cdc7d203ce601eb8e1e01cd3f9e0.tar.gz | |
Merge mysql.com:/home/ram/work/b31070/b31070.5.0
into mysql.com:/home/ram/work/b31070/b31070.5.1
strings/ctype-big5.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-big5.c | 4 | ||||
| -rw-r--r-- | strings/ctype-euc_kr.c | 4 | ||||
| -rw-r--r-- | strings/ctype-gb2312.c | 4 | ||||
| -rw-r--r-- | strings/ctype-sjis.c | 4 |
4 files changed, 7 insertions, 9 deletions
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index 7bb811a3064..ecfd3d648e0 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -6272,12 +6272,12 @@ my_mb_wc_big5(CHARSET_INFO *cs __attribute__((unused)), my_wc_t *pwc,const uchar *s,const uchar *e) { - int hi=s[0]; + int hi; if (s >= e) return MY_CS_TOOSMALL; - if (hi<0x80) + if ((hi= s[0]) < 0x80) { pwc[0]=hi; return 1; diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c index 844d8cc3ff5..fd783015bf4 100644 --- a/strings/ctype-euc_kr.c +++ b/strings/ctype-euc_kr.c @@ -8614,12 +8614,12 @@ my_mb_wc_euc_kr(CHARSET_INFO *cs __attribute__((unused)), my_wc_t *pwc, const uchar *s, const uchar *e) { - int hi=s[0]; + int hi; if (s >= e) return MY_CS_TOOSMALL; - if (hi<0x80) + if ((hi= s[0]) < 0x80) { pwc[0]=hi; return 1; diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c index 21aeb8b7990..4b3518ce3d2 100644 --- a/strings/ctype-gb2312.c +++ b/strings/ctype-gb2312.c @@ -5664,12 +5664,10 @@ my_mb_wc_gb2312(CHARSET_INFO *cs __attribute__((unused)), my_wc_t *pwc, const uchar *s, const uchar *e){ int hi; - hi=(int) s[0]; - if (s >= e) return MY_CS_TOOSMALL; - if (hi<0x80) + if ((hi= s[0]) < 0x80) { pwc[0]=hi; return 1; diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index ace457af63c..3925b76869c 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -4527,12 +4527,12 @@ mb: static int my_mb_wc_sjis(CHARSET_INFO *cs __attribute__((unused)), my_wc_t *pwc, const uchar *s, const uchar *e){ - int hi=s[0]; + int hi; if (s >= e) return MY_CS_TOOSMALL; - if (hi < 0x80) + if ((hi= s[0]) < 0x80) { pwc[0]=hi; return 1; |