Fix type-conflict warning when in clang.

ChenPi11 · ChenPi11 · commit 6d1a756f9f33 · 2023-08-29T17:20:57.000+08:00
修改：     ChangeLog
	修改：     lib/cp950ext.h
	修改：     lib/hkscs2001.h
	修改：     lib/hkscs2008.h
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2023-08-29  ChenPi11  <wushengwuxi-msctinoulk@outlook.com>
+
+	Fix type-conflict warning when in clang.
+
 2023-08-27  ChenPi11  <wushengwuxi-msctinoulk@outlook.com>
 
 	Add codepage definitions.
diff --git a/lib/cp950ext.h b/lib/cp950ext.h
@@ -35,7 +35,7 @@ static int
 cp950ext_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, size_t n)
 {
   unsigned char c1 = s[0];
-  if ((c1 == 0xf9)) {
+  if ((c1 == (unsigned char)0xf9)) {
     if (n >= 2) {
       unsigned char c2 = s[1];
       if ((c2 >= 0x40 && c2 < 0x7f) || (c2 >= 0xa1 && c2 < 0xff)) {
diff --git a/lib/hkscs2001.h b/lib/hkscs2001.h
@@ -59,7 +59,7 @@ static int
 hkscs2001_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, size_t n)
 {
   unsigned char c1 = s[0];
-  if ((c1 == 0x8c)) {
+  if ((c1 == (unsigned char)0x8c)) {
     if (n >= 2) {
       unsigned char c2 = s[1];
       if ((c2 >= 0x40 && c2 < 0x7f) || (c2 >= 0xa1 && c2 < 0xff)) {
diff --git a/lib/hkscs2008.h b/lib/hkscs2008.h
@@ -55,7 +55,7 @@ static int
 hkscs2008_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, size_t n)
 {
   unsigned char c1 = s[0];
-  if ((c1 == 0x87)) {
+  if ((c1 == (unsigned char)0x87)) {
     if (n >= 2) {
       unsigned char c2 = s[1];
       if ((c2 >= 0x40 && c2 < 0x7f) || (c2 >= 0xa1 && c2 < 0xff)) {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ static int`
`35`	`35`	`cp950ext_mbtowc (conv_t conv, ucs4_t pwc, const unsigned char s, size_t n)`
`36`	`36`	`{`
`37`	`37`	`unsigned char c1 = s[0];`
`38`		`- if ((c1 == 0xf9)) {`
	`38`	`+ if ((c1 == (unsigned char)0xf9)) {`
`39`	`39`	`if (n >= 2) {`
`40`	`40`	`unsigned char c2 = s[1];`
`41`	`41`	`if ((c2 >= 0x40 && c2 < 0x7f) \|\| (c2 >= 0xa1 && c2 < 0xff)) {`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ static int`
`59`	`59`	`hkscs2001_mbtowc (conv_t conv, ucs4_t pwc, const unsigned char s, size_t n)`
`60`	`60`	`{`
`61`	`61`	`unsigned char c1 = s[0];`
`62`		`- if ((c1 == 0x8c)) {`
	`62`	`+ if ((c1 == (unsigned char)0x8c)) {`
`63`	`63`	`if (n >= 2) {`
`64`	`64`	`unsigned char c2 = s[1];`
`65`	`65`	`if ((c2 >= 0x40 && c2 < 0x7f) \|\| (c2 >= 0xa1 && c2 < 0xff)) {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ static int`
`55`	`55`	`hkscs2008_mbtowc (conv_t conv, ucs4_t pwc, const unsigned char s, size_t n)`
`56`	`56`	`{`
`57`	`57`	`unsigned char c1 = s[0];`
`58`		`- if ((c1 == 0x87)) {`
	`58`	`+ if ((c1 == (unsigned char)0x87)) {`
`59`	`59`	`if (n >= 2) {`
`60`	`60`	`unsigned char c2 = s[1];`
`61`	`61`	`if ((c2 >= 0x40 && c2 < 0x7f) \|\| (c2 >= 0xa1 && c2 < 0xff)) {`