From cbeb0b26e4c7caa8d1b47de791a7418dc20a4567 Mon Sep 17 00:00:00 2001 From: rsc Date: Sat, 1 Apr 2006 19:24:03 +0000 Subject: Use gcc -ansi -pedantic in 9c. Fix many non-C89-isms. --- src/cmd/tcs/8859.h | 20 ++++++++++---------- src/cmd/tcs/big5.c | 2 +- src/cmd/tcs/conv_big5.c | 2 +- src/cmd/tcs/cyrillic.h | 10 +++++----- src/cmd/tcs/font/bbits.c | 2 +- src/cmd/tcs/font/main.c | 2 +- src/cmd/tcs/gb.c | 2 +- src/cmd/tcs/kuten208.c | 2 +- src/cmd/tcs/kuten212.c | 2 +- src/cmd/tcs/misc.h | 14 +++++++------- src/cmd/tcs/ms.h | 42 +++++++++++++++++++++--------------------- src/cmd/tcs/tcs.c | 8 ++++---- 12 files changed, 54 insertions(+), 54 deletions(-) (limited to 'src/cmd/tcs') diff --git a/src/cmd/tcs/8859.h b/src/cmd/tcs/8859.h index 573dc445..32d71686 100644 --- a/src/cmd/tcs/8859.h +++ b/src/cmd/tcs/8859.h @@ -15,7 +15,7 @@ long tab8859_1[256] = 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf, 0xd0,0xd1,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xdb,0xdc,0xdd,0xde,0xdf, 0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xeb,0xec,0xed,0xee,0xef, -0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff, +0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff }; long tab8859_2[256] = @@ -41,7 +41,7 @@ long tab8859_2[256] = 0x0155,0x00e1,0x00e2,0x0103,0x00e4,0x013a,0x0107,0x00e7, 0x010d,0x00e9,0x0119,0x00eb,0x011b,0x00ed,0x00ee,0x010f, 0x0111,0x0144,0x0148,0x00f3,0x00f4,0x0151,0x00f6,0x00f7, -0x0159,0x016f,0x00fa,0x0171,0x00fc,0x00fd,0x0163,0x02d9, +0x0159,0x016f,0x00fa,0x0171,0x00fc,0x00fd,0x0163,0x02d9 }; long tab8859_3[256] = @@ -67,7 +67,7 @@ long tab8859_3[256] = 0x00e0,0x00e1,0x00e2, -1,0x00e4,0x010b,0x0109,0x00e7, 0x00e8,0x00e9,0x00ea,0x00eb,0x00ec,0x00ed,0x00ee,0x00ef, -1,0x00f1,0x00f2,0x00f3,0x00f4,0x0121,0x00f6,0x00f7, -0x011d,0x00f9,0x00fa,0x00fb,0x00fc,0x016d,0x015d,0x02d9, +0x011d,0x00f9,0x00fa,0x00fb,0x00fc,0x016d,0x015d,0x02d9 }; long tab8859_4[256] = @@ -93,7 +93,7 @@ long tab8859_4[256] = 0x0101,0x00e1,0x00e2,0x00e3,0x00e4,0x00e5,0x00e6,0x012f, 0x010d,0x00e9,0x0119,0x00eb,0x0117,0x00ed,0x00ee,0x012b, 0x0111,0x0146,0x014d,0x0137,0x00f4,0x00f5,0x00f6,0x00f7, -0x00f8,0x0173,0x00fa,0x00fb,0x00fc,0x0169,0x016b,0x02d9, +0x00f8,0x0173,0x00fa,0x00fb,0x00fc,0x0169,0x016b,0x02d9 }; long tab8859_5[256] = @@ -119,7 +119,7 @@ long tab8859_5[256] = 0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447, 0x0448,0x0449,0x044a,0x044b,0x044c,0x044d,0x044e,0x044f, 0x2116,0x0451,0x0452,0x0453,0x0454,0x0455,0x0456,0x0457, -0x0458,0x0459,0x045a,0x045b,0x045c,0x00a7,0x045e,0x045f, +0x0458,0x0459,0x045a,0x045b,0x045c,0x00a7,0x045e,0x045f }; long tab8859_6[256] = @@ -145,7 +145,7 @@ long tab8859_6[256] = 0x0640,0x0641,0x0642,0x0643,0x0644,0x0645,0x0646,0x0647, 0x0648,0x0649,0x064a,0x064b,0x064c,0x064d,0x064e,0x064f, 0x0650,0x0651,0x0652, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1 }; long tab8859_7[256] = @@ -171,7 +171,7 @@ long tab8859_7[256] = 0x03b0,0x03b1,0x03b2,0x03b3,0x03b4,0x03b5,0x03b6,0x03b7, 0x03b8,0x03b9,0x03ba,0x03bb,0x03bc,0x03bd,0x03be,0x03bf, 0x03c0,0x03c1,0x03c2,0x03c3,0x03c4,0x03c5,0x03c6,0x03c7, -0x03c8,0x03c9,0x03ca,0x03cb,0x03cc,0x03cd,0x03ce, -1, +0x03c8,0x03c9,0x03ca,0x03cb,0x03cc,0x03cd,0x03ce, -1 }; long tab8859_8[256] = @@ -197,7 +197,7 @@ long tab8859_8[256] = 0x05d0,0x05d1,0x05d2,0x05d3,0x05d4,0x05d5,0x05d6,0x05d7, 0x05d8,0x05d9,0x05da,0x05db,0x05dc,0x05dd,0x05de,0x05df, 0x05e0,0x05e1,0x05e2,0x05e3,0x05e4,0x05e5,0x05e6,0x05e7, -0x05e8,0x05e9,0x05ea, -1, -1, -1, -1, -1, +0x05e8,0x05e9,0x05ea, -1, -1, -1, -1, -1 }; long tab8859_9[256] = @@ -223,7 +223,7 @@ long tab8859_9[256] = 0x00e0,0x00e1,0x00e2,0x00e3,0x00e4,0x00e5,0x00e6,0x00e7, 0x00e8,0x00e9,0x00ea,0x00eb,0x00ec,0x00ed,0x00ee,0x00ef, 0x011f,0x00f1,0x00f2,0x00f3,0x00f4,0x00f5,0x00f6,0x00f7, -0x00f8,0x00f9,0x00fa,0x00fb,0x00fc,0x0131,0x015f,0x00ff, +0x00f8,0x00f9,0x00fa,0x00fb,0x00fc,0x0131,0x015f,0x00ff }; long tab8859_10[256] = /* from dkuug.dk:i18n/charmaps/ISO_8859-10:1993 */ @@ -249,7 +249,7 @@ long tab8859_10[256] = /* from dkuug.dk:i18n/charmaps/ISO_8859-10:1993 */ 0x0101,0x00e1,0x00e2,0x00e3,0x00e4,0x00e5,0x00e6,0x012f, 0x010d,0x00e9,0x0119,0x00eb,0x0117,0x00ed,0x00ee,0x00ef, 0x00f0,0x0146,0x014d,0x00f3,0x00f4,0x00f5,0x00f6,0x0169, -0x00f8,0x0173,0x00fa,0x00fb,0x00fc,0x00fd,0x00fe,0x0138, +0x00f8,0x0173,0x00fa,0x00fb,0x00fc,0x00fd,0x00fe,0x0138 }; diff --git a/src/cmd/tcs/big5.c b/src/cmd/tcs/big5.c index dda738fa..051f1b0f 100644 --- a/src/cmd/tcs/big5.c +++ b/src/cmd/tcs/big5.c @@ -1747,5 +1747,5 @@ long tabbig5[BIG5MAX] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1 }; diff --git a/src/cmd/tcs/conv_big5.c b/src/cmd/tcs/conv_big5.c index d81c8717..111bf5c4 100644 --- a/src/cmd/tcs/conv_big5.c +++ b/src/cmd/tcs/conv_big5.c @@ -139,7 +139,7 @@ big5_out(Rune *base, int n, long *notused) if(tab[r] != -1){ r = tab[r]; if(r >= BIG5MAX){ - *p++ = 0xA1; + *p++ = (char)0xA1; *p++ = r-BIG5MAX; continue; } else { diff --git a/src/cmd/tcs/cyrillic.h b/src/cmd/tcs/cyrillic.h index 569b4907..b4460eb3 100644 --- a/src/cmd/tcs/cyrillic.h +++ b/src/cmd/tcs/cyrillic.h @@ -23,7 +23,7 @@ long tabucode[256] = 0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447, 0x0448,0x0449,0x044a,0x044b,0x044c,0x044d,0x044e,0x044f, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1 }; long tabkoi8[256] = { @@ -50,7 +50,7 @@ long tabkoi8[256] = 0x042e,0x0410,0x0411,0x0426,0x0414,0x0415,0x0424,0x0413, 0x0425,0x0418,0x0419,0x041a,0x041b,0x041c,0x041d,0x041e, 0x041f,0x042f,0x0420,0x0421,0x0422,0x0423,0x0416,0x0412, -0x042c,0x042b,0x0417,0x0428,0x042d,0x0429,0x0427,0x042a, +0x042c,0x042b,0x0417,0x0428,0x042d,0x0429,0x0427,0x042a }; long tab866[256] = { @@ -77,7 +77,7 @@ long tab866[256] = 0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447, 0x0448,0x0449,0x044a,0x044b,0x044c,0x044d,0x044e,0x044f, 0x0401,0x0451, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1 }; long tabav[256] = { @@ -104,7 +104,7 @@ long tabav[256] = 0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447, 0x0448,0x0449,0x044a,0x044b,0x044c,0x044d,0x044e,0x044f, 0x0401,0x0451,0x0301,0x0300,0x0301,0x0300,0x2192,0x2190, -0x2193,0x2191,0x00f7,0x00b1,0x2116,0x00a4, -1, -1, +0x2193,0x2191,0x00f7,0x00b1,0x2116,0x00a4, -1, -1 }; long tabov[256] = { @@ -131,5 +131,5 @@ long tabov[256] = 0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447, 0x0448,0x0449,0x044a,0x044b,0x044c,0x044d,0x044e,0x044f, 0x0401,0x0451,0x0301,0x0300,0x0301,0x0300,0x2192,0x2190, -0x2193,0x2191,0x00f7,0x00b1,0x2116,0x00a4, -1, -1, +0x2193,0x2191,0x00f7,0x00b1,0x2116,0x00a4, -1, -1 }; diff --git a/src/cmd/tcs/font/bbits.c b/src/cmd/tcs/font/bbits.c index 71c9b004..e4880336 100644 --- a/src/cmd/tcs/font/bbits.c +++ b/src/cmd/tcs/font/bbits.c @@ -7,7 +7,7 @@ enum { Charsperfont = 157, Void1b = (0xC6-0xA2)*Charsperfont+0x3f, - Void1e = (0xC9-0xA2)*Charsperfont - 1 , + Void1e = (0xC9-0xA2)*Charsperfont - 1 }; Bitmap * diff --git a/src/cmd/tcs/font/main.c b/src/cmd/tcs/font/main.c index acc3ea3f..db25152c 100644 --- a/src/cmd/tcs/font/main.c +++ b/src/cmd/tcs/font/main.c @@ -19,7 +19,7 @@ struct { [Jis] { "../han/jis.bits", "../han/jis16.bits", kmap, kreadbits }, [Big5] { "no 24 bit file", "../han/big5.16.bits", bmap, breadbits }, [Gb_bdf] { "no 24 bit file", "../han/cclib16fs.bdf", gmap, greadbits }, - [Gb_qw] { "no 24 bit file", "no 16bit file", gmap, qreadbits }, + [Gb_qw] { "no 24 bit file", "no 16bit file", gmap, qreadbits } }; void diff --git a/src/cmd/tcs/gb.c b/src/cmd/tcs/gb.c index b149b8fc..c4cd0178 100644 --- a/src/cmd/tcs/gb.c +++ b/src/cmd/tcs/gb.c @@ -1100,5 +1100,5 @@ long tabgb[GBMAX] = { 0x9e82,0x9e87,0x9e88,0x9e8b,0x9e92,0x93d6,0x9e9d,0x9e9f, 0x9edb,0x9edc,0x9edd,0x9ee0,0x9edf,0x9ee2,0x9ee9,0x9ee7, 0x9ee5,0x9eea,0x9eef,0x9f22,0x9f2c,0x9f2f,0x9f39,0x9f37, -0x9f3d,0x9f3e,0x9f44, +0x9f3d,0x9f3e,0x9f44 }; diff --git a/src/cmd/tcs/kuten208.c b/src/cmd/tcs/kuten208.c index 4f551526..d1366e8b 100644 --- a/src/cmd/tcs/kuten208.c +++ b/src/cmd/tcs/kuten208.c @@ -1051,5 +1051,5 @@ long tabkuten208[KUTEN208MAX] = { 0x9f2c,0x9f3e,0x9f4a,0x9f52,0x9f54,0x9f63,0x9f5f,0x9f60, 0x9f61,0x9f66,0x9f67,0x9f6c,0x9f6a,0x9f77,0x9f72,0x9f76, 0x9f95,0x9f9c,0x9fa0, -1, -1, -1, -1, -1, - -1,0x582f,0x69c7,0x9059,0x7464,0x51dc,0x7199, + -1,0x582f,0x69c7,0x9059,0x7464,0x51dc,0x7199 }; diff --git a/src/cmd/tcs/kuten212.c b/src/cmd/tcs/kuten212.c index c1ad93b2..d00750fb 100644 --- a/src/cmd/tcs/kuten212.c +++ b/src/cmd/tcs/kuten212.c @@ -971,5 +971,5 @@ long tabkuten212[KUTEN212MAX] = { 0x9f47,0x9f53,0x9f55,0x9f56,0x9f57,0x9f58,0x9f5a,0x9f5d, 0x9f5e,0x9f68,0x9f69,0x9f6d,0x9f6e,0x9f6f,0x9f70,0x9f71, 0x9f73,0x9f75,0x9f7a,0x9f7d,0x9f8f,0x9f90,0x9f91,0x9f92, -0x9f94,0x9f96,0x9f97,0x9f9e,0x9fa1,0x9fa2,0x9fa3,0x9fa5, +0x9f94,0x9f96,0x9f97,0x9f9e,0x9fa1,0x9fa2,0x9fa3,0x9fa5 }; diff --git a/src/cmd/tcs/misc.h b/src/cmd/tcs/misc.h index 84aa4440..7e427c8b 100644 --- a/src/cmd/tcs/misc.h +++ b/src/cmd/tcs/misc.h @@ -26,7 +26,7 @@ long tabatari[256] = /* from jhelling@cs.ruu.nl (Jeroen Hellingman) */ 0x03a6, 0x03b8, 0x2126, 0x03b4, 0x222e, 0x03c6, 0x2208, 0x220f, /* math */ 0x2261, 0x00b1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00f7, 0x2248, -0x00b0, 0x2022, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x00b3, 0x00af, +0x00b0, 0x2022, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x00b3, 0x00af }; long tabebcdic[256] = /* from jhelling@cs.ruu.nl (Jeroen Hellingman) */ { @@ -61,7 +61,7 @@ long tabebcdic[256] = /* from jhelling@cs.ruu.nl (Jeroen Hellingman) */ 0x5c, -1, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, -1, -1, -1, -1, -1, -1, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, -0x38, 0x39, -1, -1, -1, -1, -1, -1, +0x38, 0x39, -1, -1, -1, -1, -1, -1 }; long tabmacroman[256] = /* (modified via world.std.com!choupt) from mduerst@ifi.unizh.ch (Martin J. Du"rst) */ { @@ -88,7 +88,7 @@ long tabmacroman[256] = /* (modified via world.std.com!choupt) from mduerst@ifi. 0x2021,0x00b7,0x201a,0x201e,0x2030,0x00c2,0x00ca,0x00c1, 0x00cb,0x00c8,0x00cd,0x00ce,0x00cf,0x00cc,0x00d3,0x00d4, 0xf7ff,0x00d2,0x00da,0x00db,0x00d9,0x0131,0x02c6,0x02dc, -0x00af,0x02d8,0x02d9,0x02da,0x00b8,0x02dd,0x02db,0x02c7, +0x00af,0x02d8,0x02d9,0x02da,0x00b8,0x02dd,0x02db,0x02c7 }; long tabnextstep[256] = /* From mduerst@ifi.unizh.ch (Martin J. Du"rst) */ /* From NEXTSTEP Encoding Vector / Character Code Palette */ @@ -146,7 +146,7 @@ long tabps2[256] = /* from jhelling@cs.ruu.nl (Jeroen Hellingman) */ 0x00d3, 0x00df, 0x00d4, 0x00d2, 0x00f5, 0x00d5, 0x00b5, 0x00fe, 0x00de, 0x00da, 0x00db, 0x00d9, 0x00fd, 0x00dd, 0x00af, 0x00b4, 0x00ad, 0x00b1, 0x2017, 0x00be, 0x00b6, 0x00a7, 0x00f7, 0x00b8, -0x00b0, 0x00a8, 0x00b7, 0x00b9, 0x00b3, 0x00b2, 0x220e, 0x00a0, +0x00b0, 0x00a8, 0x00b7, 0x00b9, 0x00b3, 0x00b2, 0x220e, 0x00a0 }; long tabsf1[256] = /* From Kari.Hurtta@Helsinki.FI (Kari E. Hurtta) */ { @@ -165,7 +165,7 @@ long tabsf1[256] = /* From Kari.Hurtta@Helsinki.FI (Kari E. Hurtta) */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; long tabsf2[256] = /* from wirzeniu@cc.helsinki.fi (Lars Wirzenius) */ { @@ -184,7 +184,7 @@ long tabsf2[256] = /* from wirzeniu@cc.helsinki.fi (Lars Wirzenius) */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; long tabtis620[256] = /* from jhelling@cs.ruu.nl (Jeroen Hellingman) */ { @@ -209,7 +209,7 @@ long tabtis620[256] = /* from jhelling@cs.ruu.nl (Jeroen Hellingman) */ 0x0e40, 0x0e41, 0x0e42, 0x0e43, 0x0e44, 0x0e45, 0x0e46, 0x0e47, 0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e4c, 0x0e4d, 0x0e4e, 0x0e4f, 0x0e50, 0x0e51, 0x0e52, 0x0e53, 0x0e54, 0x0e55, 0x0e56, 0x0e57, -0x0e58, 0x0e59, 0x0e5a, 0x0e5b, -1, -1, -1, -1, +0x0e58, 0x0e59, 0x0e5a, 0x0e5b, -1, -1, -1, -1 }; long tabviet1[256] = /* From jdo@sjc.mentorg.com (James Do) */ { diff --git a/src/cmd/tcs/ms.h b/src/cmd/tcs/ms.h index 884557e9..617dd198 100644 --- a/src/cmd/tcs/ms.h +++ b/src/cmd/tcs/ms.h @@ -53,7 +53,7 @@ long tabcp437[256] = { 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, -0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0, +0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 }; long tabcp720[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -87,7 +87,7 @@ long tabcp720[256] = { 0x0636, 0x0637, 0x0638, 0x0639, 0x063A, 0x0641, 0x00B5, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649, 0x064A, 0x2261, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F, 0x0650, 0x2248, -0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0, +0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 }; long tabcp737[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -121,7 +121,7 @@ long tabcp737[256] = { 0x03C9, 0x03AC, 0x03AD, 0x03AE, 0x03CA, 0x03AF, 0x03CC, 0x03CD, 0x03CB, 0x03CE, 0x0386, 0x0388, 0x0389, 0x038A, 0x038C, 0x038E, 0x038F, 0x00B1, 0x2265, 0x2264, 0x03AA, 0x03AB, 0x00F7, 0x2248, -0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0, +0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 }; long tabcp775[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -155,7 +155,7 @@ long tabcp775[256] = { 0x00D3, 0x00DF, 0x014C, 0x0143, 0x00F5, 0x00D5, 0x00B5, 0x0144, 0x0136, 0x0137, 0x013B, 0x013C, 0x0146, 0x0112, 0x0145, 0x2019, 0x00AD, 0x00B1, 0x201C, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x201E, -0x00B0, 0x2219, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0, +0x00B0, 0x2219, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0 }; long tabcp850[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -189,7 +189,7 @@ long tabcp850[256] = { 0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE, 0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4, 0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8, -0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0, +0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0 }; long tabcp852[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -223,7 +223,7 @@ long tabcp852[256] = { 0x00D3, 0x00DF, 0x00D4, 0x0143, 0x0144, 0x0148, 0x0160, 0x0161, 0x0154, 0x00DA, 0x0155, 0x0170, 0x00FD, 0x00DD, 0x0163, 0x00B4, 0x00AD, 0x02DD, 0x02DB, 0x02C7, 0x02D8, 0x00A7, 0x00F7, 0x00B8, -0x00B0, 0x00A8, 0x02D9, 0x0171, 0x0158, 0x0159, 0x25A0, 0x00A0, +0x00B0, 0x00A8, 0x02D9, 0x0171, 0x0158, 0x0159, 0x25A0, 0x00A0 }; long tabcp855[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -257,7 +257,7 @@ long tabcp855[256] = { 0x042F, 0x0440, 0x0420, 0x0441, 0x0421, 0x0442, 0x0422, 0x0443, 0x0423, 0x0436, 0x0416, 0x0432, 0x0412, 0x044C, 0x042C, 0x2116, 0x00AD, 0x044B, 0x042B, 0x0437, 0x0417, 0x0448, 0x0428, 0x044D, -0x042D, 0x0449, 0x0429, 0x0447, 0x0427, 0x00A7, 0x25A0, 0x00A0, +0x042D, 0x0449, 0x0429, 0x0447, 0x0427, 0x00A7, 0x25A0, 0x00A0 }; long tabcp857[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -291,7 +291,7 @@ long tabcp857[256] = { 0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, -1, 0x00D7, 0x00DA, 0x00DB, 0x00D9, 0x00EC, 0x00FF, 0x00AF, 0x00B4, 0x00AD, 0x00B1, -1, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8, -0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0, +0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0 }; long tabcp858[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -325,7 +325,7 @@ long tabcp858[256] = { 0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE, 0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4, 0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8, -0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0, +0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0 }; long tabcp862[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -359,7 +359,7 @@ long tabcp862[256] = { 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, -0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0, +0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 }; long tabcp866[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -393,7 +393,7 @@ long tabcp866[256] = { 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, 0x0401, 0x0451, 0x0404, 0x0454, 0x0407, 0x0457, 0x040E, 0x045E, -0x00B0, 0x2219, 0x00B7, 0x221A, 0x2116, 0x00A4, 0x25A0, 0x00A0, +0x00B0, 0x2219, 0x00B7, 0x221A, 0x2116, 0x00A4, 0x25A0, 0x00A0 }; long tabcp874[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -427,7 +427,7 @@ long tabcp874[256] = { 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F, 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, -0x0E58, 0x0E59, 0x0E5A, 0x0E5B, -1, -1, -1, -1, +0x0E58, 0x0E59, 0x0E5A, 0x0E5B, -1, -1, -1, -1 }; long tabcp1250[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -461,7 +461,7 @@ long tabcp1250[256] = { 0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7, 0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, 0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, -0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9, +0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9 }; long tabcp1251[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -495,7 +495,7 @@ long tabcp1251[256] = { 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, -0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, +0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F }; long tabcp1252[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -529,7 +529,7 @@ long tabcp1252[256] = { 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, -0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF, +0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF }; long tabcp1253[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -563,7 +563,7 @@ long tabcp1253[256] = { 0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, -0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, -1, +0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, -1 }; long tabcp1254[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -597,7 +597,7 @@ long tabcp1254[256] = { 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, -0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF, +0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF }; long tabcp1255[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -631,7 +631,7 @@ long tabcp1255[256] = { 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF, 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, -0x05E8, 0x05E9, 0x05EA, -1, -1, 0x200E, 0x200F, -1, +0x05E8, 0x05E9, 0x05EA, -1, -1, 0x200E, 0x200F, -1 }; long tabcp1256[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -665,7 +665,7 @@ long tabcp1256[256] = { 0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF, 0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7, -0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2, +0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2 }; long tabcp1257[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -699,7 +699,7 @@ long tabcp1257[256] = { 0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, 0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C, 0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7, -0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9, +0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9 }; long tabcp1258[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, @@ -733,5 +733,5 @@ long tabcp1258[256] = { 0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0301, 0x00ED, 0x00EE, 0x00EF, 0x0111, 0x00F1, 0x0323, 0x00F3, 0x00F4, 0x01A1, 0x00F6, 0x00F7, -0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF, +0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF }; diff --git a/src/cmd/tcs/tcs.c b/src/cmd/tcs/tcs.c index 37753765..bb2f61f7 100644 --- a/src/cmd/tcs/tcs.c +++ b/src/cmd/tcs/tcs.c @@ -326,7 +326,7 @@ long tabascii[256] = -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; long tabmsdos[256] = /* from jhelling@cs.ruu.nl (Jeroen Hellingman) */ @@ -354,7 +354,7 @@ long tabmsdos[256] = /* from jhelling@cs.ruu.nl (Jeroen Hellingman) */ 0x03b1, 0x00df, 0x0393, 0x03c0, 0x03a3, 0x03c3, 0x00b5, 0x03c4, /* greek */ 0x03a6, 0x0398, 0x2126, 0x03b4, 0x221e, 0x2205, 0x2208, 0x2229, 0x2261, 0x00b1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00f7, 0x2248, /* math */ -0x00b0, 0x2022, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x220e, 0x00a0, +0x00b0, 0x2022, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x220e, 0x00a0 }; long tabmsdos2[256] = /* from jhelling@cs.ruu.nl (Jeroen Hellingman) */ { @@ -383,7 +383,7 @@ long tabmsdos2[256] = /* from jhelling@cs.ruu.nl (Jeroen Hellingman) */ 0x03b1, 0x00df, 0x0393, 0x03c0, 0x03a3, 0x03c3, 0x00b5, 0x03c4, /* greek */ 0x03a6, 0x0398, 0x2126, 0x03b4, 0x221e, 0x2205, 0x2208, 0x2229, 0x2261, 0x00b1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00f7, 0x2248, /* math */ -0x00b0, 0x2022, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x220e, 0x00a0, +0x00b0, 0x2022, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x220e, 0x00a0 }; struct convert convert[] = { /* if two entries have the same name, put the from one first */ @@ -462,5 +462,5 @@ struct convert convert[] = { "viet1", "Vietnamese VSCII-1 (1993)", Table, (void *)tabviet1 }, { "viet2", "Vietnamese VSCII-2 (1993)", Table, (void *)tabviet2 }, { "viscii", "Vietnamese VISCII 1.1 (1992)", Table, (void *)tabviscii }, - { 0 }, + { 0 } }; -- cgit v1.2.3