o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use gcc -ansi -pedantic in 9c. Fix many non-C89-isms.

Browse source
This commit is contained in:
rsc 2006-04-01 19:24:03 +00:00
parent 226d80b821
commit cbeb0b26e4
492 changed files with 3218 additions and 3167 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/dict/dict.c
View file

@ -52,7 +52,7 @@ void usage(void);
enum {
Plen=300, /* max length of a search pattern */
Fieldlen=200, /* max length of an index field */
Aslots=10, /* initial number of slots in an address */
Aslots=10 /* initial number of slots in an address */
};
void

2
src/cmd/dict/dict.h
View file

@ -62,7 +62,7 @@ enum { NONE=0xe800, /* Emit nothing */
MWLN, /* ʼω */
MOE, /* oe */
MES, /* em space */
MULTIE, /* End of multi-rune codes */
MULTIE /* End of multi-rune codes */
};
#define Nligs (LIGE-LIGS)
#define Nmulti (MULTIE-MULTI)

2
src/cmd/dict/gb2312.c
View file

@ -1104,5 +1104,5 @@ Rune tabgb2312[GB2312MAX] = {
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
};

2
src/cmd/dict/jis208.c
View file

@ -1055,5 +1055,5 @@ Rune tabjis208[JIS208MAX] = {
0x9f2c,0x9f3e,0x9f4a,0x9f52,0x9f54,0x9f63,0x9f5f,0x9f60,
0x9f61,0x9f66,0x9f67,0x9f6c,0x9f6a,0x9f77,0x9f72,0x9f76,
0x9f95,0x9f9c,0x9fa0, NONE, NONE, NONE, NONE, NONE,
NONE,0x582f,0x69c7,0x9059,0x7464,0x51dc,0x7199,
NONE,0x582f,0x69c7,0x9059,0x7464,0x51dc,0x7199
};

33
src/cmd/dict/oed.c
View file

