From fa325e9b42b0bdfb48857d1958d9fb7ceac55151 Mon Sep 17 00:00:00 2001 From: Dan Cross Date: Fri, 10 Jan 2020 14:44:21 +0000 Subject: Trivial changes: whitespace and modes. Remote whitespace at the ends of lines. Remove blank lines from the ends of files. Change modes on source files so that they are not executable. Signed-off-by: Dan Cross --- src/cmd/dict/dict.c | 6 +++--- src/cmd/dict/oed.c | 10 +++++----- src/cmd/dict/pcollinsg.c | 4 ++-- src/cmd/dict/pgw.c | 10 +++++----- src/cmd/dict/roget.c | 6 +++--- src/cmd/dict/world.c | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/cmd/dict') diff --git a/src/cmd/dict/dict.c b/src/cmd/dict/dict.c index d9cdca62..3c8597c6 100644 --- a/src/cmd/dict/dict.c +++ b/src/cmd/dict/dict.c @@ -678,7 +678,7 @@ setdotprev(void) /* * find the specified file and return a path. - * default location is #9/dict, but can be + * default location is #9/dict, but can be * in $dictdir instead. */ char* @@ -686,12 +686,12 @@ dictfile(char *f) { static char *dict; static int did; - + if(!did){ dict = getenv("dictpath"); did = 1; } - + if(dict) return smprint("%s/%s", dict, f); return unsharp(smprint("#9/dict/%s", f)); diff --git a/src/cmd/dict/oed.c b/src/cmd/dict/oed.c index 81efe829..5161456f 100644 --- a/src/cmd/dict/oed.c +++ b/src/cmd/dict/oed.c @@ -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 @@ -1253,7 +1253,7 @@ static char *prkey1 = "tʃ ... chop (tʃɒp), ditch (dɪtʃ)\n" "ʒ ... vision (ˈvɪʒən), déjeuner (deʒøne)\n" ; -static char *prkey2 = +static char *prkey2 = "dʒ ... judge (dʒʌdʒ)\n" "ŋ ... singing (ˈsɪŋɪŋ), think (θiŋk)\n" "ŋg ... finger (ˈfiŋgə(r))\n" @@ -1268,7 +1268,7 @@ static char *prkey2 = "ɥ ... Fr. cuisine (kɥizin)\n" "\n" ; -static char *prkey3 = +static char *prkey3 = "II. VOWELS AND DIPTHONGS\n" "\n" "Short\n" @@ -1308,7 +1308,7 @@ static char *prkey4 = "yː ... Ger. grün (gryːn)\n" "\n" ; -static char *prkey5 = +static char *prkey5 = "Nasal\n" "ɛ˜, æ˜ as in Fr. fin (fɛ˜, fæ˜)\n" "ã ... Fr. franc (frã)\n" @@ -1327,7 +1327,7 @@ static char *prkey5 = "ɔə ... boar (bɔə(r))\n" "\n" ; -static char *prkey6 = +static char *prkey6 = "III. STRESS\n" "\n" "Main stress: ˈ preceding stressed syllable\n" diff --git a/src/cmd/dict/pcollinsg.c b/src/cmd/dict/pcollinsg.c index cbdff9e6..16a8a913 100644 --- a/src/cmd/dict/pcollinsg.c +++ b/src/cmd/dict/pcollinsg.c @@ -142,7 +142,7 @@ pcollgprintentry(Entry e, int cmd) case TAGE: /* an extra one */ break; - + case SPCS: p = reach(p, 0xba); r = looknassoc(numtab, asize(numtab), strtol(tag,0,0)); @@ -183,7 +183,7 @@ pcollgprintentry(Entry e, int cmd) rprev = r; } } - + } if(rprev != NONE) outrune(rprev); diff --git a/src/cmd/dict/pgw.c b/src/cmd/dict/pgw.c index 8cdaec35..5c93382a 100644 --- a/src/cmd/dict/pgw.c +++ b/src/cmd/dict/pgw.c @@ -993,7 +993,7 @@ pgwnextoff(long fromoff) if(c == '<' && Bgetc(bdict) == 'p' && Bgetc(bdict) == '>') { c = Bgetc(bdict); if(c == '<') { - if (Bgetc(bdict) == 'h' && Bgetc(bdict) == 'w' + if (Bgetc(bdict) == 'h' && Bgetc(bdict) == 'w' && Bgetc(bdict) == '>') n = 7; }else if (c == '{') @@ -1025,7 +1025,7 @@ static char *prkey1 = "tʃ ... chop (tʃɒp), ditch (dɪtʃ)\n" "ʒ ... vision (ˈvɪʒən), déjeuner (deʒøne)\n" ; -static char *prkey2 = +static char *prkey2 = "dʒ ... judge (dʒʌdʒ)\n" "ŋ ... singing (ˈsɪŋɪŋ), think (θiŋk)\n" "ŋg ... finger (ˈfiŋgə(r))\n" @@ -1040,7 +1040,7 @@ static char *prkey2 = "ɥ ... Fr. cuisine (kɥizin)\n" "\n" ; -static char *prkey3 = +static char *prkey3 = "II. VOWELS AND DIPTHONGS\n" "\n" "Short\n" @@ -1080,7 +1080,7 @@ static char *prkey4 = "yː ... Ger. grün (gryːn)\n" "\n" ; -static char *prkey5 = +static char *prkey5 = "Nasal\n" "ɛ˜, æ˜ as in Fr. fin (fɛ˜, fæ˜)\n" "ã ... Fr. franc (frã)\n" @@ -1099,7 +1099,7 @@ static char *prkey5 = "ɔə ... boar (bɔə(r))\n" "\n" ; -static char *prkey6 = +static char *prkey6 = "III. STRESS\n" "\n" "Main stress: ˈ preceding stressed syllable\n" diff --git a/src/cmd/dict/roget.c b/src/cmd/dict/roget.c index d9536365..6562315f 100644 --- a/src/cmd/dict/roget.c +++ b/src/cmd/dict/roget.c @@ -23,7 +23,7 @@ rogetprintentry(Entry e, int cmd) while(strncmp(p, " -- ", 4) != 0 && p < e.end){ while(isspace((uchar)*p) && p < e.end) p++; - if (*p == '[' || *p == '{'){ + if (*p == '[' || *p == '{'){ c = (*p == '[')? ']': '}'; while(*p != c && p < e.end) p++; @@ -49,7 +49,7 @@ rogetprintentry(Entry e, int cmd) outchar(*p++); } return; - } + } while(p < e.end && !isspace((uchar)*p)) p++; @@ -62,7 +62,7 @@ rogetprintentry(Entry e, int cmd) p += 4; spc = 0; } - + if (p < e.end -2 && strncmp(p, "[ ", 4) == 0){ /* twiddle layout */ outchars(" ["); continue; diff --git a/src/cmd/dict/world.c b/src/cmd/dict/world.c index 6ead3ed6..c25a31c0 100644 --- a/src/cmd/dict/world.c +++ b/src/cmd/dict/world.c @@ -50,7 +50,7 @@ static Rune chartab[] = { 0x26a, 0xf0, 0x292, 0xe3, 0x153, 0x169, 0x28c, 0x265, /*c0*/ 0x280, 0xeb, 0x6c, 0x28c, 0xf5, 0xf1, 0x152, NONE, NONE, 0x53, 0x73, 0x5a, 0x7a, NONE, NONE, NONE, -/*d0*/ 0xdf, NONE, NONE, 0x101, 0x12b, 0x16b, 0x113, 0x14d, +/*d0*/ 0xdf, NONE, NONE, 0x101, 0x12b, 0x16b, 0x113, 0x14d, NONE, NONE, NONE, 0x20, NONE, NONE, NONE, NONE, /*e0*/ 0x3b1, 0x3b2, 0x3b3, 0x3c0, 0x3a3, 0x3c3, 0xb5, 0x3c4, -- cgit v1.2.3