Fix MSVC6 warnings. (spotted by Tim Peters)

diff --git a/Modules/cjkcodecs/_big5.c b/Modules/cjkcodecs/_big5.c
index 8f9a290ac09ae6773c099f866f5d37fe39079f44..2ba0bc5886f8912ec10ecd69f47e5ea643e9e5bf 100644 (file)
--- a/Modules/cjkcodecs/_big5.c
+++ b/Modules/cjkcodecs/_big5.c
@@ -18,7 +18,7 @@ ENCODER(big5)
 
         if (c < 0x80) {
             RESERVE_OUTBUF(1)
-            **outbuf = c;
+            **outbuf = (unsigned char)c;
             NEXT(1, 1)
             continue;
         }

diff --git a/Modules/cjkcodecs/_cp932.c b/Modules/cjkcodecs/_cp932.c
index 0f21b125d4ed1967db8a8df5dd2582b8fa5b8224..870c1c6f37613c7d739d8a8e531567012fa5c825 100644 (file)
--- a/Modules/cjkcodecs/_cp932.c
+++ b/Modules/cjkcodecs/_cp932.c
@@ -20,7 +20,7 @@ ENCODER(cp932)
         unsigned char    c1, c2;
 
         if (c <= 0x80) {
-            WRITE1(c)
+            WRITE1((unsigned char)c)
             NEXT(1, 1)
             continue;
         } else if (c >= 0xff61 && c <= 0xff9f) {

diff --git a/Modules/cjkcodecs/_cp949.c b/Modules/cjkcodecs/_cp949.c
index f2fa38c61c3347b6279c2e5385f7ae2c244c1ecf..17f51c5c2538a56bf75f9cd944b7414685807bf4 100644 (file)
--- a/Modules/cjkcodecs/_cp949.c
+++ b/Modules/cjkcodecs/_cp949.c
@@ -18,7 +18,7 @@ ENCODER(cp949)
         DBCHAR      code;
 
         if (c < 0x80) {
-            WRITE1(c)
+            WRITE1((unsigned char)c)
             NEXT(1, 1)
             continue;
         }

diff --git a/Modules/cjkcodecs/_cp950.c b/Modules/cjkcodecs/_cp950.c
index b0644f0b449eaab1a0bfd2d971cdad33c09ec170..dcb56f12d513ea46855115077c54b5383b42ef6a 100644 (file)
--- a/Modules/cjkcodecs/_cp950.c
+++ b/Modules/cjkcodecs/_cp950.c
@@ -19,7 +19,7 @@ ENCODER(cp950)
         DBCHAR      code;
 
         if (c < 0x80) {
-            WRITE1(c)
+            WRITE1((unsigned char)c)
             NEXT(1, 1)
             continue;
         }

diff --git a/Modules/cjkcodecs/_euc_jisx0213.c b/Modules/cjkcodecs/_euc_jisx0213.c
index 3f7fbd71d8b1fb0396f820f80593b8f9c54215f5..8f59aca05be01491b7e7a26be59cf8d46930e447 100644 (file)
--- a/Modules/cjkcodecs/_euc_jisx0213.c
+++ b/Modules/cjkcodecs/_euc_jisx0213.c
@@ -43,18 +43,18 @@ ENCODER(euc_jisx0213)
                 if (code == MULTIC) {
                     if (inleft < 2) {
                         if (flags & MBENC_FLUSH) {
-                            code = find_pairencmap(c, 0, jisx0213_pairencmap,
-                                                JISX0213_ENCPAIRS);
+                            code = find_pairencmap((ucs2_t)c, 0,
+                                     jisx0213_pairencmap, JISX0213_ENCPAIRS);
                             if (code == DBCINV)
                                 return 1;
                         } else
                             return MBERR_TOOFEW;
                     } else {
-                        code = find_pairencmap(c, (*inbuf)[1],
-                                    jisx0213_pairencmap, JISX0213_ENCPAIRS);
+                        code = find_pairencmap((ucs2_t)c, (*inbuf)[1],
+                                     jisx0213_pairencmap, JISX0213_ENCPAIRS);
                         if (code == DBCINV) {
-                            code = find_pairencmap(c, 0, jisx0213_pairencmap,
-                                                JISX0213_ENCPAIRS);
+                            code = find_pairencmap((ucs2_t)c, 0,
+                                     jisx0213_pairencmap, JISX0213_ENCPAIRS);
                             if (code == DBCINV)
                                 return 1;
                         } else

diff --git a/Modules/cjkcodecs/_euc_jp.c b/Modules/cjkcodecs/_euc_jp.c
index 03921336c1cb8e783002f1653e2e0a4632327e78..72a4b20bab1f63f14ecb8ae8d9c3d3dc4c77a12d 100644 (file)
--- a/Modules/cjkcodecs/_euc_jp.c
+++ b/Modules/cjkcodecs/_euc_jp.c
@@ -18,7 +18,7 @@ ENCODER(euc_jp)
         DBCHAR      code;
 
         if (c < 0x80) {
-            WRITE1(c)
+            WRITE1((unsigned char)c)
             NEXT(1, 1)
             continue;
         }

diff --git a/Modules/cjkcodecs/_euc_kr.c b/Modules/cjkcodecs/_euc_kr.c
index 96cd3d41086ba0f6d2835193a9f38e4b89eb4264..fa97890acadb6e03171a8af74450ab98f3924f20 100644 (file)
--- a/Modules/cjkcodecs/_euc_kr.c
+++ b/Modules/cjkcodecs/_euc_kr.c
@@ -17,7 +17,7 @@ ENCODER(euc_kr)
         DBCHAR      code;
 
         if (c < 0x80) {
-            WRITE1(c)
+            WRITE1((unsigned char)c)
             NEXT(1, 1)
             continue;
         }

diff --git a/Modules/cjkcodecs/_gb2312.c b/Modules/cjkcodecs/_gb2312.c
index 388f0b8b3da7336549d02b145febd30c1fe430f0..765986098701c62d19b8ddaed7d3d1c85c6b2ee9 100644 (file)
--- a/Modules/cjkcodecs/_gb2312.c
+++ b/Modules/cjkcodecs/_gb2312.c
@@ -17,7 +17,7 @@ ENCODER(gb2312)
         DBCHAR      code;
 
         if (c < 0x80) {
-            WRITE1(c)
+            WRITE1((unsigned char)c)
             NEXT(1, 1)
             continue;
         }

diff --git a/Modules/cjkcodecs/_gbk.c b/Modules/cjkcodecs/_gbk.c
index b5d058abc0c22d7c90e2fa75c04c5797efb6d4f6..246b5c6a6de7b74f671f8e36a2797ba5d630afd3 100644 (file)
--- a/Modules/cjkcodecs/_gbk.c
+++ b/Modules/cjkcodecs/_gbk.c
@@ -19,7 +19,7 @@ ENCODER(gbk)
         DBCHAR      code;
 
         if (c < 0x80) {
-            WRITE1(c)
+            WRITE1((unsigned char)c)
             NEXT(1, 1)
             continue;
         }

diff --git a/Modules/cjkcodecs/_hz.c b/Modules/cjkcodecs/_hz.c
index 50805b15c5f0c746f5048500cbaf3d4cbfe0f812..19f910c60a9c43348923b47e97137c2738ba7658 100644 (file)
--- a/Modules/cjkcodecs/_hz.c
+++ b/Modules/cjkcodecs/_hz.c
@@ -36,10 +36,10 @@ ENCODER(hz)
 
         if (c < 0x80) {
             if (state->i == 0) {
-                WRITE1(c)
+                WRITE1((unsigned char)c)
                 NEXT(1, 1)
             } else {
-                WRITE3('~', '}', c)
+                WRITE3('~', '}', (unsigned char)c)
                 NEXT(1, 3)
                 state->i = 0;
             }

diff --git a/Modules/cjkcodecs/_iso2022_jp.c b/Modules/cjkcodecs/_iso2022_jp.c
index d0b3b1f615ec801711cbef98e65e7f8756199591..486fe994329bb1db6c68a85f365f3f957f2e734f 100644 (file)
--- a/Modules/cjkcodecs/_iso2022_jp.c
+++ b/Modules/cjkcodecs/_iso2022_jp.c
@@ -49,7 +49,7 @@ ENCODER(iso2022_jp)
         if (c < 0x80) {
             switch (STATE_GETG0(state)) {
             case CHARSET_ASCII:
-                WRITE1(c)
+                WRITE1((unsigned char)c)
                 NEXT(1, 1)
                 break;
             case CHARSET_JISX0201_R:
@@ -61,7 +61,7 @@ ENCODER(iso2022_jp)
                     STATE_SETG0(state, CHARSET_ASCII)
                     code = c;
                 }
-                WRITE1(code)
+                WRITE1((unsigned char)code)
                 NEXT(1, 1)
                 break;
             }
@@ -77,7 +77,7 @@ ENCODER(iso2022_jp)
                 code = DBCINV;
                 JISX0201_R_ENCODE(c, code)
                 if (code != DBCINV) {
-                    WRITE1(code)
+                    WRITE1((unsigned char)code)
                     NEXT(1, 1)
                     continue;
                 }
@@ -101,7 +101,7 @@ jisx0208encode: if (charset != CHARSET_JISX0208) {
                 else
                     return 1;
                 /* if (charset == CHARSET_JISX0201_R) : already checked */
-                WRITE4(ESC, '(', 'J', code)
+                WRITE4(ESC, '(', 'J', (unsigned char)code)
                 STATE_SETG0(state, CHARSET_JISX0201_R)
                 NEXT(1, 4)
             }

diff --git a/Modules/cjkcodecs/_iso2022_jp_1.c b/Modules/cjkcodecs/_iso2022_jp_1.c
index 2cf04ad045d725494bd0f36d2e937631733e3e8f..3464af47c67ba5adbe9118041acf10d3a342c7e1 100644 (file)
--- a/Modules/cjkcodecs/_iso2022_jp_1.c
+++ b/Modules/cjkcodecs/_iso2022_jp_1.c
@@ -51,7 +51,7 @@ ENCODER(iso2022_jp_1)
         if (c < 0x80) {
             switch (STATE_GETG0(state)) {
             case CHARSET_ASCII:
-                WRITE1(c)
+                WRITE1((unsigned char)c)
                 NEXT(1, 1)
                 break;
             case CHARSET_JISX0201_R:
@@ -63,7 +63,7 @@ ENCODER(iso2022_jp_1)
                     STATE_SETG0(state, CHARSET_ASCII)
                     code = c;
                 }
-                WRITE1(code)
+                WRITE1((unsigned char)code)
                 NEXT(1, 1)
                 break;
             }
@@ -79,7 +79,7 @@ ENCODER(iso2022_jp_1)
                 code = DBCINV;
                 JISX0201_R_ENCODE(c, code)
                 if (code != DBCINV) {
-                    WRITE1(code)
+                    WRITE1((unsigned char)code)
                     NEXT(1, 1)
                     continue;
                 }
@@ -110,7 +110,7 @@ jisx0208encode:     if (charset != CHARSET_JISX0208) {
                 else
                     return 1;
                 /* if (charset == CHARSET_JISX0201_R) : already checked */
-                WRITE4(ESC, '(', 'J', code)
+                WRITE4(ESC, '(', 'J', (unsigned char)code)
                 STATE_SETG0(state, CHARSET_JISX0201_R)
                 NEXT(1, 4)
             }

diff --git a/Modules/cjkcodecs/_iso2022_jp_2.c b/Modules/cjkcodecs/_iso2022_jp_2.c
index d16aa6713df230758f0f12d58e36b2579f01a3cb..c2ec01289c04146d1337274520fb269beacf226b 100644 (file)
--- a/Modules/cjkcodecs/_iso2022_jp_2.c
+++ b/Modules/cjkcodecs/_iso2022_jp_2.c
@@ -57,7 +57,7 @@ ENCODER(iso2022_jp_2)
         if (c < 0x80) {
             switch (STATE_GETG0(state)) {
             case CHARSET_ASCII:
-                WRITE1(c)
+                WRITE1((unsigned char)c)
                 NEXT(1, 1)
                 break;
             case CHARSET_JISX0201_R:
@@ -69,7 +69,7 @@ ENCODER(iso2022_jp_2)
                     STATE_SETG0(state, CHARSET_ASCII)
                     code = c;
                 }
-                WRITE1(code)
+                WRITE1((unsigned char)code)
                 NEXT(1, 1)
                 break;
             }
@@ -85,7 +85,7 @@ ENCODER(iso2022_jp_2)
                 code = DBCINV;
                 JISX0201_R_ENCODE(c, code)
                 if (code != DBCINV) {
-                    WRITE1(code)
+                    WRITE1((unsigned char)code)
                     NEXT(1, 1)
                     continue;
                 }
@@ -140,7 +140,7 @@ jisx0208encode:     if (charset != CHARSET_JISX0208) {
                     return 1;
                 }
                 /* if (charset == CHARSET_JISX0201_R) : already checked */
-                WRITE4(ESC, '(', 'J', code)
+                WRITE4(ESC, '(', 'J', (unsigned char)code)
                 STATE_SETG0(state, CHARSET_JISX0201_R)
                 NEXT(1, 4)
             }

diff --git a/Modules/cjkcodecs/_iso2022_jp_3.c b/Modules/cjkcodecs/_iso2022_jp_3.c
index 00a90fdb5ff70e82e8dbb7234193cd634e8f6dca..5d3242d94bec362f55d5ec54418bba0971bd8033 100644 (file)
--- a/Modules/cjkcodecs/_iso2022_jp_3.c
+++ b/Modules/cjkcodecs/_iso2022_jp_3.c
@@ -80,18 +80,18 @@ ENCODER(iso2022_jp_3)
             if (code == MULTIC) {
                 if (inleft < 2) {
                     if (flags & MBENC_FLUSH) {
-                        code = find_pairencmap(c, 0, jisx0213_pairencmap,
-                                            JISX0213_ENCPAIRS);
+                        code = find_pairencmap((ucs2_t)c, 0,
+                                    jisx0213_pairencmap, JISX0213_ENCPAIRS);
                         if (code == DBCINV)
                             return 1;
                     } else
                         return MBERR_TOOFEW;
                 } else {
-                    code = find_pairencmap(c, IN2,
+                    code = find_pairencmap((ucs2_t)c, IN2,
                                 jisx0213_pairencmap, JISX0213_ENCPAIRS);
                     if (code == DBCINV) {
-                        code = find_pairencmap(c, 0, jisx0213_pairencmap,
-                                            JISX0213_ENCPAIRS);
+                        code = find_pairencmap((ucs2_t)c, 0,
+                                    jisx0213_pairencmap, JISX0213_ENCPAIRS);
                         if (code == DBCINV)
                             return 1;
                     } else

diff --git a/Modules/cjkcodecs/_iso2022_jp_ext.c b/Modules/cjkcodecs/_iso2022_jp_ext.c
index 5cd0d9459ac52721af5ac11b37d74553b0c557d5..8225911f31214f4e9c9a20803bb41c3e02f855d7 100644 (file)
--- a/Modules/cjkcodecs/_iso2022_jp_ext.c
+++ b/Modules/cjkcodecs/_iso2022_jp_ext.c
@@ -49,7 +49,7 @@ ENCODER(iso2022_jp_ext)
         if (c < 0x80) {
             switch (STATE_GETG0(state)) {
             case CHARSET_ASCII:
-                WRITE1(c)
+                WRITE1((unsigned char)c)
                 NEXT(1, 1)
                 break;
             case CHARSET_JISX0201_R:
@@ -61,7 +61,7 @@ ENCODER(iso2022_jp_ext)
                     STATE_SETG0(state, CHARSET_ASCII)
                     code = c;
                 }
-                WRITE1(code)
+                WRITE1((unsigned char)code)
                 NEXT(1, 1)
                 break;
             }
@@ -77,7 +77,7 @@ ENCODER(iso2022_jp_ext)
                 code = DBCINV;
                 JISX0201_R_ENCODE(c, code)
                 if (code != DBCINV) {
-                    WRITE1(code)
+                    WRITE1((unsigned char)code)
                     NEXT(1, 1)
                     continue;
                 }
@@ -110,7 +110,7 @@ jisx0208encode:     if (charset != CHARSET_JISX0208) {
 
                 if (code < 0x80) { /* JIS X 0201 Roman */
                     /* if (charset == CHARSET_JISX0201_R) : already checked */
-                    WRITE4(ESC, '(', 'J', code)
+                    WRITE4(ESC, '(', 'J', (unsigned char)code)
                     STATE_SETG0(state, CHARSET_JISX0201_R)
                     NEXT(1, 4)
                 } else { /* JIS X 0201 Katakana */

diff --git a/Modules/cjkcodecs/_iso2022_kr.c b/Modules/cjkcodecs/_iso2022_kr.c
index f890cd378940e28466a7a74b48f072cb0e374bc1..3fbe1df84332163b33ad7c9d65a049e135e48db2 100644 (file)
--- a/Modules/cjkcodecs/_iso2022_kr.c
+++ b/Modules/cjkcodecs/_iso2022_kr.c
@@ -43,11 +43,11 @@ ENCODER(iso2022_kr)
 
         if (c < 0x80) {
             if (STATE_GETFLAG(state, F_SHIFTED)) {
-                WRITE2(SI, c)
+                WRITE2(SI, (unsigned char)c)
                 STATE_CLEARFLAG(state, F_SHIFTED)
                 NEXT(1, 2)
             } else {
-                WRITE1(c)
+                WRITE1((unsigned char)c)
                 NEXT(1, 1)
             }
             if (c == '\n')

diff --git a/Modules/cjkcodecs/_johab.c b/Modules/cjkcodecs/_johab.c
index 3aeb500ba6ff9a4c77f99d7e21249d05e8afdb2a..31997048477fec8e3c5b064c3ceda09bc669bb58 100644 (file)
--- a/Modules/cjkcodecs/_johab.c
+++ b/Modules/cjkcodecs/_johab.c
@@ -44,7 +44,7 @@ ENCODER(johab)
         DBCHAR      code;
 
         if (c < 0x80) {
-            WRITE1(c)
+            WRITE1((unsigned char)c)
             NEXT(1, 1)
             continue;
         }

diff --git a/Modules/cjkcodecs/_shift_jis.c b/Modules/cjkcodecs/_shift_jis.c
index 0bdee3f397b48f8999fd899c418741d07b67efbf..3619a3a776ed294224122b362af847ea4660e02d 100644 (file)
--- a/Modules/cjkcodecs/_shift_jis.c
+++ b/Modules/cjkcodecs/_shift_jis.c
@@ -32,7 +32,7 @@ ENCODER(shift_jis)
         if (code < 0x80 || (code >= 0xa1 && code <= 0xdf)) {
             RESERVE_OUTBUF(1)
 
-            OUT1(code)
+            OUT1((unsigned char)code)
             NEXT(1, 1)
             continue;
         }

diff --git a/Modules/cjkcodecs/_shift_jisx0213.c b/Modules/cjkcodecs/_shift_jisx0213.c
index fd622b0bee21e2c3ed3c152c0a477b5e8008962b..0b24fec3282372e750a8fbeacdaba24c1d57d2cc 100644 (file)
--- a/Modules/cjkcodecs/_shift_jisx0213.c
+++ b/Modules/cjkcodecs/_shift_jisx0213.c
@@ -33,7 +33,7 @@ ENCODER(shift_jisx0213)
     else DECODE_SURROGATE(c)
 
     if (code < 0x80 || (code >= 0xa1 && code <= 0xdf)) {
-        WRITE1(code)
+        WRITE1((unsigned char)code)
         NEXT(1, 1)
         continue;
     }
@@ -47,18 +47,18 @@ ENCODER(shift_jisx0213)
                 if (code == MULTIC) {
                     if (inleft < 2) {
                         if (flags & MBENC_FLUSH) {
-                            code = find_pairencmap(c, 0, jisx0213_pairencmap,
-                                                JISX0213_ENCPAIRS);
+                            code = find_pairencmap((ucs2_t)c, 0,
+                                     jisx0213_pairencmap, JISX0213_ENCPAIRS);
                             if (code == DBCINV)
                                 return 1;
                         } else
                             return MBERR_TOOFEW;
                     } else {
-                        code = find_pairencmap(c, IN2,
+                        code = find_pairencmap((ucs2_t)c, IN2,
                                     jisx0213_pairencmap, JISX0213_ENCPAIRS);
                         if (code == DBCINV) {
-                            code = find_pairencmap(c, 0, jisx0213_pairencmap,
-                                                JISX0213_ENCPAIRS);
+                            code = find_pairencmap((ucs2_t)c, 0,
+                                     jisx0213_pairencmap, JISX0213_ENCPAIRS);
                             if (code == DBCINV)
                                 return 1;
                         } else

diff --git a/Modules/cjkcodecs/iso2022common.h b/Modules/cjkcodecs/iso2022common.h
index cb8a1590d703f7b2499cd70f402ebb1aa6c054e4..e042d8033d34d39ed87f764754d5da57330a44ee 100644 (file)
--- a/Modules/cjkcodecs/iso2022common.h
+++ b/Modules/cjkcodecs/iso2022common.h
@@ -183,7 +183,7 @@ iso2022processesc(MultibyteCodec_State *state,
                   const unsigned char **inbuf, size_t *inleft)
 {
     unsigned char charset, designation;
-    int  i, esclen;
+    size_t  i, esclen;
 
     for (i = 1;i < MAX_ESCSEQLEN;i++) {
         if (i >= *inleft)