@ -5,7 +5,7 @@
enum {
Buflen=1000,
Maxaux=5,
Maxaux=5
};
/* Possible tags */
@ -185,7 +185,7 @@ static Assoc tagtab[] = {
{"xi", Xi},
{"xid", Xid},
{"xr", Xr},
{"xs", Xs},
{"xs", Xs}
};
/* Possible tag auxilliary info */
@ -800,7 +800,7 @@ static Assoc spectab[] = {
{"zced", 0x7a}, /* +cedilla */
{"zeta", 0x3b6},
{"zh", 0x292},
{"zhacek", 0x17e},
{"zhacek", 0x17e}
};
/*
The following special characters don't have close enough
@ -816,7 +816,7 @@ static Assoc spectab[] = {
bbc1 single chem bond below
bbc2 double chem bond below
bbl1 chem bond like /
bbl2 chem bond like //
bbl2 chem bond like //
bbr1 chem bond like \
bbr2 chem bond \\
bcop1 copper symbol. Cf copper
@ -907,7 +907,7 @@ static Rune normtab[128] = {
/*60*/ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
/*70*/ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE
};
static Rune phtab[128] = {
/*0*/ /*1*/ /*2*/ /*3*/ /*4*/ /*5*/ /*6*/ /*7*/
@ -926,7 +926,7 @@ static Rune phtab[128] = {
/*60*/ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
/*70*/ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE
};
static Rune grtab[128] = {
/*0*/ /*1*/ /*2*/ /*3*/ /*4*/ /*5*/ /*6*/ /*7*/
@ -945,7 +945,7 @@ static Rune grtab[128] = {
/*60*/ 0x60, 0x3b1, 0x3b2, 0x3be, 0x3b4, 0x3b5, 0x3c6, 0x3b3,
0x3b7, 0x3b9, 0x3c2, 0x3ba, 0x3bb, 0x3bc, 0x3bd, 0x3bf,
/*70*/ 0x3c0, 0x3b8, 0x3c1, 0x3c3, 0x3c4, 0x3c5, 0x76, 0x3c9,
0x3c7, 0x3c8, 0x3b6, 0x7b, 0x7c, 0x7d, 0x7e, NONE,
0x3c7, 0x3c8, 0x3b6, 0x7b, 0x7c, 0x7d, 0x7e, NONE
};
static Rune subtab[128] = {
/*0*/ /*1*/ /*2*/ /*3*/ /*4*/ /*5*/ /*6*/ /*7*/
@ -964,7 +964,7 @@ static Rune subtab[128] = {
/*60*/ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
/*70*/ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE
};
static Rune suptab[128] = {
/*0*/ /*1*/ /*2*/ /*3*/ /*4*/ /*5*/ /*6*/ /*7*/
@ -983,7 +983,7 @@ static Rune suptab[128] = {
/*60*/ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
/*70*/ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE
};
static int tagstarts;
@ -1233,7 +1233,7 @@ oednextoff(long fromoff)
return (Boffset(bdict)-n);
}
static char *prkey =
static char *prkey1 =
"KEY TO THE PRONUNCIATION\n"
"\n"
"I. CONSONANTS\n"
@ -1252,6 +1252,8 @@ static char *prkey =
"ʃ ... shop (ʃɒp), dish (dɪʃ)\n"
"tʃ ... chop (tʃɒp), ditch (dɪtʃ)\n"
"ʒ ... vision (ˈvɪʒən), déjeuner (deʒøne)\n"
;
static char *prkey2 =
"dʒ ... judge (dʒʌdʒ)\n"
"ŋ ... singing (ˈsɪŋɪŋ), think (θiŋk)\n"
"ŋg ... finger (ˈfiŋgə(r))\n"
@ -1265,6 +1267,8 @@ static char *prkey =
"c ... Afrikaans baardmannetjie (ˈbaːrtmanəci)\n"
"ɥ ... Fr. cuisine (kɥizin)\n"
"\n"
;
static char *prkey3 =
"II. VOWELS AND DIPTHONGS\n"
"\n"
"Short\n"
@ -1283,6 +1287,8 @@ static char *prkey =
"ɔ ... Fr. homme (ɔm)\n"
"o ... Fr. eau (o)\n"
"ø ... Fr. peu (pø)\n"
;
static char *prkey4 =
"œ ... Fr. boeuf (bœf), coeur (kœr)\n"
"u ... Fr. douce (dus)\n"
"ʏ ... Ger. Müller (ˈmʏlər)\n"
@ -1301,6 +1307,8 @@ static char *prkey =
"øː ... Ger. Goethe (gøːtə)\n"
"yː ... Ger. grün (gryːn)\n"
"\n"
;
static char *prkey5 =
"Nasal\n"
"ɛ˜, æ˜ as in Fr. fin (fɛ˜, fæ˜)\n"
"ã ... Fr. franc (frã)\n"
@ -1318,6 +1326,8 @@ static char *prkey =
"ʊə ... tour (tʊə(r))\n"
"ɔə ... boar (bɔə(r))\n"
"\n"
;
static char *prkey6 =
"III. STRESS\n"
"\n"
"Main stress: ˈ preceding stressed syllable\n"
@ -1329,7 +1339,8 @@ static char *prkey =
void
oedprintkey(void)
{
Bprint(bout, "%s", prkey);
Bprint(bout, "%s%s%s%s%s%s",
prkey1, prkey2, prkey3, prkey4, prkey5, prkey6);
}
/*

8
src/cmd/dict/pcollins.c
View file

@ -8,7 +8,7 @@
* format (with tags surrounded by >....<)
*/
enum {
Buflen=1000,
Buflen=1000
};
/* More special runes */
@ -19,7 +19,7 @@ enum {
Ps, /* pronunciation start */
Pe, /* pronunciation end */
R, /* roman */
X, /* headword end */
X /* headword end */
};
/* Assoc tables must be sorted on first field */
@ -53,7 +53,7 @@ static Assoc tagtab[] = {
{"um", LUML},
{"{", Ps},
{"~", 0x7e},
{"~~", MTT},
{"~~", MTT}
};
static Rune normtab[128] = {
@ -73,7 +73,7 @@ static Rune normtab[128] = {
/*60*/ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
/*70*/ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE
};
static char *gettag(char *, char *);

6
src/cmd/dict/pcollinsg.c
View file

@ -33,7 +33,7 @@
enum {
IBASE=0x69, /* dotless i */
Taglen=32,
Taglen=32
};
static Rune intab[256] = {
@ -69,7 +69,7 @@ static Rune intab[256] = {
/*E0*/ NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE,
NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE,
/*F0*/ 0x20, 0x20, NONE, NONE, NONE, NONE, NONE, NONE,
NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE,
NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE
};
static Nassoc numtab[] = {
@ -103,7 +103,7 @@ static Nassoc overtab[] = {
{0x3a, LUML},
{'\\', LGRV},
{0x5e, LFRN},
{0x7e, LTIL},
{0x7e, LTIL}
};
static uchar *reach(uchar*, int);

31
src/cmd/dict/pgw.c
View file

@ -6,7 +6,7 @@
enum {
Buflen=1000,
Maxaux=5,
Maxaux=5
};
/* Possible tags */
@ -42,7 +42,7 @@ static Assoc tagtab[] = {
{"pos", Pos},
{"sn", Sn},
{"u", U},
{"wf", Wf},
{"wf", Wf}
};
/* Possible tag auxilliary info */
@ -659,7 +659,7 @@ static Assoc spectab[] = {
{"zced", 0x7a}, /* +cedilla */
{"zeta", 0x3b6},
{"zh", 0x292},
{"zhacek", 0x17e},
{"zhacek", 0x17e}
};
/*
The following special characters don't have close enough
@ -766,7 +766,7 @@ static Rune normtab[128] = {
/*60*/ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
/*70*/ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE
};
#if 0
static Rune phtab[128] = {
@ -786,7 +786,7 @@ static Rune phtab[128] = {
/*60*/ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
/*70*/ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE
};
static Rune grtab[128] = {
/*0*/ /*1*/ /*2*/ /*3*/ /*4*/ /*5*/ /*6*/ /*7*/
@ -805,7 +805,7 @@ static Rune grtab[128] = {
/*60*/ 0x60, 0x3b1, 0x3b2, 0x3be, 0x3b4, 0x3b5, 0x3c6, 0x3b3,
0x3b7, 0x3b9, 0x3c2, 0x3ba, 0x3bb, 0x3bc, 0x3bd, 0x3bf,
/*70*/ 0x3c0, 0x3b8, 0x3c1, 0x3c3, 0x3c4, 0x3c5, 0x76, 0x3c9,
0x3c7, 0x3c8, 0x3b6, 0x7b, 0x7c, 0x7d, 0x7e, NONE,
0x3c7, 0x3c8, 0x3b6, 0x7b, 0x7c, 0x7d, 0x7e, NONE
};
static Rune subtab[128] = {
/*0*/ /*1*/ /*2*/ /*3*/ /*4*/ /*5*/ /*6*/ /*7*/
@ -824,7 +824,7 @@ static Rune subtab[128] = {
/*60*/ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
/*70*/ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE
};
static Rune suptab[128] = {
/*0*/ /*1*/ /*2*/ /*3*/ /*4*/ /*5*/ /*6*/ /*7*/
@ -843,7 +843,7 @@ static Rune suptab[128] = {
/*60*/ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
/*70*/ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE,
0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE
};
#endif
@ -1005,7 +1005,7 @@ pgwnextoff(long fromoff)
return (Boffset(bdict)-n);
}
static char *prkey =
static char *prkey1 =
"KEY TO THE PRONUNCIATION\n"
"\n"
"I. CONSONANTS\n"
@ -1024,6 +1024,8 @@ static char *prkey =
"ʃ ... shop (ʃɒp), dish (dɪʃ)\n"
"tʃ ... chop (tʃɒp), ditch (dɪtʃ)\n"
"ʒ ... vision (ˈvɪʒən), déjeuner (deʒøne)\n"
;
static char *prkey2 =
"dʒ ... judge (dʒʌdʒ)\n"
"ŋ ... singing (ˈsɪŋɪŋ), think (θiŋk)\n"
"ŋg ... finger (ˈfiŋgə(r))\n"
@ -1037,6 +1039,8 @@ static char *prkey =
"c ... Afrikaans baardmannetjie (ˈbaːrtmanəci)\n"
"ɥ ... Fr. cuisine (kɥizin)\n"
"\n"
;
static char *prkey3 =
"II. VOWELS AND DIPTHONGS\n"
"\n"
"Short\n"
@ -1055,6 +1059,8 @@ static char *prkey =
"ɔ ... Fr. homme (ɔm)\n"
"o ... Fr. eau (o)\n"
"ø ... Fr. peu (pø)\n"
;
static char *prkey4 =
"œ ... Fr. boeuf (bœf), coeur (kœr)\n"
"u ... Fr. douce (dus)\n"
"ʏ ... Ger. Müller (ˈmʏlər)\n"
@ -1073,6 +1079,8 @@ static char *prkey =
"øː ... Ger. Goethe (gøːtə)\n"
"yː ... Ger. grün (gryːn)\n"
"\n"
;
static char *prkey5 =
"Nasal\n"
"ɛ˜, æ˜ as in Fr. fin (fɛ˜, fæ˜)\n"
"ã ... Fr. franc (frã)\n"
@ -1090,6 +1098,8 @@ static char *prkey =
"ʊə ... tour (tʊə(r))\n"
"ɔə ... boar (bɔə(r))\n"
"\n"
;
static char *prkey6 =
"III. STRESS\n"
"\n"
"Main stress: ˈ preceding stressed syllable\n"
@ -1101,7 +1111,8 @@ static char *prkey =
void
pgwprintkey(void)
{
Bprint(bout, "%s", prkey);
Bprint(bout, "%s%s%s%s%s%s",
prkey1, prkey2, prkey3, prkey4, prkey5, prkey6);
}
/*

2
src/cmd/dict/robert.c
View file

@ -55,7 +55,7 @@ static Rune intab[256] = {
/*e0*/ 0x3b1, 0xdf, 0x3b3, 0x3c0, 0x3a3, 0x3c3, 0xb5, 0x3c4,
0x3a6, 0x398, 0x3a9, 0x3b4, 0x221e, 0xd8, 0x3b5, 0x2229,
/*f0*/ 0x2261, 0xb1, 0x2265, 0x2264, 0x2320, 0x2321, 0xf7, 0x2248,
0xb0, 0x2219, 0xb7, 0x221a, 0x207f, 0xb2, 0x220e, 0xa0,
0xb0, 0x2219, 0xb7, 0x221a, 0x207f, 0xb2, 0x220e, 0xa0
};
static Rune suptab[256];

4
src/cmd/dict/slang.c
View file

@ -15,7 +15,7 @@ enum {
PR, /* pronunciation */
PS, /* grammar part */
XR, /* cross reference */
XX, /* cross reference (whole entry) */
XX /* cross reference (whole entry) */
};
/* Assoc tables must be sorted on first field */
@ -31,7 +31,7 @@ static Assoc tagtab[] = {
{"pr", PR},
{"ps", PS},
{"xr", XR},
{"xx", XX},
{"xx", XX}
};
static long sget(char *, char *, char **, char **);
static void soutpiece(char *, char *);

4
src/cmd/dict/utils.c
View file

@ -228,7 +228,7 @@ Rune multitab[Nmulti][5] = {
{0x2bd, 0x3c9, 0},
{0x2bc, 0x3c9, 0},
{0x6f, 0x65, 0},
{0x20, 0x20, 0},
{0x20, 0x20, 0}
};
#define risupper(r) (0x41 <= (r) && (r) <= 0x5a)
@ -256,7 +256,7 @@ static Rune latin_fold_tab[] =
'a', 'a', 'a', 'a', 'a', 'a', 'a', 'c',
'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i',
'd', 'n', 'o', 'o', 'o', 'o', 'o', 0 ,
'o', 'u', 'u', 'u', 'u', 'y', 0 , 'y',
'o', 'u', 'u', 'u', 'u', 'y', 0 , 'y'
};
static Rune *ttabstack[20];

4
src/cmd/dict/world.c
View file

@ -56,10 +56,10 @@ static Rune chartab[] = {
/*e0*/ 0x3b1, 0x3b2, 0x3b3, 0x3c0, 0x3a3, 0x3c3, 0xb5, 0x3c4,
0x3a6, 0x398, 0x3a9, 0x3b4, 0x221e, 0xd8, 0x3b5, 0x2229,
/*f0*/ 0x2261, 0xb1, 0x2265, 0x2264, 0x2320, 0x2321, 0xf7, 0x2248,
0xb0, 0x2219, 0xb7, NONE, NONE, NONE, NONE, NONE,
0xb0, 0x2219, 0xb7, NONE, NONE, NONE, NONE, NONE
};
enum{ Utf, Kanahi, Kanalo=Kanahi+1, GBhi, GBlo=GBhi+1, };
enum{ Utf, Kanahi, Kanalo=Kanahi+1, GBhi, GBlo=GBhi+1 };
void
worldprintentry(Entry e, int cmd)