diff options
Diffstat (limited to 'src/cmd')
700 files changed, 4647 insertions, 4966 deletions
diff --git a/src/cmd/9660/boot.c b/src/cmd/9660/boot.c index 9cae9582..c7d72848 100644 --- a/src/cmd/9660/boot.c +++ b/src/cmd/9660/boot.c @@ -42,7 +42,7 @@ g% cdsector 3149 | xd -b # 0x0c4d 55 aa - magic 0000020 88 - 88 = bootable - 03 - 3 = 2.88MB diskette + 03 - 3 = 2.88MB diskette 00 00 - load segment 0 means default 0x7C0 00 - system type (byte 5 of boot image) 00 - unused (0) @@ -58,13 +58,13 @@ g% cdsector `{h2d 0c4e} | xd -b 1+0 records out 0000000 eb 3c 00 00 00 00 00 00 00 00 00 00 02 00 00 00 0000010 00 00 00 00 00 00 00 00 12 00 02 00 00 00 00 00 -0000020 00 00 00 00 00 16 1f 66 6a 00 51 50 06 53 +0000020 00 00 00 00 00 16 1f 66 6a 00 51 50 06 53 31 c0 FREEBSD 0000000 eb 3c 00 00 00 00 00 00 00 00 00 00 02 00 00 00 0000010 00 00 00 00 00 00 00 00 12 00 02 00 00 00 00 00 -0000020 00 00 00 00 00 16 1f 66 6a 00 51 50 06 53 +0000020 00 00 00 00 00 16 1f 66 6a 00 51 50 06 53 31 c0 DOS 5 @@ -171,7 +171,7 @@ Cupdatebootcat(Cdimg *cd) Cputc(cd, 0); /* unused */ Cputnl(cd, 1, 2); /* 512-byte sector count for load */ Cputnl(cd, cd->bootdirec->block, 4); /* ptr to disk image */ - Cwseek(cd, o); + Cwseek(cd, o); } void diff --git a/src/cmd/9660/cdrdwr.c b/src/cmd/9660/cdrdwr.c index 757bfcd9..786b798f 100644 --- a/src/cmd/9660/cdrdwr.c +++ b/src/cmd/9660/cdrdwr.c @@ -125,7 +125,7 @@ opencd(char *file, Cdinfo info) } /* lowercase because of isostring */ - if(strstr(cd->iso.systemid, "iso9660") == nil + if(strstr(cd->iso.systemid, "iso9660") == nil && strstr(cd->iso.systemid, "utf8") == nil) { werrstr("unknown systemid %s", cd->iso.systemid); free(cd); @@ -133,7 +133,7 @@ opencd(char *file, Cdinfo info) close(xfd); return nil; } - + if(strstr(cd->iso.systemid, "plan 9")) cd->flags |= CDplan9; if(strstr(cd->iso.systemid, "iso9660")) @@ -307,7 +307,7 @@ parsedesc(Voldesc *v, Cvoldesc *cv, char *(*string)(uchar*, int)) v->biblio = string(cv->biblio, sizeof cv->biblio); v->notice = string(cv->notice, sizeof cv->notice); } - + static int readisodesc(Cdimg *cd, Voldesc *v) { @@ -629,4 +629,3 @@ Clinelen(Cdimg *cd) { return Blinelen(&cd->brd); } - diff --git a/src/cmd/9660/direc.c b/src/cmd/9660/direc.c index 8185f680..e67f0cb7 100644 --- a/src/cmd/9660/direc.c +++ b/src/cmd/9660/direc.c @@ -86,9 +86,9 @@ walkdirec(Direc *d, char *name) * Add the file ``name'' with attributes d to the * directory ``root''. Name may contain multiple * elements; all but the last must exist already. - * + * * The child lists are kept sorted by utfname. - */ + */ Direc* adddirec(Direc *root, char *name, XDir *d) { @@ -130,7 +130,7 @@ adddirec(Direc *root, char *name, XDir *d) return nd; } -/* +/* * Copy the tree src into dst. */ void @@ -219,4 +219,3 @@ dsort(Direc *d, int (*cmp)(const void*, const void*)) for(i=0; i<n; i++) dsort(&d->child[i], cmp); } - diff --git a/src/cmd/9660/dump.c b/src/cmd/9660/dump.c index d3504ff9..ad762f21 100644 --- a/src/cmd/9660/dump.c +++ b/src/cmd/9660/dump.c @@ -348,7 +348,7 @@ adddumpdir(Direc *root, ulong now, XDir *dir) Tm tm; tm = *localtime(now); - + sprint(buf, "%d", tm.year+1900); if((dyear = walkdirec(root, buf)) == nil) { dyear = adddirec(root, buf, dir); @@ -406,7 +406,7 @@ hasdump(Cdimg *cd) } return 0; } - + Direc readdumpdirs(Cdimg *cd, XDir *dir, char *(*cvt)(uchar*, int)) { @@ -500,7 +500,7 @@ readdumpconform(Cdimg *cd) if(tokenize(p, f, 2) != 2 || (f[0][0] != 'D' && f[0][0] != 'F') || strlen(f[0]) != 7 || !isalldigit(f[0]+1)) break; - + addtx(atom(f[1]), atom(f[0])); } } diff --git a/src/cmd/9660/dump9660.c b/src/cmd/9660/dump9660.c index 4e66bd78..59ee31c0 100644 --- a/src/cmd/9660/dump9660.c +++ b/src/cmd/9660/dump9660.c @@ -168,7 +168,7 @@ main(int argc, char **argv) Cwseek(cd, cd->nextblock*Blocksize); goto Dofix; } - + dumpname = adddumpdir(&idumproot, now, &dir); /* note that we assume all names are conforming and thus sorted */ if(cd->flags & CDjoliet) { @@ -192,7 +192,7 @@ main(int argc, char **argv) findbootimage(cd, &iroot); Cupdatebootcat(cd); } - + /* create Joliet tree */ if(cd->flags & CDjoliet) copydirec(&jroot, &iroot); @@ -235,14 +235,14 @@ main(int argc, char **argv) * Write incremental _conform.map block. */ wrconform(cd, cd->nconform, &cblock, &clength); - + /* jump here if we're just fixing up the cd */ Dofix: /* - * Write null dump header block; everything after this will be + * Write null dump header block; everything after this will be * overwritten at the next dump. Because of this, it needs to be * reconstructable. We reconstruct the _conform.map and dump trees - * from the header blocks in dump.c, and we reconstruct the path + * from the header blocks in dump.c, and we reconstruct the path * tables by walking the cd. */ newnull = Cputdumpblock(cd); @@ -254,12 +254,12 @@ Dofix: dir.mode = 0444; if(cd->flags & (CDconform|CDjoliet)) { if(!mk9660 && cd->nconform == 0){ - block = cblock; + block = cblock; length = clength; }else wrconform(cd, 0, &block, &length); - if(mk9660) + if(mk9660) { idumproot = iroot; jdumproot = jroot; @@ -315,11 +315,11 @@ Dofix: copybutname(r, &jroot); } } - + writedumpdirs(cd, &idumproot, Cputisodir); if(cd->flags & CDjoliet) writedumpdirs(cd, &jdumproot, Cputjolietdir); - + /* * Patch in new root directory entry. */ @@ -330,7 +330,7 @@ Dofix: setvolsize(cd, cd->jolietsvd, cd->nextblock*Blocksize); } } - writepathtables(cd); + writepathtables(cd); if(!mk9660){ /* @@ -341,16 +341,16 @@ Dofix: if(cd->nulldump && maxsize && Cwoffset(cd) > maxsize){ fprint(2, "too big; writing old tree back\n"); status = "cd too big; aborted"; - + rmdumpdir(&idumproot, dumpname); rmdumpdir(&jdumproot, dumpname); - + cd->nextblock = cd->nulldump+1; cd->nulldump = 0; Cwseek(cd, cd->nextblock*Blocksize); goto Dofix; } - + /* * Write old null header block; this commits all our changes. */ @@ -399,4 +399,3 @@ addprotofile(char *new, char *old, Dir *d, void *a) free(name); } - diff --git a/src/cmd/9660/ichar.c b/src/cmd/9660/ichar.c index 3b2b5367..ef2944ce 100644 --- a/src/cmd/9660/ichar.c +++ b/src/cmd/9660/ichar.c @@ -31,7 +31,7 @@ isostring(uchar *buf, int len) return q; } -int +int isisofrog(char c) { if(c >= '0' && c <= '9') @@ -85,7 +85,7 @@ isbadiso9660(char *s) /* * ISO9660 name comparison - * + * * The standard algorithm is as follows: * Take the filenames without extensions, pad the shorter with 0x20s (spaces), * and do strcmp. If they are equal, go on. @@ -169,7 +169,7 @@ Cputisopvd(Cdimg *cd, Cdinfo info) strcat(buf, "iso9660"); else strcat(buf, "utf8"); - + struprcpy(buf, buf); Cputs(cd, buf, 32); diff --git a/src/cmd/9660/iso9660.h b/src/cmd/9660/iso9660.h index b5131a27..c08b2caa 100644 --- a/src/cmd/9660/iso9660.h +++ b/src/cmd/9660/iso9660.h @@ -89,7 +89,7 @@ struct Voldesc { ulong mpathloc; /* root of file tree */ - Direc root; + Direc root; }; /* @@ -116,7 +116,7 @@ struct Cdimg { ulong bootimageptr; Direc *bootdirec; char *bootimage; - + Biobuf brd; Biobuf bwr; @@ -406,7 +406,7 @@ int Cputisodir(Cdimg*, Direc*, int, int, int); int Cputjolietdir(Cdimg*, Direc*, int, int, int); void Cputendvd(Cdimg*); -enum { +enum { Blocksize = 2048, Ndirblock = 16, /* directory blocks allocated at once */ diff --git a/src/cmd/9660/jchar.c b/src/cmd/9660/jchar.c index ccd3b6db..fbabf26d 100644 --- a/src/cmd/9660/jchar.c +++ b/src/cmd/9660/jchar.c @@ -26,15 +26,15 @@ jolietstring(uchar *buf, int len) } /* - * Joliet name validity check - * + * Joliet name validity check + * * Joliet names have length at most 128 bytes (64 runes), * and cannot contain '*', '/', ':', ';', '?', or '\'. */ int isjolietfrog(Rune r) { - return r=='*' || r=='/' || r==':' + return r=='*' || r=='/' || r==':' || r==';' || r=='?' || r=='\\'; } @@ -58,7 +58,7 @@ isbadjoliet(char *s) * The standard algorithm is the ISO9660 algorithm but * on the encoded Runes. Runes are encoded in big endian * format, so we can just use runecmp. - * + * * Padding is with zeros, but that still doesn't affect us. */ @@ -135,4 +135,3 @@ Cputjolietsvd(Cdimg *cd, Cdinfo info) Cputc(cd, 1); /* file structure version */ Cpadblock(cd); } - diff --git a/src/cmd/9660/path.c b/src/cmd/9660/path.c index f2757dba..effc44b1 100644 --- a/src/cmd/9660/path.c +++ b/src/cmd/9660/path.c @@ -9,7 +9,7 @@ * Add the requisite path tables to the CD image. * They get put on the end once everything else is done. * We use the path table itself as a queue in the breadth-first - * traversal of the tree. + * traversal of the tree. * * The only problem with this is that the path table does not * store the lengths of the directories. So we keep an explicit diff --git a/src/cmd/9660/rune.c b/src/cmd/9660/rune.c index 3a436f4a..8b03f282 100644 --- a/src/cmd/9660/rune.c +++ b/src/cmd/9660/rune.c @@ -36,4 +36,3 @@ runecmp(Rune *s, Rune *t) s++, t++; return *s - *t; } - diff --git a/src/cmd/9660/sysuse.c b/src/cmd/9660/sysuse.c index 78716524..3039b360 100644 --- a/src/cmd/9660/sysuse.c +++ b/src/cmd/9660/sysuse.c @@ -43,11 +43,11 @@ setcelen(Cdimg *cd, ulong woffset, ulong len) * Rock Ridge data is put into little blockettes, which can be * at most 256 bytes including a one-byte length. Some number * of blockettes get packed together into a normal 2048-byte block. - * Blockettes cannot cross block boundaries. + * Blockettes cannot cross block boundaries. * - * A Cbuf is a blockette buffer. Len contains + * A Cbuf is a blockette buffer. Len contains * the length of the buffer written so far, and we can - * write up to 254-28. + * write up to 254-28. * * We only have one active Cbuf at a time; cdimg.rrcontin is the byte * offset of the beginning of that Cbuf. @@ -94,7 +94,7 @@ ensurespace(Cdimg *cd, int n, Cbuf *co, Cbuf *cn, int dowrite) /* * the current blockette is full; update cd->rrcontin and then - * write a CE record to finish it. Unfortunately we need to + * write a CE record to finish it. Unfortunately we need to * figure out which block will be next before we write the CE. */ end = Cwoffset(cd)+28; @@ -134,13 +134,13 @@ ensurespace(Cdimg *cd, int n, Cbuf *co, Cbuf *cn, int dowrite) return cn; } - + /* * Put down the name, but we might need to break it * into chunks so that each chunk fits in 254-28-5 bytes. * What a crock. * - * The new Plan 9 format uses strings of this form too, + * The new Plan 9 format uses strings of this form too, * since they're already there. */ Cbuf* @@ -211,7 +211,7 @@ Cputsysuse(Cdimg *cd, Direc *d, int dot, int dowrite, int initlen) what |= RR_SL; m = CputsuspRR(cd, what, 0); - cp = ensurespace(cd, m, cp, &cn, dowrite); + cp = ensurespace(cd, m, cp, &cn, dowrite); CputsuspRR(cd, what, dowrite); if(what & RR_PX) { @@ -235,7 +235,7 @@ Cputsysuse(Cdimg *cd, Direc *d, int dot, int dowrite, int initlen) /* * Put down the symbolic link. This is even more of a crock. - * Not only are the individual elements potentially split, + * Not only are the individual elements potentially split, * but the whole path itself can be split across SL blocks. * To keep the code simple as possible (really), we write * only one element per SL block, wasting 6 bytes per element. @@ -382,7 +382,7 @@ CputsuspSP(Cdimg *cd, int dowrite) { assert(cd!=0); - if(dowrite) { + if(dowrite) { chat("writing SUSP SP record\n"); Cputc(cd, 'S'); /* SP field marker */ Cputc(cd, 'P'); @@ -406,7 +406,7 @@ CputsuspST(Cdimg *cd, int dowrite) Cputc(cd, 'S'); /* ST field marker */ Cputc(cd, 'T'); Cputc(cd, 4); /* Length */ - Cputc(cd, 1); /* Version */ + Cputc(cd, 1); /* Version */ } return 4; } @@ -484,7 +484,7 @@ CputrripPX(Cdimg *cd, Direc *d, int dot, int dowrite) Cputc(cd, 'X'); Cputc(cd, 36); /* Length */ Cputc(cd, 1); /* Version */ - + Cputn(cd, mode(d, dot), 4); /* POSIX File mode */ Cputn(cd, nlink(d), 4); /* POSIX st_nlink */ Cputn(cd, d?d->uidno:0, 4); /* POSIX st_uid */ @@ -514,7 +514,7 @@ CputrripTF(Cdimg *cd, Direc *d, int type, int dowrite) Cputc(cd, 5+7*length); /* Length */ Cputc(cd, 1); /* Version */ Cputc(cd, type); /* Flags (types) */ - + if (type & TFcreation) Cputdate(cd, d?d->ctime:0); if (type & TFmodify) @@ -523,7 +523,7 @@ CputrripTF(Cdimg *cd, Direc *d, int type, int dowrite) Cputdate(cd, d?d->atime:0); if (type & TFattributes) Cputdate(cd, d?d->ctime:0); - + /* if (type & TFbackup) */ /* Cputdate(cd, 0); */ /* if (type & TFexpiration) */ @@ -566,7 +566,7 @@ static long mode(Direc *d, int dot) { long mode; - + if (!d) return 0; @@ -582,13 +582,13 @@ mode(Direc *d, int dot) mode = S_IFDIR | (0755); mode &= POSIXMODEMASK; - + /* Botch: not all POSIX types supported yet */ assert(mode & (S_IFDIR|S_IFREG)); -chat("writing PX record mode field %ulo with dot %d and name \"%s\"\n", mode, dot, d->name); +chat("writing PX record mode field %ulo with dot %d and name \"%s\"\n", mode, dot, d->name); - return mode; + return mode; } static long @@ -610,4 +610,3 @@ nlink(Direc *d) /* Trump up the nlink field for POSIX compliance */ return n; } - diff --git a/src/cmd/9660/util.c b/src/cmd/9660/util.c index ebf944e2..d3182775 100644 --- a/src/cmd/9660/util.c +++ b/src/cmd/9660/util.c @@ -39,7 +39,7 @@ atom(char *str) { uint h; Stringtab *tab; - + h = hash(str) % nelem(stab); for(tab=stab[h]; tab; tab=tab->link) if(strcmp(str, tab->str) == 0) diff --git a/src/cmd/9660/write.c b/src/cmd/9660/write.c index 94405317..652927ca 100644 --- a/src/cmd/9660/write.c +++ b/src/cmd/9660/write.c @@ -90,7 +90,7 @@ writefiles(Dump *d, Cdimg *cd, Direc *direc) assert(start != 0); Cwseek(cd, start*Blocksize); - + s = md5(nil, 0, nil, nil); length = 0; while((n = Bread(b, buf, sizeof buf)) > 0) { @@ -123,7 +123,7 @@ writefiles(Dump *d, Cdimg *cd, Direc *direc) } /* - * Write a directory tree. We work from the leaves, + * Write a directory tree. We work from the leaves, * and patch the dotdot pointers afterward. */ static void diff --git a/src/cmd/9660srv/iobuf.c b/src/cmd/9660srv/iobuf.c index 01acd06a..a0b934c0 100644 --- a/src/cmd/9660srv/iobuf.c +++ b/src/cmd/9660srv/iobuf.c @@ -14,7 +14,7 @@ * tarring up a Plan 9 distribution CD, we now use 16 128kb * buffers. This works for ISO9660 because data is required * to be laid out contiguously; effectively we're doing agressive - * readahead. Because the buffers are so big and the typical + * readahead. Because the buffers are so big and the typical * disk accesses so concentrated, it's okay that we have so few * of them. * diff --git a/src/cmd/9660srv/main.c b/src/cmd/9660srv/main.c index 44fdc512..d4c32b8f 100644 --- a/src/cmd/9660srv/main.c +++ b/src/cmd/9660srv/main.c @@ -138,13 +138,13 @@ main(int argc, char **argv) open("/dev/null", OWRITE); if(pipe(pipefd) < 0) panic(1, "pipe"); - + if(post9pservice(pipefd[0], srvname, mtpt) < 0) sysfatal("post9pservice: %r"); close(pipefd[0]); } srvfd = pipefd[1]; - + switch(rfork(RFNOWAIT|RFNOTEG|RFFDG|RFPROC)){ case -1: panic(1, "fork"); diff --git a/src/cmd/9660srv/xfile.c b/src/cmd/9660srv/xfile.c index c46adf21..bebf0986 100644 --- a/src/cmd/9660srv/xfile.c +++ b/src/cmd/9660srv/xfile.c @@ -167,4 +167,3 @@ clean(Xfile *f) f->qid = (Qid){0,0,0}; return f; } - diff --git a/src/cmd/9p.c b/src/cmd/9p.c index c8d4c444..75511a19 100644 --- a/src/cmd/9p.c +++ b/src/cmd/9p.c @@ -94,7 +94,7 @@ threadmain(int argc, char **argv) threadexitsall(0); } } - usage(); + usage(); } CFsys* @@ -168,7 +168,7 @@ xread(int argc, char **argv) fsclose(fid); if(n < 0) sysfatal("read error: %r"); - threadexitsall(0); + threadexitsall(0); } void @@ -192,7 +192,7 @@ xreadfd(int argc, char **argv) sysfatal("write error: %r"); if(n < 0) sysfatal("read error: %r"); - threadexitsall(0); + threadexitsall(0); } void @@ -246,7 +246,7 @@ xwrite(int argc, char **argv) if(n < 0) sysfatal("read error: %r"); fsclose(fid); - threadexitsall(0); + threadexitsall(0); } void @@ -270,7 +270,7 @@ xwritefd(int argc, char **argv) sysfatal("write error: %r"); if(n < 0) sysfatal("read error: %r"); - threadexitsall(0); + threadexitsall(0); } void @@ -331,7 +331,7 @@ xrdwr(int argc, char **argv) fprint(2, "write: %r\n"); } fsclose(fid); - threadexitsall(0); + threadexitsall(0); } void @@ -346,10 +346,10 @@ xcreate(int argc, char **argv) default: usage(); }ARGEND - + if(argc == 0) usage(); - + for(i=0; i<argc; i++){ fs = xparse(argv[i], &p); if((fid=fscreate(fs, p, OREAD, 0666)) == nil) @@ -371,10 +371,10 @@ xrm(int argc, char **argv) default: usage(); }ARGEND - + if(argc == 0) usage(); - + for(i=0; i<argc; i++){ fs = xparse(argv[i], &p); if(fsremove(fs, p) < 0) @@ -389,7 +389,7 @@ rdcon(void *v) int n; char buf[4096]; CFid *fid; - + fid = v; for(;;){ n = read(0, buf, sizeof buf); @@ -408,7 +408,7 @@ xcon(int argc, char **argv) char buf[4096], *r, *w, *e; int n, nocr; CFid *fid; - + nocr = 1; ARGBEGIN{ @@ -438,12 +438,12 @@ xcon(int argc, char **argv) threadexitsall(0); } fsclose(fid); - threadexitsall(0); + threadexitsall(0); } -static char *mon[] = +static char *mon[] = { - "Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; @@ -454,7 +454,7 @@ timefmt(Fmt *fmt) ulong u; static ulong time0; Tm *tm; - + if(time0 == 0) time0 = time(0); u = va_arg(fmt->args, ulong); @@ -470,7 +470,7 @@ static int dircmp(const void *va, const void *vb) { Dir *a, *b; - + a = (Dir*)va; b = (Dir*)vb; return strcmp(a->name, b->name); @@ -480,7 +480,7 @@ static int timecmp(const void *va, const void *vb) { Dir *a, *b; - + a = (Dir*)va; b = (Dir*)vb; if(a->mtime < b->mtime) @@ -520,12 +520,12 @@ xls(int argc, char **argv) tflag = 1; break; }ARGEND - + fmtinstall('D', dirfmt); fmtinstall('M', dirmodefmt); quotefmtinstall(); fmtinstall('T', timefmt); - + if(argc == 0){ argv = dot; argc = 1; @@ -600,4 +600,3 @@ xls(int argc, char **argv) } threadexitsall(err); } - diff --git a/src/cmd/9pfuse/errstr.c b/src/cmd/9pfuse/errstr.c index e03d9589..e3a122e4 100644 --- a/src/cmd/9pfuse/errstr.c +++ b/src/cmd/9pfuse/errstr.c @@ -55,7 +55,7 @@ errstr2errno(void) { char e[ERRMAX]; int i, len; - + if(errno != EPLAN9) return errno; @@ -70,4 +70,3 @@ errstr2errno(void) return errortab[i].err; return ERANGE; /* who knows - be blatantly wrong */ } - diff --git a/src/cmd/9pfuse/fuse.c b/src/cmd/9pfuse/fuse.c index 66f66065..4c9aac9b 100644 --- a/src/cmd/9pfuse/fuse.c +++ b/src/cmd/9pfuse/fuse.c @@ -15,7 +15,7 @@ allocfusemsg(void) { FuseMsg *m; void *vbuf; - + lock(&fusemsglock); if((m = fusemsglist) != nil){ fusemsglist = m->next; @@ -46,7 +46,7 @@ readfusemsg(void) { FuseMsg *m; int n, nn; - + m = allocfusemsg(); /* * The FUSE kernel device apparently guarantees @@ -84,7 +84,7 @@ readfusemsg(void) sysfatal("readfusemsg: got %d wanted %d", n, m->hdr->len); m->hdr->len -= sizeof(*m->hdr); - + /* * Paranoia. * Make sure lengths are long enough. @@ -125,7 +125,7 @@ readfusemsg(void) if(((char*)m->tx)[m->hdr->len-1] != 0 || memchr(m->tx, 0, m->hdr->len-1) == 0) goto bad; - break; + break; case FUSE_MKNOD: if(m->hdr->len <= sizeof(struct fuse_mknod_in) || ((char*)m->tx)[m->hdr->len-1] != 0) @@ -219,7 +219,7 @@ readfusemsg(void) } /* - * Reply to FUSE request m using additonal + * Reply to FUSE request m using additonal * argument buffer arg of size narg bytes. * Perhaps should free the FuseMsg here? */ @@ -229,7 +229,7 @@ replyfuse(FuseMsg *m, void *arg, int narg) struct iovec vec[2]; struct fuse_out_header hdr; int nvec; - + hdr.len = sizeof hdr + narg; hdr.error = 0; hdr.unique = m->hdr->unique; @@ -255,7 +255,7 @@ void replyfuseerrno(FuseMsg *m, int e) { struct fuse_out_header hdr; - + hdr.len = sizeof hdr; hdr.error = -e; /* FUSE sends negative errnos. */ hdr.unique = m->hdr->unique; @@ -307,12 +307,12 @@ initfuse(char *mtpt) /* * Complain if the kernel is too new. * We could forge ahead, but at least the one time I tried, - * the kernel rejected the newer version by making the + * the kernel rejected the newer version by making the * writev fail in replyfuse, which is a much more confusing - * error message. In the future, might be nice to try to + * error message. In the future, might be nice to try to * support older versions that differ only slightly. */ - if(tx->major < FUSE_KERNEL_VERSION + if(tx->major < FUSE_KERNEL_VERSION || (tx->major == FUSE_KERNEL_VERSION && tx->minor < FUSE_KERNEL_MINOR_VERSION)) sysfatal("fuse: too kernel version %d.%d older than program version %d.%d", tx->major, tx->minor, FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION); @@ -386,7 +386,7 @@ fusefmt(Fmt *fmt) } case FUSE_SYMLINK: { char *old, *new; - + old = a; new = a + strlen(a) + 1; fmtprint(fmt, "Symlink nodeid %#llux old %#q new %#q", @@ -455,7 +455,7 @@ fusefmt(Fmt *fmt) case FUSE_RELEASE: { struct fuse_release_in *tx = a; fmtprint(fmt, "Release nodeid %#llux fh %#llux flags %#ux", - hdr->nodeid, tx->fh, tx->flags); + hdr->nodeid, tx->fh, tx->flags); break; } case FUSE_FSYNC: { @@ -516,7 +516,7 @@ fusefmt(Fmt *fmt) case FUSE_RELEASEDIR: { struct fuse_release_in *tx = a; fmtprint(fmt, "Releasedir nodeid %#llux fh %#llux flags %#ux", - hdr->nodeid, tx->fh, tx->flags); + hdr->nodeid, tx->fh, tx->flags); break; } case FUSE_FSYNCDIR: { @@ -554,7 +554,7 @@ fusefmt(Fmt *fmt) case FUSE_LOOKUP: { /* * For a negative entry, can send back ENOENT - * or rx->ino == 0. + * or rx->ino == 0. * In protocol version 7.4 and before, can only use * the ENOENT method. * Presumably the benefit of sending rx->ino == 0 @@ -571,7 +571,7 @@ fusefmt(Fmt *fmt) rx->attr_valid+rx->attr_valid_nsec*1e-9); fmtprint(fmt, " ino %#llux size %lld blocks %lld atime %.20g mtime %.20g ctime %.20g mode %#uo nlink %d uid %d gid %d rdev %#ux", rx->attr.ino, rx->attr.size, rx->attr.blocks, - rx->attr.atime+rx->attr.atimensec*1e-9, + rx->attr.atime+rx->attr.atimensec*1e-9, rx->attr.mtime+rx->attr.mtimensec*1e-9, rx->attr.ctime+rx->attr.ctimensec*1e-9, rx->attr.mode, rx->attr.nlink, rx->attr.uid, @@ -592,7 +592,7 @@ fusefmt(Fmt *fmt) rx->attr_valid+rx->attr_valid_nsec*1e-9); fmtprint(fmt, " ino %#llux size %lld blocks %lld atime %.20g mtime %.20g ctime %.20g mode %#uo nlink %d uid %d gid %d rdev %#ux", rx->attr.ino, rx->attr.size, rx->attr.blocks, - rx->attr.atime+rx->attr.atimensec*1e-9, + rx->attr.atime+rx->attr.atimensec*1e-9, rx->attr.mtime+rx->attr.mtimensec*1e-9, rx->attr.ctime+rx->attr.ctimensec*1e-9, rx->attr.mode, rx->attr.nlink, rx->attr.uid, @@ -733,7 +733,7 @@ fusefmt(Fmt *fmt) rx->e.attr_valid+rx->e.attr_valid_nsec*1e-9); fmtprint(fmt, " ino %#llux size %lld blocks %lld atime %.20g mtime %.20g ctime %.20g mode %#uo nlink %d uid %d gid %d rdev %#ux", rx->e.attr.ino, rx->e.attr.size, rx->e.attr.blocks, - rx->e.attr.atime+rx->e.attr.atimensec*1e-9, + rx->e.attr.atime+rx->e.attr.atimensec*1e-9, rx->e.attr.mtime+rx->e.attr.mtimensec*1e-9, rx->e.attr.ctime+rx->e.attr.ctimensec*1e-9, rx->e.attr.mode, rx->e.attr.nlink, rx->e.attr.uid, @@ -753,7 +753,7 @@ fusefmt(Fmt *fmt) /* * Mounts a fuse file system on mtpt and returns - * a file descriptor for the corresponding fuse + * a file descriptor for the corresponding fuse * message conversation. */ int @@ -762,7 +762,7 @@ mountfuse(char *mtpt) #if defined(__linux__) int p[2], pid, fd; char buf[20]; - + if(socketpair(AF_UNIX, SOCK_STREAM, 0, p) < 0) return -1; pid = fork(); @@ -783,11 +783,11 @@ mountfuse(char *mtpt) #elif defined(__FreeBSD__) && !defined(__APPLE__) int pid, fd; char buf[20]; - + if((fd = open("/dev/fuse", ORDWR)) < 0) return -1; snprint(buf, sizeof buf, "%d", fd); - + pid = fork(); if(pid < 0) return -1; @@ -903,7 +903,7 @@ mountfuse(char *mtpt) _exit(1); } return fd; - + #else werrstr("cannot mount fuse on this system"); return -1; diff --git a/src/cmd/9pfuse/main.c b/src/cmd/9pfuse/main.c index a3662898..0d4adb08 100644 --- a/src/cmd/9pfuse/main.c +++ b/src/cmd/9pfuse/main.c @@ -14,7 +14,7 @@ * writing the 9P connection. Thus the many threads in the * request proc can do 9P interactions without blocking. */ - + #define _GNU_SOURCE 1 /* for O_DIRECTORY on Linux */ #include "a.h" @@ -165,16 +165,16 @@ init9p(char *addr, char *spec) /* * FUSE uses nodeids to refer to active "struct inodes" * (9P's unopened fids). FUSE uses fhs to refer to active - * "struct fuse_files" (9P's opened fids). The choice of + * "struct fuse_files" (9P's opened fids). The choice of * numbers is up to us except that nodeid 1 is the root directory. - * We use the same number space for both and call the + * We use the same number space for both and call the * bookkeeping structure a FuseFid. * - * FUSE requires nodeids to have associated generation - * numbers. If we reuse a nodeid, we have to bump the + * FUSE requires nodeids to have associated generation + * numbers. If we reuse a nodeid, we have to bump the * generation number to guarantee that the nodeid,gen * combination is never reused. - * + * * There are also inode numbers returned in directory reads * and file attributes, but these do NOT need to match the nodeids. * We use a combination of qid.path and qid.type as the inode @@ -192,7 +192,7 @@ struct Fusefid int id; int gen; int isnodeid; - + /* directory read state */ Dir *d0; Dir *d; @@ -208,7 +208,7 @@ Fusefid* allocfusefid(void) { Fusefid *f; - + if((f = freefusefidlist) == nil){ f = emalloc(sizeof *f); fusefid = erealloc(fusefid, (nfusefid+1)*sizeof *fusefid); @@ -247,7 +247,7 @@ uvlong _alloc(CFid *fid, int isnodeid) { Fusefid *ff; - + ff = allocfusefid(); ff->fid = fid; ff->isnodeid = isnodeid; @@ -283,7 +283,7 @@ CFid* _lookupcfid(uvlong id, int isnodeid) { Fusefid *ff; - + if((ff = lookupfusefid(id, isnodeid)) == nil) return nil; return ff->fid; @@ -360,7 +360,7 @@ fuselookup(FuseMsg *m) CFid *fid, *newfid; Dir *d; struct fuse_entry_out out; - + name = m->tx; if((fid = nodeid2fid(m->hdr->nodeid)) == nil){ replyfuseerrno(m, ESTALE); @@ -392,7 +392,7 @@ fuselookup(FuseMsg *m) /* * Forget. Reference-counted clunk for nodeids. * Does not send a reply. - * Each lookup response gives the kernel an additional reference + * Each lookup response gives the kernel an additional reference * to the returned nodeid. Forget says "drop this many references * to this nodeid". Our fuselookup, when presented with the same query, * does not return the same results (it allocates a new nodeid for each @@ -423,7 +423,7 @@ fuseforget(FuseMsg *m) * Getattr. * Replies with a fuse_attr_out structure giving the * attr for the requested nodeid in out.attr. - * Out.attr_valid and out.attr_valid_nsec give + * Out.attr_valid and out.attr_valid_nsec give * the amount of time that the attributes can * be cached. * @@ -479,7 +479,7 @@ fusesetattr(FuseMsg *m) /* * Special case: Linux issues a size change to * truncate a file before opening it OTRUNC. - * Synthetic file servers (e.g., plumber) honor + * Synthetic file servers (e.g., plumber) honor * open(OTRUNC) but not wstat. */ if(in->valid == FATTR_SIZE && in->size == 0){ @@ -554,7 +554,7 @@ _fuseopenfid(uvlong nodeid, int isdir, int openmode, int *err) *err = errstr2errno(); return nil; } - + if(fsfopen(newfid, openmode) < 0){ *err = errstr2errno(); fsclose(newfid); @@ -617,7 +617,7 @@ _fuseopen(FuseMsg *m, int isdir) return; } out.fh = allocfh(fid); - out.open_flags = FOPEN_DIRECT_IO; /* no page cache */ + out.open_flags = FOPEN_DIRECT_IO; /* no page cache */ replyfuse(m, &out, sizeof out); } @@ -696,7 +696,7 @@ fusemkdir(FuseMsg *m) CFid *fid; int err; char *name; - + in = m->tx; name = (char*)(in+1); if((fid = _fusecreate(m->hdr->nodeid, name, in->mode, 1, OREAD, &out, &err)) == nil){ @@ -716,7 +716,7 @@ fusecreate(FuseMsg *m) CFid *fid; int err, openmode, flags; char *name; - + in = m->tx; flags = in->flags; openmode = in->flags&3; @@ -740,7 +740,7 @@ fusecreate(FuseMsg *m) } /* - * Access. + * Access. * Lib9pclient implements this just as Plan 9 does, * by opening the file (or not) and then closing it. */ @@ -760,7 +760,7 @@ fuseaccess(FuseMsg *m) ORDWR, ORDWR }; - + in = m->tx; if(in->mask >= nelem(a2o)){ replyfuseerrno(m, EINVAL); @@ -791,7 +791,7 @@ fuserelease(FuseMsg *m) { struct fuse_release_in *in; Fusefid *ff; - + in = m->tx; if((ff = lookupfusefid(in->fh, 0)) != nil) freefusefid(ff); @@ -864,7 +864,7 @@ fusereadlink(FuseMsg *m) return; } -/* +/* * Readdir. * Read from file handle in->fh at offset in->offset for size in->size. * We truncate size to maxwrite just to keep the buffer reasonable. @@ -884,12 +884,12 @@ fusereaddir(FuseMsg *m) uchar *buf, *p, *ep; int n; Fusefid *ff; - + in = m->tx; if((ff = lookupfusefid(in->fh, 0)) == nil){ replyfuseerrno(m, ESTALE); return; - } + } if(in->offset == 0){ fsseek(ff->fid, 0, 0); free(ff->d0); @@ -922,7 +922,7 @@ fusereaddir(FuseMsg *m) break; ff->d = ff->d0; } -out: +out: replyfuse(m, buf, p - buf); free(buf); } @@ -958,7 +958,7 @@ canpack(Dir *d, uvlong off, uchar **pp, uchar *ep) uchar *p; struct fuse_dirent *de; int pad, size; - + p = *pp; size = FUSE_NAME_OFFSET + strlen(d->name); pad = 0; @@ -981,7 +981,7 @@ canpack(Dir *d, uvlong off, uchar **pp, uchar *ep) * Write. * Write from file handle in->fh at offset in->offset for size in->size. * Don't know what in->write_flags means. - * + * * Apparently implementations are allowed to buffer these writes * and wait until Flush is sent, but FUSE docs say flush may be * called zero, one, or even more times per close. So better do the @@ -996,7 +996,7 @@ fusewrite(FuseMsg *m) void *a; CFid *fid; int n; - + in = m->tx; a = in+1; if((fid = fh2fid(in->fh)) == nil){ @@ -1018,7 +1018,7 @@ fusewrite(FuseMsg *m) /* * Flush. Supposed to flush any buffered writes. Don't use this. - * + * * Flush is a total crock. It gets called on close() of a file descriptor * associated with this open file. Some open files have multiple file * descriptors and thus multiple closes of those file descriptors. @@ -1027,7 +1027,7 @@ fusewrite(FuseMsg *m) * closed explicitly. For those files, Flush is never called. * Even more amusing, Flush gets called before close() of read-only * file descriptors too! - * + * * This is just a bad idea. */ void @@ -1044,7 +1044,7 @@ _fuseremove(FuseMsg *m, int isdir) { char *name; CFid *fid, *newfid; - + name = m->tx; if((fid = nodeid2fid(m->hdr->nodeid)) == nil){ replyfuseerrno(m, ESTALE); @@ -1105,7 +1105,7 @@ fuserename(FuseMsg *m) char *before, *after; CFid *fid, *newfid; Dir d; - + in = m->tx; if(in->newdir != m->hdr->nodeid){ replyfuseerrno(m, EXDEV); @@ -1146,7 +1146,7 @@ fusefsync(FuseMsg *m) struct fuse_fsync_in *in; CFid *fid; Dir d; - + in = m->tx; if((fid = fh2fid(in->fh)) == nil){ replyfuseerrno(m, ESTALE); @@ -1181,7 +1181,7 @@ void fusestatfs(FuseMsg *m) { struct fuse_statfs_out out; - + memset(&out, 0, sizeof out); replyfuse(m, &out, sizeof out); } @@ -1215,7 +1215,7 @@ struct { { FUSE_FSYNC, fusefsync }, /* * FUSE_SETXATTR, FUSE_GETXATTR, FUSE_LISTXATTR, and - * FUSE_REMOVEXATTR are unimplemented. + * FUSE_REMOVEXATTR are unimplemented. * FUSE will stop sending these requests after getting * an -ENOSYS reply (see dispatch below). */ @@ -1237,7 +1237,7 @@ fusethread(void *v) FuseMsg *m; m = v; - if((uint)m->hdr->opcode >= nelem(fusehandlers) + if((uint)m->hdr->opcode >= nelem(fusehandlers) || !fusehandlers[m->hdr->opcode]){ replyfuseerrno(m, ENOSYS); return; @@ -1267,7 +1267,7 @@ fusedispatch(void *v) case FUSE_FORGET: fusehandlers[m->hdr->opcode](m); break; - default: + default: threadcreate(fusethread, m, STACK); } } diff --git a/src/cmd/9pserve.c b/src/cmd/9pserve.c index 24c80714..255bcbb2 100644 --- a/src/cmd/9pserve.c +++ b/src/cmd/9pserve.c @@ -185,7 +185,7 @@ threadmain(int argc, char **argv) logging++; break; }ARGEND - + if(attached && !versioned){ fprint(2, "-A must be used with -M\n"); usage(); @@ -258,7 +258,7 @@ mainproc(void *v) /* if(rootfid) */ /* dorootstat(); */ - + threadcreate(listenthread, nil, STACK); threadexits(0); } @@ -302,7 +302,7 @@ listenthread(void *arg) c->outqdead = chancreate(sizeof(void*), 0); if(verbose) fprint(2, "%T incoming call on %s\n", c->dir); threadcreate(connthread, c, STACK); - } + } } void @@ -348,7 +348,7 @@ char* estrdup(char *s) { char *t; - + t = emalloc(strlen(s)+1); strcpy(t, s); return t; @@ -713,7 +713,7 @@ openfdthread(void *v) chanfree(c->internal); c->internal = 0; free(c); -} +} int xopenfd(Msg *m) @@ -868,7 +868,7 @@ outputthread(void *arg) closeioproc(io); fprint(2, "%T output eof\n"); threadexitsall(0); -} +} void inputthread(void *arg) @@ -1041,7 +1041,7 @@ msgnew(int x) * Clear data associated with connections, so that * if all msgs have been msgcleared, the connection * can be freed. Note that this does *not* free the tpkt - * and rpkt; they are freed in msgput with the msg itself. + * and rpkt; they are freed in msgput with the msg itself. * The io write thread might still be holding a ref to msg * even once the connection has finished with it. */ @@ -1080,7 +1080,7 @@ msgput(Msg *m) if(m == nil) return; - if(verbose > 1) fprint(2, "%T msgput 0x%lux %p tag %d/%d ref %d\n", + if(verbose > 1) fprint(2, "%T msgput 0x%lux %p tag %d/%d ref %d\n", getcallerpc(&m), m, m->tag, m->ctag, m->ref); assert(m->ref > 0); if(--m->ref > 0) @@ -1296,7 +1296,7 @@ repack(Fcall *f, uchar **ppkt) { uint n, nn; uchar *pkt; - + pkt = *ppkt; n = GBIT32(pkt); nn = sizeS2M(f); @@ -1305,7 +1305,7 @@ repack(Fcall *f, uchar **ppkt) pkt = emalloc(nn); *ppkt = pkt; } - n = convS2M(f, pkt, nn); + n = convS2M(f, pkt, nn); if(n <= BIT16SZ) sysfatal("convS2M conversion error"); if(n != nn) @@ -1401,13 +1401,13 @@ ioaccept(Ioproc *io, int fd, char *dir) int timefmt(Fmt *fmt) { - static char *mon[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", + static char *mon[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; vlong ns; Tm tm; ns = nsec(); tm = *localtime(time(0)); - return fmtprint(fmt, "%s %2d %02d:%02d:%02d.%03d", + return fmtprint(fmt, "%s %2d %02d:%02d:%02d.%03d", mon[tm.mon], tm.mday, tm.hour, tm.min, tm.sec, (int)(ns%1000000000)/1000000); } diff --git a/src/cmd/9term/9term.c b/src/cmd/9term/9term.c index 81c39a63..b28f44fa 100644 --- a/src/cmd/9term/9term.c +++ b/src/cmd/9term/9term.c @@ -51,13 +51,13 @@ void threadmain(int argc, char *argv[]) { char *p; - + rfork(RFNOTEG); font = nil; _wantfocuschanges = 1; mainpid = getpid(); messagesize = 8192; - + ARGBEGIN{ default: usage(); @@ -80,7 +80,7 @@ threadmain(int argc, char *argv[]) winsize = EARGF(usage()); break; }ARGEND - + if(fontname) putenv("font", fontname); @@ -92,7 +92,7 @@ threadmain(int argc, char *argv[]) if(maxtab <= 0) maxtab = 4; free(p); - + startdir = "."; if(initdraw(derror, fontname, "9term") < 0) @@ -100,7 +100,7 @@ threadmain(int argc, char *argv[]) notify(hangupnote); noteenable("sys: child"); - + mousectl = initmouse(nil, screen); if(mousectl == nil) error("cannot find mouse"); @@ -181,13 +181,13 @@ void resizethread(void *v) { Point p; - + USED(v); - + for(;;){ p = stringsize(display->defaultfont, "0"); if(p.x && p.y) - updatewinsize(Dy(screen->r)/p.y, (Dx(screen->r)-Scrollwid-2)/p.x, + updatewinsize(Dy(screen->r)/p.y, (Dx(screen->r)-Scrollwid-2)/p.x, Dx(screen->r), Dy(screen->r)); wresize(w, screen, 0); flushimage(display, 1); @@ -197,7 +197,7 @@ resizethread(void *v) sysfatal("can't reattach to window"); } } - + void mousethread(void *v) { @@ -229,7 +229,7 @@ mousethread(void *v) bouncemouse(mouse); } } - + void wborder(Window *w, int type) { @@ -405,7 +405,7 @@ rcoutputproc(void *arg) Conswritemesg cwm; Rune *r; Stringpair pair; - + i = 0; cnt = 0; for(;;){ @@ -432,11 +432,11 @@ rcoutputproc(void *arg) if(nb < cnt) memmove(data, data+nb, cnt-nb); cnt -= nb; - + nr = label(r, nr); if(nr == 0) continue; - + recv(w->conswrite, &cwm); pair.s = r; pair.ns = nr; @@ -448,7 +448,7 @@ void winterrupt(Window *w) { char rubout[1]; - + USED(w); rubout[0] = getintr(sfd); write(rcfd, rubout, 1); @@ -474,7 +474,7 @@ label(Rune *sr, int n) { Rune *sl, *el, *er, *r; char *p, *dir; - + er = sr+n; for(r=er-1; r>=sr; r--) if(*r == '\007') @@ -527,7 +527,7 @@ rcinputproc(void *arg) recv(w->consread, &crm); c1 = crm.c1; c2 = crm.c2; - + pair.s = data; pair.ns = sizeof data; send(c1, &pair); @@ -547,7 +547,7 @@ void rioputsnarf(void) { char *s; - + s = smprint("%.*S", nsnarf, snarf); if(s){ putsnarf(s); @@ -648,7 +648,7 @@ textproc(void *arg) for(x=0; x<p-buf; x+=n) if((n = write(fd, buf+x, (p-x)-buf)) <= 0) goto break2; - + if(i >= end) break; p = buf; @@ -664,4 +664,3 @@ textproc(void *arg) break2: close(fd); } - diff --git a/src/cmd/9term/SunOS.c b/src/cmd/9term/SunOS.c index e0f866ab..73914a67 100644 --- a/src/cmd/9term/SunOS.c +++ b/src/cmd/9term/SunOS.c @@ -84,4 +84,3 @@ getintr(int fd) return 0x7F; return ttmode.c_cc[VINTR]; } - diff --git a/src/cmd/9term/bsdpty.c b/src/cmd/9term/bsdpty.c index 31281325..d64e4c2f 100644 --- a/src/cmd/9term/bsdpty.c +++ b/src/cmd/9term/bsdpty.c @@ -20,7 +20,7 @@ static char *abc = "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "0123456789"; -static char *_123 = +static char *_123 = "0123456789" "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; @@ -111,4 +111,3 @@ getintr(int fd) return 0x7F; return ttmode.c_cc[VINTR]; } - diff --git a/src/cmd/9term/dat.h b/src/cmd/9term/dat.h index 25270a0e..a215253f 100644 --- a/src/cmd/9term/dat.h +++ b/src/cmd/9term/dat.h @@ -91,8 +91,8 @@ struct Mouseinfo ulong counter; /* serial no. of last mouse event we received */ ulong lastcounter; /* serial no. of last mouse event sent to client */ int lastb; /* last button state we received */ - uchar qfull; /* filled the queue; no more recording until client comes back */ -}; + uchar qfull; /* filled the queue; no more recording until client comes back */ +}; struct Window { diff --git a/src/cmd/9term/data.c b/src/cmd/9term/data.c index e0f18e87..4c2a7602 100644 --- a/src/cmd/9term/data.c +++ b/src/cmd/9term/data.c @@ -48,121 +48,121 @@ Cursor sightcursor = { Cursor whitearrow = { {0, 0}, - {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFC, - 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF8, 0xFF, 0xFC, - 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFC, + {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFC, + 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF8, 0xFF, 0xFC, + 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFC, 0xF3, 0xF8, 0xF1, 0xF0, 0xE0, 0xE0, 0xC0, 0x40, }, - {0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x06, 0xC0, 0x1C, - 0xC0, 0x30, 0xC0, 0x30, 0xC0, 0x38, 0xC0, 0x1C, - 0xC0, 0x0E, 0xC0, 0x07, 0xCE, 0x0E, 0xDF, 0x1C, + {0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x06, 0xC0, 0x1C, + 0xC0, 0x30, 0xC0, 0x30, 0xC0, 0x38, 0xC0, 0x1C, + 0xC0, 0x0E, 0xC0, 0x07, 0xCE, 0x0E, 0xDF, 0x1C, 0xD3, 0xB8, 0xF1, 0xF0, 0xE0, 0xE0, 0xC0, 0x40, } }; Cursor query = { {-7,-7}, - {0x0f, 0xf0, 0x1f, 0xf8, 0x3f, 0xfc, 0x7f, 0xfe, - 0x7c, 0x7e, 0x78, 0x7e, 0x00, 0xfc, 0x01, 0xf8, - 0x03, 0xf0, 0x07, 0xe0, 0x07, 0xc0, 0x07, 0xc0, + {0x0f, 0xf0, 0x1f, 0xf8, 0x3f, 0xfc, 0x7f, 0xfe, + 0x7c, 0x7e, 0x78, 0x7e, 0x00, 0xfc, 0x01, 0xf8, + 0x03, 0xf0, 0x07, 0xe0, 0x07, 0xc0, 0x07, 0xc0, 0x07, 0xc0, 0x07, 0xc0, 0x07, 0xc0, 0x07, 0xc0, }, - {0x00, 0x00, 0x0f, 0xf0, 0x1f, 0xf8, 0x3c, 0x3c, - 0x38, 0x1c, 0x00, 0x3c, 0x00, 0x78, 0x00, 0xf0, - 0x01, 0xe0, 0x03, 0xc0, 0x03, 0x80, 0x03, 0x80, + {0x00, 0x00, 0x0f, 0xf0, 0x1f, 0xf8, 0x3c, 0x3c, + 0x38, 0x1c, 0x00, 0x3c, 0x00, 0x78, 0x00, 0xf0, + 0x01, 0xe0, 0x03, 0xc0, 0x03, 0x80, 0x03, 0x80, 0x00, 0x00, 0x03, 0x80, 0x03, 0x80, 0x00, 0x00, } }; Cursor tl = { {-4, -4}, - {0xfe, 0x00, 0x82, 0x00, 0x8c, 0x00, 0x87, 0xff, - 0xa0, 0x01, 0xb0, 0x01, 0xd0, 0x01, 0x11, 0xff, - 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, + {0xfe, 0x00, 0x82, 0x00, 0x8c, 0x00, 0x87, 0xff, + 0xa0, 0x01, 0xb0, 0x01, 0xd0, 0x01, 0x11, 0xff, + 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x1f, 0x00, }, - {0x00, 0x00, 0x7c, 0x00, 0x70, 0x00, 0x78, 0x00, - 0x5f, 0xfe, 0x4f, 0xfe, 0x0f, 0xfe, 0x0e, 0x00, - 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, + {0x00, 0x00, 0x7c, 0x00, 0x70, 0x00, 0x78, 0x00, + 0x5f, 0xfe, 0x4f, 0xfe, 0x0f, 0xfe, 0x0e, 0x00, + 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x00, 0x00, } }; Cursor t = { {-7, -8}, - {0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x06, 0xc0, - 0x1c, 0x70, 0x10, 0x10, 0x0c, 0x60, 0xfc, 0x7f, - 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0xff, 0xff, + {0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x06, 0xc0, + 0x1c, 0x70, 0x10, 0x10, 0x0c, 0x60, 0xfc, 0x7f, + 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x03, 0x80, 0x0f, 0xe0, 0x03, 0x80, 0x03, 0x80, - 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x00, 0x00, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x03, 0x80, 0x0f, 0xe0, 0x03, 0x80, 0x03, 0x80, + 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, } }; Cursor tr = { {-11, -4}, - {0x00, 0x7f, 0x00, 0x41, 0x00, 0x31, 0xff, 0xe1, - 0x80, 0x05, 0x80, 0x0d, 0x80, 0x0b, 0xff, 0x88, - 0x00, 0x88, 0x0, 0x88, 0x00, 0x88, 0x00, 0x88, + {0x00, 0x7f, 0x00, 0x41, 0x00, 0x31, 0xff, 0xe1, + 0x80, 0x05, 0x80, 0x0d, 0x80, 0x0b, 0xff, 0x88, + 0x00, 0x88, 0x0, 0x88, 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, 0x00, 0xf8, }, - {0x00, 0x00, 0x00, 0x3e, 0x00, 0x0e, 0x00, 0x1e, - 0x7f, 0xfa, 0x7f, 0xf2, 0x7f, 0xf0, 0x00, 0x70, - 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, + {0x00, 0x00, 0x00, 0x3e, 0x00, 0x0e, 0x00, 0x1e, + 0x7f, 0xfa, 0x7f, 0xf2, 0x7f, 0xf0, 0x00, 0x70, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x00, } }; Cursor r = { {-8, -7}, - {0x07, 0xc0, 0x04, 0x40, 0x04, 0x40, 0x04, 0x58, - 0x04, 0x68, 0x04, 0x6c, 0x04, 0x06, 0x04, 0x02, - 0x04, 0x06, 0x04, 0x6c, 0x04, 0x68, 0x04, 0x58, + {0x07, 0xc0, 0x04, 0x40, 0x04, 0x40, 0x04, 0x58, + 0x04, 0x68, 0x04, 0x6c, 0x04, 0x06, 0x04, 0x02, + 0x04, 0x06, 0x04, 0x6c, 0x04, 0x68, 0x04, 0x58, 0x04, 0x40, 0x04, 0x40, 0x04, 0x40, 0x07, 0xc0, }, - {0x00, 0x00, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, - 0x03, 0x90, 0x03, 0x90, 0x03, 0xf8, 0x03, 0xfc, - 0x03, 0xf8, 0x03, 0x90, 0x03, 0x90, 0x03, 0x80, + {0x00, 0x00, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, + 0x03, 0x90, 0x03, 0x90, 0x03, 0xf8, 0x03, 0xfc, + 0x03, 0xf8, 0x03, 0x90, 0x03, 0x90, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x00, 0x00, } }; Cursor br = { {-11, -11}, - {0x00, 0xf8, 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, - 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, - 0xff, 0x88, 0x80, 0x0b, 0x80, 0x0d, 0x80, 0x05, + {0x00, 0xf8, 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, + 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, + 0xff, 0x88, 0x80, 0x0b, 0x80, 0x0d, 0x80, 0x05, 0xff, 0xe1, 0x00, 0x31, 0x00, 0x41, 0x00, 0x7f, }, - {0x00, 0x00, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, - 0x0, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x70, 0x7f, 0xf0, 0x7f, 0xf2, 0x7f, 0xfa, + {0x00, 0x00, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, + 0x0, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x70, 0x7f, 0xf0, 0x7f, 0xf2, 0x7f, 0xfa, 0x00, 0x1e, 0x00, 0x0e, 0x00, 0x3e, 0x00, 0x00, } }; Cursor b = { {-7, -7}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, - 0xfc, 0x7f, 0x0c, 0x60, 0x10, 0x10, 0x1c, 0x70, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, + 0xfc, 0x7f, 0x0c, 0x60, 0x10, 0x10, 0x1c, 0x70, 0x06, 0xc0, 0x03, 0x80, 0x00, 0x00, 0x00, 0x00, }, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, - 0x03, 0x80, 0x03, 0x80, 0x0f, 0xe0, 0x03, 0x80, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, + 0x03, 0x80, 0x03, 0x80, 0x0f, 0xe0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, } }; Cursor bl = { {-4, -11}, - {0x1f, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, - 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, - 0x11, 0xff, 0xd0, 0x01, 0xb0, 0x01, 0xa0, 0x01, + {0x1f, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, + 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, + 0x11, 0xff, 0xd0, 0x01, 0xb0, 0x01, 0xa0, 0x01, 0x87, 0xff, 0x8c, 0x00, 0x82, 0x00, 0xfe, 0x00, }, - {0x00, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, - 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, - 0x0e, 0x00, 0x0f, 0xfe, 0x4f, 0xfe, 0x5f, 0xfe, + {0x00, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, + 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, + 0x0e, 0x00, 0x0f, 0xfe, 0x4f, 0xfe, 0x5f, 0xfe, 0x78, 0x00, 0x70, 0x00, 0x7c, 0x00, 0x00, 0x0, } }; Cursor l = { {-7, -7}, - {0x03, 0xe0, 0x02, 0x20, 0x02, 0x20, 0x1a, 0x20, - 0x16, 0x20, 0x36, 0x20, 0x60, 0x20, 0x40, 0x20, - 0x60, 0x20, 0x36, 0x20, 0x16, 0x20, 0x1a, 0x20, + {0x03, 0xe0, 0x02, 0x20, 0x02, 0x20, 0x1a, 0x20, + 0x16, 0x20, 0x36, 0x20, 0x60, 0x20, 0x40, 0x20, + 0x60, 0x20, 0x36, 0x20, 0x16, 0x20, 0x1a, 0x20, 0x02, 0x20, 0x02, 0x20, 0x02, 0x20, 0x03, 0xe0, }, - {0x00, 0x00, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, - 0x09, 0xc0, 0x09, 0xc0, 0x1f, 0xc0, 0x3f, 0xc0, - 0x1f, 0xc0, 0x09, 0xc0, 0x09, 0xc0, 0x01, 0xc0, + {0x00, 0x00, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, + 0x09, 0xc0, 0x09, 0xc0, 0x1f, 0xc0, 0x3f, 0xc0, + 0x1f, 0xc0, 0x09, 0xc0, 0x09, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x00, 0x00, } }; diff --git a/src/cmd/9term/fns.h b/src/cmd/9term/fns.h index 34cebf01..fd0bd74a 100644 --- a/src/cmd/9term/fns.h +++ b/src/cmd/9term/fns.h @@ -39,4 +39,3 @@ int intrc(void); void rioputsnarf(void); void riogetsnarf(void); - diff --git a/src/cmd/9term/malloc.c b/src/cmd/9term/malloc.c index 130942bd..9132235b 100644 --- a/src/cmd/9term/malloc.c +++ b/src/cmd/9term/malloc.c @@ -13,7 +13,7 @@ void* p9malloc(ulong n) { void *v; - + if(n == 0) n++; lock(&malloclock); @@ -38,7 +38,7 @@ void* p9calloc(ulong a, ulong b) { void *v; - + if(a*b == 0) a = b = 1; @@ -53,11 +53,10 @@ void* p9realloc(void *v, ulong n) { void *vv; - + lock(&malloclock); vv = realloc(v, n); unlock(&malloclock); print("p9realloc %p %lud => %p; pc %lux\n", v, n, vv, getcallerpc(&v)); return vv; } - diff --git a/src/cmd/9term/rcstart.c b/src/cmd/9term/rcstart.c index fddabc6d..a447036d 100644 --- a/src/cmd/9term/rcstart.c +++ b/src/cmd/9term/rcstart.c @@ -69,15 +69,15 @@ rcstart(int argc, char **argv, int *pfd, int *tfd) } /* * notedisable("sys: window size change"); - * + * * Can't disable because will be inherited by other programs * like if you run an xterm from the prompt, and then xterm's - * resizes won't get handled right. Sigh. + * resizes won't get handled right. Sigh. * * Can't not disable because when we stty below we'll get a * signal, which will drop us into the thread library note handler, * which will get all confused because we just forked and thus - * have an unknown pid. + * have an unknown pid. * * So disable it internally. ARGH! */ @@ -145,7 +145,7 @@ echoed(char *p, int n) if(echo.w+n > sizeof echo.buf) n = 0; memmove(echo.buf+echo.w, p, n); - echo.w += n; + echo.w += n; unlock(&echo.l); } diff --git a/src/cmd/9term/util.c b/src/cmd/9term/util.c index 8a35d1d7..32ea08b6 100644 --- a/src/cmd/9term/util.c +++ b/src/cmd/9term/util.c @@ -146,4 +146,3 @@ runetobyte(Rune *r, int n, int *ip) *ip = m; return s; } - diff --git a/src/cmd/9term/win.c b/src/cmd/9term/win.c index 017d546b..9c7a12eb 100644 --- a/src/cmd/9term/win.c +++ b/src/cmd/9term/win.c @@ -134,7 +134,7 @@ threadmain(int argc, char **argv) char buf1[128]; CFsys *fs; char *dump; - + dump = onestring(argc, argv); ARGBEGIN{ @@ -215,7 +215,7 @@ threadmain(int argc, char **argv) fswrite(ctlfd, buf, strlen(buf)); sprint(buf, "scroll"); fswrite(ctlfd, buf, strlen(buf)); - + updatewinsize(25, 80, 0, 0); proccreate(stdoutproc, nil, STACK); stdinproc(nil); @@ -225,7 +225,7 @@ void error(char *s, ...) { va_list arg; - + if(s){ va_start(arg, s); s = vsmprint(s, arg); @@ -378,11 +378,11 @@ stdinproc(void *v) fprint(2, "shift typing %d... ", e.q1-e.q0); q.p += e.q1-e.q0; break; - + case 'i': case 'd': /* tag */ break; - + default: goto Unknown; } @@ -484,7 +484,7 @@ dropcr(char *p, int n) { int i; char *w, *r, *q; - + r = p; w = p; for(i=0; i<n; i++) { @@ -538,15 +538,15 @@ stdoutproc(void *v) n = read(fd1, buf+npart, 8192); if(n <= 0) error(nil); - + n = echocancel(buf+npart, n); if(n == 0) continue; - + n = dropcrnl(buf+npart, n); if(n == 0) continue; - + n = dropcr(buf+npart, n); if(n == 0) continue; @@ -581,13 +581,13 @@ stdoutproc(void *v) buf[n] = 0; n = label(buf, n); buf[n] = 0; - + // clumsy but effective: notice password // prompts so we can disable echo. password = 0; if(cistrstr(buf, "password") || cistrstr(buf, "passphrase")) { int i; - + i = n; while(i > 0 && buf[i-1] == ' ') i--; @@ -743,7 +743,7 @@ void sendtype(int fd0) { int i, n, nr, raw; - + raw = israw(fd0); while(ntypebreak || (raw && ntypeb > 0)){ for(i=0; i<ntypeb; i++) diff --git a/src/cmd/9term/wind.c b/src/cmd/9term/wind.c index d47e8467..7993930d 100644 --- a/src/cmd/9term/wind.c +++ b/src/cmd/9term/wind.c @@ -101,7 +101,7 @@ wsetname(Window *w) { int i, n; char err[ERRMAX]; - + n = sprint(w->name, "window.%d.%d", w->id, w->namecount++); for(i='A'; i<='Z'; i++){ if(nameimage(w->i, w->name, 1) > 0) @@ -224,7 +224,7 @@ winctl(void *arg) crm.c2 = chancreate(sizeof(Stringpair), 0); cwrm.c1 = chancreate(sizeof(Stringpair), 0); cwrm.c2 = chancreate(sizeof(Stringpair), 0); - + alts[WKey].c = w->ck; alts[WKey].v = &kbdr; @@ -803,7 +803,7 @@ wbswidth(Window *w, Rune c) if(r == '\n'){ /* eat at most one more character */ if(q == w->q0 && c != '\r') /* eat the newline */ --q; - break; + break; } if(c == 0x17){ eq = isalnum(r); @@ -1382,15 +1382,15 @@ wsetpid(Window *w, int pid, int dolabel) } } -static Rune left1[] = { +static Rune left1[] = { '{', '[', '(', '<', 0xAB, - 0x207d, 0x2329, 0x27e6, 0x27e8, 0x27ea, - 0xfe59, 0xfe5b, 0xfe5d, 0xff08, 0xff3b, 0xff5b, + 0x207d, 0x2329, 0x27e6, 0x27e8, 0x27ea, + 0xfe59, 0xfe5b, 0xfe5d, 0xff08, 0xff3b, 0xff5b, 0 }; static Rune right1[] = { '}', ']', ')', '>', 0xBB, - 0x207e, 0x232a, 0x27e7, 0x27e9, 0x27eb, + 0x207e, 0x232a, 0x27e7, 0x27e9, 0x27eb, 0xfe5a, 0xfe5c, 0xfe5e, 0xff09, 0xff3d, 0xff5d, 0 }; diff --git a/src/cmd/acid/builtin.c b/src/cmd/acid/builtin.c index ddc326a4..be387abe 100644 --- a/src/cmd/acid/builtin.c +++ b/src/cmd/acid/builtin.c @@ -635,7 +635,7 @@ includepipe(Node *r, Node *args) if(pipe(pip) < 0) error("pipe: %r"); - + pid = fork(); switch(pid) { case -1: @@ -657,7 +657,7 @@ includepipe(Node *r, Node *args) close(pip[1]); pushfd(pip[0]); - + isave = interactive; interactive = 0; r->store.u.ival = yyparse(); @@ -746,7 +746,7 @@ doaccess(Node *r, Node *args) r->op = OCONST; r->type = TINT; r->store.fmt = 'D'; - r->store.u.ival = 0; + r->store.u.ival = 0; if(access(res.store.u.string->string, 4) == 0) r->store.u.ival = 1; } @@ -974,7 +974,7 @@ map(Node *r, Node *args) i = findseg(m, nam, fil); } if(i < 0) - error("%s %s is not a map entry", nam, fil); + error("%s %s is not a map entry", nam, fil); l = l->next; if(l->type != TINT) error("map entry not int"); @@ -1008,7 +1008,7 @@ map(Node *r, Node *args) } } -void +void flatten(Node **av, Node *n) { if(n == 0) @@ -1086,7 +1086,7 @@ strace(Node *r, Node *args) l = l->next; } regs.rw = straceregrw; - + tracelist = 0; if(stacktrace(cormap, ®s, trlist) <= 0) error("no stack frame"); @@ -1482,7 +1482,7 @@ pcfile(Node *r, Node *args) if(p == 0) error("pcfile(addr): funny file %s", buf); *p = '\0'; - r->store.u.string = strnode(buf); + r->store.u.string = strnode(buf); } void @@ -1507,7 +1507,7 @@ pcline(Node *r, Node *args) p = strrchr(buf, ':'); if(p == 0) error("pcline(addr): funny file %s", buf); - r->store.u.ival = atoi(p+1); + r->store.u.ival = atoi(p+1); } void diff --git a/src/cmd/acid/dot.c b/src/cmd/acid/dot.c index fd446492..80ec2d02 100644 --- a/src/cmd/acid/dot.c +++ b/src/cmd/acid/dot.c @@ -46,9 +46,9 @@ odot(Node *n, Node *r) error("no tag for (expr).%s", s); /* Propagate types */ - if(t->type) + if(t->type) r->store.comt = t->type->lt; - + addr = res.store.u.ival+t->offset; if(t->fmt == 'a') { r->op = OCONST; @@ -56,7 +56,7 @@ odot(Node *n, Node *r) r->type = TINT; r->store.u.ival = addr; } - else + else indir(cormap, addr, t->fmt, r); } @@ -74,7 +74,7 @@ buildtype(Node *m, int d) switch(m->op) { case OLIST: - buildtype(m->left, d); + buildtype(m->left, d); buildtype(m->right, d); break; @@ -90,7 +90,7 @@ buildtype(Node *m, int d) t->offset = m->store.u.ival; if(m->left) { t->type = m->left->sym; - t->fmt = 'a'; + t->fmt = 'a'; } else { t->type = 0; @@ -101,7 +101,7 @@ buildtype(Node *m, int d) *tail = t; tail = &t->next; - } + } } void diff --git a/src/cmd/acid/expr.c b/src/cmd/acid/expr.c index 088b98f8..dc2f59c7 100644 --- a/src/cmd/acid/expr.c +++ b/src/cmd/acid/expr.c @@ -74,7 +74,7 @@ chklval(Node *lp) if(lp->op == OCALL){ s = chklval(lp->left); - if(strcmp(s->name, "var") == 0 + if(strcmp(s->name, "var") == 0 && (lp->builtin || s->proc == 0)){ if(lp->right == 0) error("var(string): arg count"); @@ -85,7 +85,7 @@ chklval(Node *lp) } } error("need l-value"); - return nil; + return nil; } void @@ -177,7 +177,7 @@ oframe(Node *n, Node *res) lp = n->left; if(localaddr(cormap, acidregs, p, lp->sym->name, &ival) < 0) error("colon: %r"); - + res->store.u.ival = ival; res->op = OCONST; res->store.fmt = 'X'; @@ -397,7 +397,7 @@ oadd(Node *n, Node *res) if(r.type == TSTRING) { res->type = TSTRING; res->store.fmt = 's'; - res->store.u.string = stradd(l.store.u.string, r.store.u.string); + res->store.u.string = stradd(l.store.u.string, r.store.u.string); break; } error("bad rhs for +"); @@ -916,7 +916,7 @@ oeinc(Node *n, Node *res) v->store.u.ival -= fmtsize(v); else v->store.u.ival += fmtsize(v); - break; + break; case TFLOAT: if(n->op == OEDEC) v->store.u.fval--; @@ -944,7 +944,7 @@ opinc(Node *n, Node *res) v->store.u.ival -= fmtsize(v); else v->store.u.ival += fmtsize(v); - break; + break; case TFLOAT: if(n->op == OPDEC) v->store.u.fval--; diff --git a/src/cmd/acid/lex.c b/src/cmd/acid/lex.c index 19581eab..90e23f78 100644 --- a/src/cmd/acid/lex.c +++ b/src/cmd/acid/lex.c @@ -61,7 +61,7 @@ kinit(void) initcmap(); - for(i = 0; keywds[i].name; i++) + for(i = 0; keywds[i].name; i++) enter(keywds[i].name, keywds[i].terminal); } @@ -415,7 +415,7 @@ loop: return numsym('.'); return '.'; - + case '(': case ')': case '[': @@ -671,7 +671,7 @@ delsym(Lsym *s) for(q = s->name; *q; q++) h = h*3 + *q; h %= Hashsize; - + if(hash[h] == s) hash[h] = s->hash; else{ diff --git a/src/cmd/acid/list.c b/src/cmd/acid/list.c index 2c26426e..af9f77ae 100644 --- a/src/cmd/acid/list.c +++ b/src/cmd/acid/list.c @@ -54,7 +54,7 @@ build(Node *n) l = al(res.type); l->store = res.store; *tail = l; - tail = &l->next; + tail = &l->next; } } diff --git a/src/cmd/acid/main.c b/src/cmd/acid/main.c index 59ae90b1..ba3ce46e 100644 --- a/src/cmd/acid/main.c +++ b/src/cmd/acid/main.c @@ -92,7 +92,7 @@ main(int argc, char *argv[]) default: usage(); }ARGEND - + USED(pid); fmtinstall('Z', Zfmt); @@ -198,7 +198,7 @@ attachfiles(int argc, char **argv) pid = 0; interactive = 0; USED(pid); - + if(setjmp(err)) return -1; diff --git a/src/cmd/acid/proc.c b/src/cmd/acid/proc.c index e6efc95a..ff37cd5f 100644 --- a/src/cmd/acid/proc.c +++ b/src/cmd/acid/proc.c @@ -29,7 +29,7 @@ sproc(int xpid) free(correg); correg = regs; }else{ - /* XXX should only change register set here if cormap already mapped */ + /* XXX should only change register set here if cormap already mapped */ if(xpid <= 0) error("bad pid"); unmapproc(cormap); @@ -245,4 +245,3 @@ getstatus(int pid) { return "unknown"; } - diff --git a/src/cmd/acid/util.c b/src/cmd/acid/util.c index 29db6d8b..e44cb5e2 100644 --- a/src/cmd/acid/util.c +++ b/src/cmd/acid/util.c @@ -40,7 +40,7 @@ unique(char *buf, Symbol *s) if(l == 0) l = enter(buf, Tid); s->aux = l; - return l; + return l; } void @@ -122,22 +122,22 @@ addvarsym(Fhdr *fp) tl->store.u.l = list; list->store.u.string = strnode(buf); list->store.fmt = 's'; - + list->next = al(TINT); list = list->next; list->store.fmt = 'c'; list->store.u.ival = s.type; - + list->next = al(TINT); list = list->next; list->store.fmt = 'X'; list->store.u.ival = v; - + list->next = al(TSTRING); list = list->next; list->store.fmt = 's'; list->store.u.string = file; - + list->next = al(TSTRING); list = list->next; list->store.fmt = 's'; diff --git a/src/cmd/acidtypes/dat.h b/src/cmd/acidtypes/dat.h index 8a043787..97b3a166 100644 --- a/src/cmd/acidtypes/dat.h +++ b/src/cmd/acidtypes/dat.h @@ -9,7 +9,7 @@ enum Base, Enum, Aggr, - Function, + Function, Pointer, Array, Range, @@ -92,4 +92,3 @@ int Bfmt(Fmt*); #ifdef VARARGCK #pragma varargck type "B" char* #endif - diff --git a/src/cmd/acidtypes/dwarf.c b/src/cmd/acidtypes/dwarf.c index f9294286..cb39fcbf 100644 --- a/src/cmd/acidtypes/dwarf.c +++ b/src/cmd/acidtypes/dwarf.c @@ -183,4 +183,3 @@ ds2acid(Dwarf *d, DwarfSym *s, Biobuf *b, char *fn) break; } } - diff --git a/src/cmd/acidtypes/main.c b/src/cmd/acidtypes/main.c index f272f67a..eb1a9418 100644 --- a/src/cmd/acidtypes/main.c +++ b/src/cmd/acidtypes/main.c @@ -64,7 +64,7 @@ main(int argc, char **argv) } have = 1; } - + if(!have){ Bprint(&b, "// no debugging symbols in %s\n\n", argv[i]); /* fprint(2, "no debugging symbols in %s\n", argv[i]); */ @@ -75,4 +75,3 @@ main(int argc, char **argv) Bterm(&b); exits(0); } - diff --git a/src/cmd/acidtypes/stabs.c b/src/cmd/acidtypes/stabs.c index 5ce0d461..0ca3b73f 100644 --- a/src/cmd/acidtypes/stabs.c +++ b/src/cmd/acidtypes/stabs.c @@ -192,7 +192,7 @@ parsenum(char *p, int *n1, int *n2, char **pp) /* attr ::= '@' text ';' - text is + text is 'a' integer (alignment) 'p' integer (pointer class) 'P' (packed type) @@ -237,7 +237,7 @@ static Basic baseints[] = /*13*/ 8, 'f', /* double */ /*14*/ 10, 'f', /* long double */ /*15*/ 4, 'd', /* int32 */ -/*16*/ 4, 'd', /* bool32 */ +/*16*/ 4, 'd', /* bool32 */ /*17*/ 2, 'f', /* short real */ /*18*/ 4, 'f', /* real */ /*19*/ 4, 'x', /* stringptr */ @@ -391,7 +391,7 @@ parsedefn(char *p, Type *t, char **pp) t->ty = Pointer; t->sub = parseinfo(p+1, &p); break; - case 'a': /* array */ + case 'a': /* array */ case 'P': /* packed array */ t->ty = Pointer; tt = newtype(); @@ -422,7 +422,7 @@ parsedefn(char *p, Type *t, char **pp) } semi(&p); break; - + case 's': /* struct */ case 'u': /* union */ p++; @@ -532,7 +532,7 @@ parsedefn(char *p, Type *t, char **pp) } /* - bound ::= + bound ::= 'A' offset (bound is on stack by ref at offset offset from arg list) | 'T' offset (bound is on stack by val at offset offset from arg list) | 'a' regnum (bound passed by reference in register) @@ -642,7 +642,7 @@ stabs2acid(Stab *stabs, Biobuf *b) fno++; if((f = findftypes(dir, sym.name)) == nil){ static int cannotprint; - + if(cannotprint++ == 0) fprint(2, "cannot find remembered %s\n", sym.name); continue; @@ -673,7 +673,7 @@ stabs2acid(Stab *stabs, Biobuf *b) } if(setjmp(kaboom)){ static int cannotparse; - + if(cannotparse++ == 0) fprint(2, "cannot parse %s\n", name); continue; @@ -683,7 +683,7 @@ stabs2acid(Stab *stabs, Biobuf *b) continue; if(*p != 0){ static int extradesc; - + if(extradesc++ == 0) fprint(2, "extra desc '%s' in '%s'\n", p, desc); } diff --git a/src/cmd/acidtypes/type.c b/src/cmd/acidtypes/type.c index 00897e34..0f1c2f30 100644 --- a/src/cmd/acidtypes/type.c +++ b/src/cmd/acidtypes/type.c @@ -95,7 +95,7 @@ typebynum(uint n1, uint n2) t->n2 = n2; addhash(t); return t; -} +} Type* newtype(void) @@ -251,10 +251,10 @@ cleanstl(char *name) { char *b, *p; static char buf[65536]; /* These can be huge. */ - + if(strchr(name, '<') == nil) return nonempty(name); - + b = buf; for(p = name; *p != 0; p++){ switch(*p){ @@ -443,7 +443,7 @@ char* mkname(char *prefix, char *name) { static char buf[65536]; - + snprint(buf, sizeof buf, "%s%s", prefix, name); return buf; } @@ -630,7 +630,7 @@ ttt=ttt->sub; if(nprint == 0) Bprint(b, "\t'X' 0 __dummy;\n"); Bprint(b, "};\n\n"); - + name = nameof(t, 1); /* might have smashed it */ Bprint(b, "defn %B(addr) { %B(addr, \"\"); }\n", name, mkname("indent_", name)); Bprint(b, "defn %B(addr, indent) {\n", mkname("indent_", name)); @@ -675,13 +675,13 @@ ttt=ttt->sub; } Bprint(b, "};\n\n"); break; - + case Enum: name = nameof(t, 1); Bprint(b, "// enum %s\n", name); for(j=0; j<t->n; j++) Bprint(b, "%B = %ld;\n", fixname(t->tname[j]), t->val[j]); - + Bprint(b, "%B = {\n", mkname("vals_", name)); for(j=0; j<t->n; j++) Bprint(b, "\t%lud,\n", t->val[j]); @@ -738,7 +738,7 @@ printtypes(Biobuf *b) * only take one type of a given name; acid is going to do this anyway, * and this will reduce the amount of code we output considerably. * we could run a DFA equivalence relaxation sort of algorithm - * to find the actual equivalence classes, and then rename types + * to find the actual equivalence classes, and then rename types * appropriately, but this will do for now. */ all = emalloc(n*sizeof(all[0])); diff --git a/src/cmd/acidtypes/util.c b/src/cmd/acidtypes/util.c index 47fe193d..41883bbd 100644 --- a/src/cmd/acidtypes/util.c +++ b/src/cmd/acidtypes/util.c @@ -68,7 +68,7 @@ Bfmt(Fmt *fmt) { int i; char *s, *t; - + if(!isBfrog['.']){ for(i=0; i<256; i++) if(i != '_' && i != '$' && i < Runeself && !isalnum(i)) diff --git a/src/cmd/acme/acme.c b/src/cmd/acme/acme.c index 12701f23..e5658a4e 100644 --- a/src/cmd/acme/acme.c +++ b/src/cmd/acme/acme.c @@ -968,69 +968,69 @@ Cursor boxcursor = { Cursor2 boxcursor2 = { {-15, -15}, - {0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xC0, 0x03, 0xFF, - 0xFF, 0xC0, 0x03, 0xFF, - 0xFF, 0xC0, 0x03, 0xFF, - 0xFF, 0xC0, 0x03, 0xFF, - 0xFF, 0xC0, 0x03, 0xFF, - 0xFF, 0xC0, 0x03, 0xFF, - 0xFF, 0xC0, 0x03, 0xFF, - 0xFF, 0xC0, 0x03, 0xFF, - 0xFF, 0xC0, 0x03, 0xFF, - 0xFF, 0xC0, 0x03, 0xFF, - 0xFF, 0xC0, 0x03, 0xFF, - 0xFF, 0xC0, 0x03, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, + {0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xC0, 0x03, 0xFF, + 0xFF, 0xC0, 0x03, 0xFF, + 0xFF, 0xC0, 0x03, 0xFF, + 0xFF, 0xC0, 0x03, 0xFF, + 0xFF, 0xC0, 0x03, 0xFF, + 0xFF, 0xC0, 0x03, 0xFF, + 0xFF, 0xC0, 0x03, 0xFF, + 0xFF, 0xC0, 0x03, 0xFF, + 0xFF, 0xC0, 0x03, 0xFF, + 0xFF, 0xC0, 0x03, 0xFF, + 0xFF, 0xC0, 0x03, 0xFF, + 0xFF, 0xC0, 0x03, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, - {0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x3F, 0xFF, 0xFF, 0xFC, - 0x3F, 0xFF, 0xFF, 0xFC, - 0x3F, 0xFF, 0xFF, 0xFC, - 0x3F, 0xFF, 0xFF, 0xFC, - 0x3F, 0xFF, 0xFF, 0xFC, - 0x3F, 0xFF, 0xFF, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0x00, 0x00, 0xFC, - 0x3F, 0xFF, 0xFF, 0xFC, - 0x3F, 0xFF, 0xFF, 0xFC, - 0x3F, 0xFF, 0xFF, 0xFC, - 0x3F, 0xFF, 0xFF, 0xFC, - 0x3F, 0xFF, 0xFF, 0xFC, - 0x3F, 0xFF, 0xFF, 0xFC, - 0x00, 0x00, 0x00, 0x00, + {0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x3F, 0xFF, 0xFF, 0xFC, + 0x3F, 0xFF, 0xFF, 0xFC, + 0x3F, 0xFF, 0xFF, 0xFC, + 0x3F, 0xFF, 0xFF, 0xFC, + 0x3F, 0xFF, 0xFF, 0xFC, + 0x3F, 0xFF, 0xFF, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0x00, 0x00, 0xFC, + 0x3F, 0xFF, 0xFF, 0xFC, + 0x3F, 0xFF, 0xFF, 0xFC, + 0x3F, 0xFF, 0xFF, 0xFC, + 0x3F, 0xFF, 0xFF, 0xFC, + 0x3F, 0xFF, 0xFF, 0xFC, + 0x3F, 0xFF, 0xFF, 0xFC, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }; @@ -1047,7 +1047,7 @@ iconinit(void) tagcols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DPurpleblue); tagcols[TEXT] = display->black; tagcols[HTEXT] = display->black; - + /* Yellow */ textcols[BACK] = allocimagemix(display, DPaleyellow, DWhite); textcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DDarkyellow); @@ -1055,7 +1055,7 @@ iconinit(void) textcols[TEXT] = display->black; textcols[HTEXT] = display->black; } - + r = Rect(0, 0, Scrollwid+ButtonBorder, font->height+1); if(button && eqrect(r, button->r)) return; @@ -1169,4 +1169,3 @@ timefmt(Fmt *f) return fmtprint(f, "%04d/%02d/%02d %02d:%02d:%02d", tm->year+1900, tm->mon+1, tm->mday, tm->hour, tm->min, tm->sec); } - diff --git a/src/cmd/acme/cols.c b/src/cmd/acme/cols.c index 6215e044..63c33ac1 100644 --- a/src/cmd/acme/cols.c +++ b/src/cmd/acme/cols.c @@ -89,19 +89,19 @@ coladd(Column *c, Window *w, Window *clone, int y) /* * figure out where to split v to make room for w */ - + /* new window stops where next window begins */ if(i < c->nw) ymax = c->w[i]->r.min.y-Border; else ymax = c->r.max.y; - + /* new window must start after v's tag ends */ y = max(y, v->tagtop.max.y+Border); - + /* new window must start early enough to end before ymax */ y = min(y, ymax - minht); - + /* if y is too small, too many windows in column */ if(y < v->tagtop.max.y+Border) buggered = 1; @@ -118,7 +118,7 @@ coladd(Column *c, Window *w, Window *clone, int y) r1.min.y = winresize(v, r1, FALSE, FALSE); r1.max.y = r1.min.y+Border; draw(screen, r1, display->black, nil, ZP); - + /* * leave r with w's coordinates */ @@ -142,7 +142,7 @@ coladd(Column *c, Window *w, Window *clone, int y) c->nw++; c->w[i] = w; c->safe = TRUE; - + /* if there were too many windows, redraw the whole column */ if(buggered) colresize(c, c->r); diff --git a/src/cmd/acme/ecmd.c b/src/cmd/acme/ecmd.c index ef92e339..75cf710f 100644 --- a/src/cmd/acme/ecmd.c +++ b/src/cmd/acme/ecmd.c @@ -633,8 +633,8 @@ runpipe(Text *t, int cmd, Rune *cr, int ncr, int state) /* * The editoutlk exists only so that we can tell when * the editout file has been closed. It can get closed *after* - * the process exits because, since the process cannot be - * connected directly to editout (no 9P kernel support), + * the process exits because, since the process cannot be + * connected directly to editout (no 9P kernel support), * the process is actually connected to a pipe to another * process (arranged via 9pserve) that reads from the pipe * and then writes the data in the pipe to editout using @@ -704,7 +704,7 @@ printposn(Text *t, int mode) if (t != nil && t->file != nil && t->file->name != nil) warning(nil, "%.*S:", t->file->nname, t->file->name); - + switch(mode) { case PosnChars: warning(nil, "#%d", addr.r.q0); @@ -712,7 +712,7 @@ printposn(Text *t, int mode) warning(nil, ",#%d", addr.r.q1); warning(nil, "\n"); return; - + default: case PosnLine: l1 = 1+nlcount(t, 0, addr.r.q0, nil); diff --git a/src/cmd/acme/edit.c b/src/cmd/acme/edit.c index d3f82059..81f80300 100644 --- a/src/cmd/acme/edit.c +++ b/src/cmd/acme/edit.c @@ -515,7 +515,7 @@ parsecmd(int nest) if(nextc() == 'g') cmd.flag = getch(); } - + } } } @@ -613,7 +613,7 @@ simpleaddr(void) addr.num = getnum(1); break; case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': + case '5': case '6': case '7': case '8': case '9': addr.num = getnum(1); addr.type='l'; break; diff --git a/src/cmd/acme/elog.c b/src/cmd/acme/elog.c index c5650f03..8a8951fb 100644 --- a/src/cmd/acme/elog.c +++ b/src/cmd/acme/elog.c @@ -243,7 +243,7 @@ elogapply(File *f) * but using coordinates relative to the unmodified buffer. As we apply the log, * we have to update the coordinates to be relative to the modified buffer. * Textinsert and textdelete will do this for us; our only work is to apply the - * convention that an insertion at t->q0==t->q1 is intended to select the + * convention that an insertion at t->q0==t->q1 is intended to select the * inserted text. */ @@ -337,7 +337,7 @@ elogapply(File *f) } fbuffree(buf); elogterm(f); - + /* * Bad addresses will cause bufload to crash, so double check. * If changes were out of order, we expect problems so don't complain further. diff --git a/src/cmd/acme/fsys.c b/src/cmd/acme/fsys.c index 4c395eb2..d9d4b30d 100644 --- a/src/cmd/acme/fsys.c +++ b/src/cmd/acme/fsys.c @@ -463,7 +463,7 @@ fsyswalk(Xfid *x, Fid *f) qunlock(&row.lk); dir = dirtabw; goto Accept; - + Regular: if(strcmp(x->fcall.wname[i], "new") == 0){ if(w) diff --git a/src/cmd/acme/logf.c b/src/cmd/acme/logf.c index 567b8383..562026c9 100644 --- a/src/cmd/acme/logf.c +++ b/src/cmd/acme/logf.c @@ -20,7 +20,7 @@ struct Log Rendez r; vlong start; // msg[0] corresponds to 'start' in the global sequence of events - + // queued events (nev=entries in ev, mev=capacity of p) char **ev; int nev; @@ -30,7 +30,7 @@ struct Log Fid **f; int nf; int mf; - + // active (blocked) reads waiting for events Xfid **read; int nread; @@ -43,7 +43,7 @@ void xfidlogopen(Xfid *x) { qlock(&eventlog.lk); - if(eventlog.nf >= eventlog.mf) { + if(eventlog.nf >= eventlog.mf) { eventlog.mf = eventlog.mf*2; if(eventlog.mf == 0) eventlog.mf = 8; @@ -78,20 +78,20 @@ xfidlogread(Xfid *x) Fcall fc; qlock(&eventlog.lk); - if(eventlog.nread >= eventlog.mread) { + if(eventlog.nread >= eventlog.mread) { eventlog.mread = eventlog.mread*2; if(eventlog.mread == 0) eventlog.mread = 8; eventlog.read = erealloc(eventlog.read, eventlog.mread*sizeof eventlog.read[0]); } eventlog.read[eventlog.nread++] = x; - + if(eventlog.r.l == nil) eventlog.r.l = &eventlog.lk; x->flushed = FALSE; while(x->f->logoff >= eventlog.start+eventlog.nev && !x->flushed) rsleep(&eventlog.r); - + for(i=0; i<eventlog.nread; i++) { if(eventlog.read[i] == x) { eventlog.read[i] = eventlog.read[--eventlog.nread]; @@ -112,7 +112,7 @@ xfidlogread(Xfid *x) fc.data = p; fc.count = strlen(p); respond(x, &fc, nil); - free(p); + free(p); } void @@ -177,7 +177,7 @@ xfidlog(Window *w, char *op) eventlog.start += n; memmove(eventlog.ev, eventlog.ev+n, eventlog.nev*sizeof eventlog.ev[0]); } - + // Otherwise grow. if(eventlog.nev >= eventlog.mev) { eventlog.mev = eventlog.mev*2; diff --git a/src/cmd/acme/mail/dat.h b/src/cmd/acme/mail/dat.h index a7ac6a0b..66bb3a5d 100644 --- a/src/cmd/acme/mail/dat.h +++ b/src/cmd/acme/mail/dat.h @@ -178,4 +178,3 @@ extern int shortmenu; extern CFsys *mailfs; extern CFsys *acmefs; - diff --git a/src/cmd/acme/mail/html.c b/src/cmd/acme/mail/html.c index e3a956b0..e193fc4d 100644 --- a/src/cmd/acme/mail/html.c +++ b/src/cmd/acme/mail/html.c @@ -67,7 +67,7 @@ char* readbody(char *type, char *dir, int *np) { char *body; - + body = readfile(dir, "body", np); if(body != nil && strcmp(type, "text/html") == 0) return formathtml(body, np); diff --git a/src/cmd/acme/mail/mail.c b/src/cmd/acme/mail/mail.c index d79721f8..e1047bb8 100644 --- a/src/cmd/acme/mail/mail.c +++ b/src/cmd/acme/mail/mail.c @@ -558,16 +558,16 @@ mainctl(void *v) Unknown: print("unknown message %c%c\n", e->c1, e->c2); break; - + case 'E': /* write to body; can't affect us */ break; - + case 'F': /* generated by our actions; ignore */ break; - + case 'K': /* type away; we don't care */ break; - + case 'M': switch(e->c2){ case 'x': @@ -597,7 +597,7 @@ mainctl(void *v) if(na) free(s); break; - + case 'l': case 'L': buf = nil; @@ -628,17 +628,16 @@ mainctl(void *v) winwriteevent(w, e); free(buf); break; - + case 'I': /* modify away; we don't care */ case 'D': case 'd': case 'i': break; - + default: goto Unknown; } } } } - diff --git a/src/cmd/acme/mail/mesg.c b/src/cmd/acme/mail/mesg.c index 9bfe10e1..739ce10a 100644 --- a/src/cmd/acme/mail/mesg.c +++ b/src/cmd/acme/mail/mesg.c @@ -85,7 +85,7 @@ mkaddrs(char *t, char **colon) int i, nf, inquote; char **f, *s; Fmt fmt; - + inquote = 0; nf = 2; for(s=t; *s; s++){ @@ -127,7 +127,7 @@ loadinfo(Message *m, char *dir) data = readfile(dir, "info", &n); if(data == nil) return 0; - + p = data; while((s = line(p, &p)) != nil && *s != 0){ t = strchr(s, ' '); @@ -282,7 +282,7 @@ mesgadd(Message *mbox, char *dir, Dir *d, char *digest) if (m->level != 1){ m->recursed = 1; - readmbox(m, dir, m->name); + readmbox(m, dir, m->name); } return 1; } @@ -351,7 +351,7 @@ readfile(char *dir, char *name, int *np) fsseek(fid, 0, 0); free(d); d = fsdirfstat(fid); - } + } free(file); len = 0; if(d != nil) @@ -400,13 +400,13 @@ info(Message *m, int ind, int ogf) i = estrdup(s); return i; - } + } i = estrdup(""); i = eappend(i, "\t", p); i = egrow(i, "\t", stripdate(m->date)); if(ind == 0){ - if(strcmp(m->type, "text")!=0 && strncmp(m->type, "text/", 5)!=0 && + if(strcmp(m->type, "text")!=0 && strncmp(m->type, "text/", 5)!=0 && strncmp(m->type, "multipart/", 10)!=0) i = egrow(i, "\t(", estrstrdup(m->type, ")")); }else if(strncmp(m->type, "multipart/", 10) != 0) @@ -647,7 +647,7 @@ mesgsave(Message *m, char *s, int save) } return 1; } - + t = estrstrdup(mbox.name, m->name); raw = readfile(t, "raw", &n); unixheader = readfile(t, "unixheader", &k); @@ -1160,7 +1160,7 @@ tokenizec(char *str, char **args, int max, char *splitc) if(max <= 0) return 0; - + /* if(strchr(str, ',') || strchr(str, '"') || strchr(str, '<') || strchr(str, '(')) */ /* splitc = ","; */ for(na=0; *str != '\0';str++){ diff --git a/src/cmd/acme/mail/reply.c b/src/cmd/acme/mail/reply.c index 5dda0edc..f28cbef1 100644 --- a/src/cmd/acme/mail/reply.c +++ b/src/cmd/acme/mail/reply.c @@ -78,7 +78,7 @@ mkreply(Message *m, char *label, char *to, Plumbattr *attr, char *quotetext) Plumbattr *a; quotereply = (label[0] == 'Q'); - + if(quotereply && m && m->replywinid > 0){ snprint(buf, sizeof buf, "%d/body", m->replywinid); if((fd = fsopen(acmefs, buf, OWRITE)) != nil){ @@ -88,7 +88,7 @@ mkreply(Message *m, char *label, char *to, Plumbattr *attr, char *quotetext) return; } } - + r = emalloc(sizeof(Message)); r->isreply = 1; if(m != nil) @@ -212,7 +212,7 @@ execproc(void *v) q[0] = e->q[0]; q[1] = e->q[1]; prog = e->prog; /* known not to be malloc'ed */ - + fd[0] = dup(p[0], -1); if(q[0]) fd[1] = dup(q[1], -1); @@ -224,7 +224,7 @@ execproc(void *v) free(e->argv); chanfree(e->sync); free(e); - + threadexec(nil, fd, prog, argv); close(fd[0]); close(fd[1]); diff --git a/src/cmd/acme/mail/util.c b/src/cmd/acme/mail/util.c index 888e7e72..8ac9f946 100644 --- a/src/cmd/acme/mail/util.c +++ b/src/cmd/acme/mail/util.c @@ -104,4 +104,3 @@ ctlprint(CFid *fd, char *fmt, ...) if(n <= 0) error("control file write error: %r"); } - diff --git a/src/cmd/acme/mail/win.c b/src/cmd/acme/mail/win.c index 84c9cee0..1cf776dd 100644 --- a/src/cmd/acme/mail/win.c +++ b/src/cmd/acme/mail/win.c @@ -196,7 +196,7 @@ wingeter(Window *w, char *buf, int *nb) while(!fullrune(buf, n)) buf[n++] = wingetec(w); chartorune(&r, buf); - } + } *nb = n; return r; } diff --git a/src/cmd/acme/text.c b/src/cmd/acme/text.c index 8ff5884d..09422dda 100644 --- a/src/cmd/acme/text.c +++ b/src/cmd/acme/text.c @@ -388,7 +388,7 @@ textinsert(Text *t, uint q0, Rune *r, uint n, int tofile) textscrdraw(u); } } - + } if(q0 < t->iq1) t->iq1 += n; @@ -549,7 +549,7 @@ textbswidth(Text *t, Rune c) if(r == '\n'){ /* eat at most one more character */ if(q == t->q0) /* eat the newline */ --q; - break; + break; } if(c == 0x17){ eq = isalnum(r); @@ -771,7 +771,7 @@ texttype(Text *t, Rune r) case Kcmd+'Z': /* %-shift-Z: redo */ typecommit(t); undo(t, nil, nil, FALSE, 0, nil, 0); - return; + return; Tagdown: /* expand tag to show all text */ @@ -780,7 +780,7 @@ texttype(Text *t, Rune r) winresize(t->w, t->w->r, FALSE, TRUE); } return; - + Tagup: /* shrink tag to single line */ if(t->w->tagexpand){ @@ -1192,7 +1192,7 @@ void textsetselect(Text *t, uint q0, uint q1) { int p0, p1, ticked; - + /* t->fr.p0 and t->fr.p1 are always right; t->q0 and t->q1 may be off */ t->q0 = q0; t->q1 = q1; @@ -1345,7 +1345,7 @@ textselect23(Text *t, uint *q0, uint *q1, Image *high, int mask) { uint p0, p1; int buts; - + p0 = xselect(&t->fr, mousectl, high, &p1); buts = mousectl->m.buttons; if((buts & mask) == 0){ @@ -1412,7 +1412,7 @@ textdoubleclick(Text *t, uint *q0, uint *q1) if(textclickhtmlmatch(t, q0, q1)) return; - + for(i=0; left[i]!=nil; i++){ q = *q0; l = left[i]; @@ -1444,7 +1444,7 @@ textdoubleclick(Text *t, uint *q0, uint *q1) return; } } - + /* try filling out word to right */ while(*q1<t->file->b.nc && isalnum(textreadc(t, *q1))) (*q1)++; @@ -1518,7 +1518,7 @@ static int ishtmlend(Text *t, uint q, uint *q0) { int c, c1, c2; - + if(q < 2) return 0; if(textreadc(t, --q) != '>') @@ -1546,7 +1546,7 @@ textclickhtmlmatch(Text *t, uint *q0, uint *q1) { int depth, n; uint q, nq; - + q = *q0; // after opening tag? scan forward for closing tag if(ishtmlend(t, q, nil) == 1) { @@ -1583,7 +1583,7 @@ textclickhtmlmatch(Text *t, uint *q0, uint *q1) q--; } } - + return 0; } diff --git a/src/cmd/acme/util.c b/src/cmd/acme/util.c index dc978095..c153f8c1 100644 --- a/src/cmd/acme/util.c +++ b/src/cmd/acme/util.c @@ -132,7 +132,7 @@ errorwin(Mntdir *md, int owner) } /* - * Incoming window should be locked. + * Incoming window should be locked. * It will be unlocked and returned window * will be locked in its place. */ @@ -189,7 +189,7 @@ void addwarningtext(Mntdir *md, Rune *r, int nr) { Warning *warn; - + for(warn = warnings; warn; warn=warn->next){ if(warn->md == md){ bufinsert(&warn->buf, warn->buf.nc, r, nr); diff --git a/src/cmd/acme/wind.c b/src/cmd/acme/wind.c index b4f1a1cb..820955b0 100644 --- a/src/cmd/acme/wind.c +++ b/src/cmd/acme/wind.c @@ -97,7 +97,7 @@ windrawbutton(Window *w) { Image *b; Rectangle br; - + b = button; if(!w->isdir && !w->isscratch && (w->body.file->mod || w->body.ncache)) b = modbutton; @@ -112,7 +112,7 @@ delrunepos(Window *w) { int n; Rune rune; - + for(n=0; n<w->tag.file->b.nc; n++) { bufread(&w->tag.file->b, n, &rune, 1); if(rune == ' ') @@ -128,7 +128,7 @@ void movetodel(Window *w) { int n; - + n = delrunepos(w); if(n < 0) return; @@ -153,7 +153,7 @@ wintaglines(Window *w, Rectangle r) textresize(&w->tag, r, TRUE); w->tag.fr.noredraw = 0; w->tagsafe = FALSE; - + if(!w->tagexpand) { /* use just as many lines as needed to show the Del */ n = delrunepos(w); @@ -162,7 +162,7 @@ wintaglines(Window *w, Rectangle r) p = subpt(frptofchar(&w->tag.fr, n), w->tag.fr.r.min); return 1 + p.y / w->tag.fr.font->height; } - + /* can't use more than we have */ if(w->tag.fr.nlines >= w->tag.fr.maxlines) return w->tag.fr.maxlines; @@ -224,7 +224,7 @@ winresize(Window *w, Rectangle r, int safe, int keepextra) moveto(mousectl, p); } } - + /* If needed, resize & redraw body. */ r1 = r; r1.min.y = y; @@ -293,7 +293,7 @@ winunlock(Window *w) void winmousebut(Window *w) { - moveto(mousectl, addpt(w->tag.scrollr.min, + moveto(mousectl, addpt(w->tag.scrollr.min, divpt(Pt(Dx(w->tag.scrollr), font->height), 2))); } @@ -673,7 +673,7 @@ winctlprint(Window *w, char *buf, int fonts) sprint(buf, "%11d %11d %11d %11d %11d ", w->id, w->tag.file->b.nc, w->body.file->b.nc, w->isdir, w->dirty); if(fonts) - return smprint("%s%11d %q %11d ", buf, Dx(w->body.fr.r), + return smprint("%s%11d %q %11d ", buf, Dx(w->body.fr.r), w->body.reffont->f->name, w->body.fr.maxtab); return buf; } diff --git a/src/cmd/astro/cosadd.c b/src/cmd/astro/cosadd.c index 637ad206..8ce3748b 100644 --- a/src/cmd/astro/cosadd.c +++ b/src/cmd/astro/cosadd.c @@ -17,7 +17,7 @@ cosadd(int n, ...) int i; double sum, a1, a2; va_list arg; - + sum = 0; cp = cacp; va_start(arg, n); diff --git a/src/cmd/auth/dsa2pub.c b/src/cmd/auth/dsa2pub.c index d5f26bfc..68427527 100644 --- a/src/cmd/auth/dsa2pub.c +++ b/src/cmd/auth/dsa2pub.c @@ -35,7 +35,7 @@ main(int argc, char **argv) sysfatal("%r"); s = smprint("key %A p=%lB q=%lB alpha=%lB key=%lB\n", - a, + a, key->pub.p, key->pub.q, key->pub.alpha, key->pub.key); if(s == nil) sysfatal("smprint: %r"); diff --git a/src/cmd/auth/dsa2ssh.c b/src/cmd/auth/dsa2ssh.c index 489f2d21..26f9ff6d 100644 --- a/src/cmd/auth/dsa2ssh.c +++ b/src/cmd/auth/dsa2ssh.c @@ -18,7 +18,7 @@ main(int argc, char **argv) DSApriv *k; char *comment; uchar buf[8192], *p; - + fmtinstall('B', mpfmt); fmtinstall('[', encodefmt); comment = ""; diff --git a/src/cmd/auth/dsagen.c b/src/cmd/auth/dsagen.c index cb618ede..d938cf5d 100644 --- a/src/cmd/auth/dsagen.c +++ b/src/cmd/auth/dsagen.c @@ -43,6 +43,6 @@ main(int argc, char **argv) if(write(1, s, strlen(s)) != strlen(s)) sysfatal("write: %r"); - + exits(nil); } diff --git a/src/cmd/auth/dsasign.c b/src/cmd/auth/dsasign.c index 913385f9..594e84e2 100644 --- a/src/cmd/auth/dsasign.c +++ b/src/cmd/auth/dsasign.c @@ -30,10 +30,10 @@ threadmain(int argc, char **argv) uchar digest[SHA1dlen]; AuthRpc *rpc; Fmt fmt; - + fmtinstall('[', encodefmt); fmtinstall('H', encodefmt); - + verify = 0; id = ""; ARGBEGIN{ @@ -46,7 +46,7 @@ threadmain(int argc, char **argv) default: usage(); }ARGEND - + if(argc != 1) usage(); key = argv[0]; @@ -68,7 +68,7 @@ threadmain(int argc, char **argv) auth_freerpc(rpc); threadexits("rpc"); } - + print("+%s\n", id); Binit(&b, 0, OREAD); @@ -96,7 +96,7 @@ keytomp(Attr *a, char *name) { char *p; mpint *m; - + p = _strfindattr(a, name); if(p == nil) sysfatal("missing key attribute %s", name); @@ -117,7 +117,7 @@ doVerify(void) Attr *a; DSAsig dsig; DSApub dkey; - + a = _parseattr(key); if(a == nil) sysfatal("invalid key"); @@ -159,7 +159,7 @@ end: if(dsaverify(&dkey, &dsig, betomp(digest, sizeof digest, nil)) < 0) sysfatal("signature failed to verify: %r"); - + write(1, text, strlen(text)); threadexitsall(0); } @@ -169,7 +169,7 @@ getline(int *np) { char *p; int n; - + if((p = Brdline(&b, '\n')) == nil) return nil; n = Blinelen(&b); diff --git a/src/cmd/auth/factotum/apop.c b/src/cmd/auth/factotum/apop.c index 992cc0ad..d3d8c95a 100644 --- a/src/cmd/auth/factotum/apop.c +++ b/src/cmd/auth/factotum/apop.c @@ -10,7 +10,7 @@ * S -> C: ok * * Note that this is the protocol between factotum and the local - * program, not between the two factotums. The information + * program, not between the two factotums. The information * exchanged here is wrapped in the APOP protocol by the local * programs. * @@ -42,7 +42,7 @@ apopclient(Conv *c) Attr *attr; DigestState *ds; Key *k; - + chal = nil; k = nil; res = nil; @@ -328,7 +328,7 @@ apopresp(ServerState *s, char *user, char *resp) } static Role -apoproles[] = +apoproles[] = { "client", apopclient, "server", apopserver, @@ -350,4 +350,3 @@ Proto cram = { apopcheck, nil }; - diff --git a/src/cmd/auth/factotum/attr.c b/src/cmd/auth/factotum/attr.c index 1c037a53..25a46159 100644 --- a/src/cmd/auth/factotum/attr.c +++ b/src/cmd/auth/factotum/attr.c @@ -53,7 +53,7 @@ addattrs(Attr *a, Attr *b) break; } } - return a; + return a; } void @@ -201,7 +201,7 @@ matchattr(Attr *pat, Attr *a0, Attr *a1) break; } } - return 1; + return 1; } Attr* diff --git a/src/cmd/auth/factotum/chap.c b/src/cmd/auth/factotum/chap.c index fa44db96..d4fee3c4 100644 --- a/src/cmd/auth/factotum/chap.c +++ b/src/cmd/auth/factotum/chap.c @@ -1,6 +1,6 @@ /* * CHAP, MSCHAP - * + * * The client does not authenticate the server, hence no CAI * * Protocol: @@ -51,7 +51,7 @@ nthash(uchar hash[MShashlen], char *passwd) { uchar buf[512]; int i; - + for(i=0; *passwd && i<sizeof(buf); passwd++) { buf[i++] = *passwd; buf[i++] = 0; @@ -96,7 +96,7 @@ mschalresp(uchar resp[MSresplen], uchar hash[MShashlen], uchar chal[MSchallen]) { int i; uchar buf[21]; - + memset(buf, 0, sizeof(buf)); memcpy(buf, hash, MShashlen); @@ -404,7 +404,7 @@ chapresp(ServerState *s, char *user, char *resp) } static Role -chaproles[] = +chaproles[] = { "client", chapclient, "server", chapserver, @@ -424,5 +424,3 @@ Proto mschap = { "user? !password?", chapcheck }; - - diff --git a/src/cmd/auth/factotum/conv.c b/src/cmd/auth/factotum/conv.c index 3a8cf590..090a5ad3 100644 --- a/src/cmd/auth/factotum/conv.c +++ b/src/cmd/auth/factotum/conv.c @@ -268,4 +268,3 @@ convbadkey(Conv *c, Key *k, char *msg, Attr *a) return -1; return 0; } - diff --git a/src/cmd/auth/factotum/cpu.c b/src/cmd/auth/factotum/cpu.c index 46399049..64c4c980 100644 --- a/src/cmd/auth/factotum/cpu.c +++ b/src/cmd/auth/factotum/cpu.c @@ -168,7 +168,7 @@ main(int argc, char **argv) /* start up a process to pass along notes */ lclnoteproc(data); - /* + /* * Wait for the other end to execute and start our file service * of /mnt/term */ @@ -246,7 +246,7 @@ old9p(int fd) close(fd); close(p[0]); } - return p[1]; + return p[1]; } /* Invoked with stdin, stdout and stderr connected to the network connection */ @@ -392,7 +392,7 @@ readstr(int fd, char *str, int len) while(len) { n = read(fd, str, 1); - if(n < 0) + if(n < 0) return -1; if(*str == '\0') return 0; @@ -659,7 +659,7 @@ rmtnoteproc(void) syslog(0, "cpu", "cpu -R: can't open %s", rmtnotefile); _exits(0); } - + for(;;){ n = read(fd, buf, sizeof(buf)-1); if(n <= 0){ diff --git a/src/cmd/auth/factotum/dat.h b/src/cmd/auth/factotum/dat.h index 49377f40..db4a3b1e 100644 --- a/src/cmd/auth/factotum/dat.h +++ b/src/cmd/auth/factotum/dat.h @@ -57,7 +57,7 @@ struct Conv Req *req; /* 9P call to read response */ Channel *keywait; /* wait here for key confirmation */ - + }; struct Key diff --git a/src/cmd/auth/factotum/dsa.c b/src/cmd/auth/factotum/dsa.c index ced10355..aa67881e 100644 --- a/src/cmd/auth/factotum/dsa.c +++ b/src/cmd/auth/factotum/dsa.c @@ -3,7 +3,7 @@ /* * DSA signing and verification - * + * * Sign: * start p=xxx q=xxx alpha=xxx key=xxx * write msg @@ -14,10 +14,10 @@ * write msg * write signature(msg) * read ok or fail - * + * * all numbers are hexadecimal bigints parsable with strtomp. */ - + static int xdsasign(Conv *c) { @@ -58,7 +58,7 @@ xdsasign(Conv *c) } /* - * convert to canonical form (lower case) + * convert to canonical form (lower case) * for use in attribute matches. */ static void @@ -78,11 +78,11 @@ readdsapriv(Key *k) priv = dsaprivalloc(); - if((a=strfindattr(k->attr, "p"))==nil + if((a=strfindattr(k->attr, "p"))==nil || (priv->pub.p=strtomp(a, nil, 16, nil))==nil) goto Error; strlwr(a); - if((a=strfindattr(k->attr, "q"))==nil + if((a=strfindattr(k->attr, "q"))==nil || (priv->pub.q=strtomp(a, nil, 16, nil))==nil) goto Error; strlwr(a); @@ -90,15 +90,15 @@ readdsapriv(Key *k) werrstr("dsa: p or q not prime"); goto Error; } - if((a=strfindattr(k->attr, "alpha"))==nil + if((a=strfindattr(k->attr, "alpha"))==nil || (priv->pub.alpha=strtomp(a, nil, 16, nil))==nil) goto Error; strlwr(a); - if((a=strfindattr(k->attr, "key"))==nil + if((a=strfindattr(k->attr, "key"))==nil || (priv->pub.key=strtomp(a, nil, 16, nil))==nil) goto Error; strlwr(a); - if((a=strfindattr(k->privattr, "!secret"))==nil + if((a=strfindattr(k->privattr, "!secret"))==nil || (priv->secret=strtomp(a, nil, 16, nil))==nil) goto Error; strlwr(a); @@ -113,7 +113,7 @@ static int dsacheck(Key *k) { static int first = 1; - + if(first){ fmtinstall('B', mpfmt); first = 0; @@ -134,7 +134,7 @@ dsaclose(Key *k) } static Role -dsaroles[] = +dsaroles[] = { "sign", xdsasign, 0 @@ -147,4 +147,3 @@ Proto dsa = { dsacheck, dsaclose }; - diff --git a/src/cmd/auth/factotum/fs.c b/src/cmd/auth/factotum/fs.c index fd89b2c2..811bd5b0 100644 --- a/src/cmd/auth/factotum/fs.c +++ b/src/cmd/auth/factotum/fs.c @@ -65,7 +65,7 @@ rootdirgen(int n, Dir *dir, void *v) if(n > 0) return -1; - + fillstat(dir, factname, QTDIR, Qfactotum, DMDIR|0555); return 0; } @@ -224,7 +224,7 @@ convlist(int i, char *a, uint nn) memmove(a, buf, n); return n; } - + static void fskickreply(Conv *c) { @@ -250,7 +250,7 @@ fskickreply(Conv *c) respond(r, nil); c->nreply = 0; } - + /* * Some of the file system work happens in the fs proc, but * fsopen, fsread, fswrite, fsdestroyfid, and fsflush happen in @@ -305,7 +305,7 @@ fsopen(Req *r) c->kickreply = fskickreply; r->fid->aux = c; } - + respond(r, nil); } @@ -538,4 +538,3 @@ fsinit0(void) fs.destroyfid = fssendclunk; fs.start = fsstart; } - diff --git a/src/cmd/auth/factotum/httpdigest.c b/src/cmd/auth/factotum/httpdigest.c index 3e299bf5..1e9d5793 100644 --- a/src/cmd/auth/factotum/httpdigest.c +++ b/src/cmd/auth/factotum/httpdigest.c @@ -2,7 +2,7 @@ * HTTPDIGEST - MD5 challenge/response authentication (RFC 2617) * * Client protocol: - * write challenge: nonce method uri + * write challenge: nonce method uri * read response: 2*MD5dlen hex digits * * Server protocol: @@ -22,10 +22,10 @@ hdclient(Conv *c) char *realm, *passwd, *user, *f[4], *s, resp[MD5dlen*2+1]; int ret; Key *k; - + ret = -1; s = nil; - + c->state = "keylookup"; k = keyfetch(c, "%A", c->attr); if(k == nil) @@ -45,7 +45,7 @@ hdclient(Conv *c) digest(user, realm, passwd, f[0], f[1], f[2], resp); convwrite(c, resp, strlen(resp)); ret = 0; - + out: free(s); keyclose(k); @@ -103,7 +103,7 @@ digest(char *user, char *realm, char *passwd, strtolower(dig); } -static Role hdroles[] = +static Role hdroles[] = { "client", hdclient, 0 diff --git a/src/cmd/auth/factotum/key.c b/src/cmd/auth/factotum/key.c index 9df50eb3..817df97b 100644 --- a/src/cmd/auth/factotum/key.c +++ b/src/cmd/auth/factotum/key.c @@ -161,7 +161,7 @@ keyreplace(Conv *c, Key *k, char *fmt, ...) sysfatal("out of memory"); va_end(arg); - /* replace prompted values with prompts */ + /* replace prompted values with prompts */ a = copyattr(k->attr); bp = parseattr(k->proto->keyprompt); for(b=bp; b; b=b->next){ @@ -204,7 +204,7 @@ keyevict(Conv *c, Key *k, char *fmt, ...) sysfatal("out of memory"); va_end(arg); - /* replace prompted values with prompts */ + /* replace prompted values with prompts */ a = copyattr(k->attr); bp = parseattr(k->proto->keyprompt); for(b=bp; b; b=b->next){ diff --git a/src/cmd/auth/factotum/log.c b/src/cmd/auth/factotum/log.c index 4d29536b..e644028a 100644 --- a/src/cmd/auth/factotum/log.c +++ b/src/cmd/auth/factotum/log.c @@ -118,4 +118,3 @@ flog(char *fmt, ...) lbvappend(&logbuf, fmt, arg); va_end(arg); } - diff --git a/src/cmd/auth/factotum/main.c b/src/cmd/auth/factotum/main.c index 1f603ac7..b3ace12c 100644 --- a/src/cmd/auth/factotum/main.c +++ b/src/cmd/auth/factotum/main.c @@ -142,7 +142,7 @@ sendkey(Attr *attr) int rv; char buf[8192]; CFid *fid; - + fid = nsopen("factotum", nil, "ctl", OWRITE); if(fid == nil) sysfatal("opening factotum/ctl: %r"); diff --git a/src/cmd/auth/factotum/p9any.c b/src/cmd/auth/factotum/p9any.c index 0267a616..079eed94 100644 --- a/src/cmd/auth/factotum/p9any.c +++ b/src/cmd/auth/factotum/p9any.c @@ -9,7 +9,7 @@ * C->S: proto dom NUL * [negotiated proto continues] */ - + extern Proto p9sk1, p9sk2, p9cr; static Proto* okproto[] = @@ -111,7 +111,7 @@ p9anyserver(Conv *c) } ret = 0; - + out: free(s); freeattr(attr); @@ -222,7 +222,7 @@ found: /* f[i] is the chosen protocol, q the chosen domain */ attr = addattr(attr, "proto=%q dom=%q", f[i], q); c->state = "write choice"; - + /* have a key: go for it */ choice = estrappend(nil, "%q %q", f[i], q); if(convwrite(c, choice, strlen(choice)+1) < 0){ @@ -258,7 +258,7 @@ out: } static Role -p9anyroles[] = +p9anyroles[] = { "client", p9anyclient, "server", p9anyserver, @@ -269,4 +269,3 @@ Proto p9any = { "p9any", p9anyroles }; - diff --git a/src/cmd/auth/factotum/p9cr.c b/src/cmd/auth/factotum/p9cr.c index 1c3f21e1..4f181e98 100644 --- a/src/cmd/auth/factotum/p9cr.c +++ b/src/cmd/auth/factotum/p9cr.c @@ -9,7 +9,7 @@ * S -> C: ok or bad * * Note that this is the protocol between factotum and the local - * program, not between the two factotums. The information + * program, not between the two factotums. The information * exchanged here is wrapped in other protocols by the local * programs. */ @@ -317,7 +317,7 @@ p9crresp(ServerState *s, uchar *resp, int resplen) static int p9response(char *pw, uchar *chal, uchar *resp) -{ +{ char key[DESKEYLEN]; uchar buf[8]; ulong x; @@ -338,7 +338,7 @@ static int vncresponse(char *pw, uchar *chal, uchar *resp) { DESstate des; - + memmove(resp, chal, MAXCHAL); setupDESstate(&des, 0, nil); // XXX put key in for 0 desECBencrypt(resp, MAXCHAL, &des); diff --git a/src/cmd/auth/factotum/p9sk1.c b/src/cmd/auth/factotum/p9sk1.c index 0a79a361..d2d7eb89 100644 --- a/src/cmd/auth/factotum/p9sk1.c +++ b/src/cmd/auth/factotum/p9sk1.c @@ -93,7 +93,7 @@ p9skclient(Conv *c) k = keyfetch(c, "%A", a); if(k == nil) goto out; - + /* relay ticket request to auth server, get tickets */ strcpy(tr.hostid, strfindattr(k->attr, "user")); if(speakfor) @@ -329,7 +329,7 @@ p9sk1close(Key *k) } static Role -p9sk1roles[] = +p9sk1roles[] = { "client", p9skclient, "server", p9skserver, @@ -337,7 +337,7 @@ p9sk1roles[] = }; static Role -p9sk2roles[] = +p9sk2roles[] = { "client", p9skclient, "server", p9skserver, @@ -356,4 +356,3 @@ Proto p9sk2 = { "p9sk2", p9sk2roles }; - diff --git a/src/cmd/auth/factotum/pass.c b/src/cmd/auth/factotum/pass.c index 453045ce..ddda9596 100644 --- a/src/cmd/auth/factotum/pass.c +++ b/src/cmd/auth/factotum/pass.c @@ -15,12 +15,12 @@ static int passproto(Conv *c) { Key *k; - + k = keyfetch(c, "%A", c->attr); if(k == nil) return -1; c->state = "write"; - convprint(c, "%q %q", + convprint(c, "%q %q", strfindattr(k->attr, "user"), strfindattr(k->privattr, "!password")); return 0; diff --git a/src/cmd/auth/factotum/pkcs1.c b/src/cmd/auth/factotum/pkcs1.c index f3278454..0e116f2d 100644 --- a/src/cmd/auth/factotum/pkcs1.c +++ b/src/cmd/auth/factotum/pkcs1.c @@ -12,7 +12,7 @@ * * We sign hashes of messages instead of the messages * themselves. - * + * * The hashes are encoded in ASN.1 DER to identify * the signature type, and then prefixed with 0x01 PAD 0x00 * where PAD is as many 0xFF bytes as desired. @@ -138,7 +138,7 @@ mptoberjust(mpint *b, uchar *buf, uint len) #define O3(x) \ (((x)>>14)&0x7F)|0x80, \ (((x)>>7)&0x7F)|0x80, \ - ((x)&0x7F) + ((x)&0x7F) uchar oidsha1[] = { O0(1, 3), 14, 3, 2, 26 }; uchar oidmd2[] = { O0(1, 2), O2(840), O3(113549), 2, 2 }; uchar oidmd5[] = { O0(1, 2), O2(840), O3(113549), 2, 5 }; @@ -174,11 +174,11 @@ mkasn1(uchar *asn1, DigestAlg *alg, uchar *d, uint dlen) sysfatal("bad alg in mkasn1"); return -1; } - + p = asn1; *p++ = 0x30; /* sequence */ p++; - + *p++ = 0x30; /* another sequence */ p++; @@ -186,12 +186,12 @@ mkasn1(uchar *asn1, DigestAlg *alg, uchar *d, uint dlen) *p++ = olen; memmove(p, obj, olen); p += olen; - + *p++ = 0x05; /* null */ *p++ = 0; - + asn1[3] = p - (asn1+4); /* end of inner sequence */ - + *p++ = 0x04; /* octet string */ *p++ = dlen; memmove(p, d, dlen); @@ -200,4 +200,3 @@ mkasn1(uchar *asn1, DigestAlg *alg, uchar *d, uint dlen) asn1[1] = p - (asn1+2); /* end of outer sequence */ return p-asn1; } - diff --git a/src/cmd/auth/factotum/rpc.c b/src/cmd/auth/factotum/rpc.c index ad894330..26d5fd4b 100644 --- a/src/cmd/auth/factotum/rpc.c +++ b/src/cmd/auth/factotum/rpc.c @@ -32,7 +32,7 @@ * done [haveai] - authentication is done [haveai: you can get an ai with authinfo] */ -char *rpcname[] = +char *rpcname[] = { "unknown", "authinfo", @@ -196,7 +196,7 @@ rpcexec(Conv *c) rpcrespond(c, "error conversation not successful"); else{ /* make up an auth info using the attr */ - p = convAI2M((uchar*)c->reply+3, sizeof c->reply-3, + p = convAI2M((uchar*)c->reply+3, sizeof c->reply-3, strfindattr(c->attr, "cuid"), strfindattr(c->attr, "suid"), strfindattr(c->attr, "cap"), @@ -341,4 +341,3 @@ convAI2M(uchar *p, int n, char *cuid, char *suid, char *cap, char *hex) werrstr("authinfo too big"); return p; } - diff --git a/src/cmd/auth/factotum/rsa.c b/src/cmd/auth/factotum/rsa.c index 95545f93..e59feaab 100644 --- a/src/cmd/auth/factotum/rsa.c +++ b/src/cmd/auth/factotum/rsa.c @@ -3,7 +3,7 @@ /* * RSA authentication. - * + * * Encrypt/Decrypt: * start n=xxx ek=xxx * write msg @@ -13,7 +13,7 @@ * start n=xxx ek=xxx * write hash(msg) * read signature(hash(msg)) - * + * * Verify: * start n=xxx ek=xxx * write hash(msg) @@ -44,14 +44,14 @@ xrsadecrypt(Conv *c) if(k == nil) goto out; key = k->priv; - + /* make sure have private half if needed */ role = strfindattr(c->attr, "role"); if(strcmp(role, "decrypt") == 0 && !key->c2){ werrstr("missing private half of key -- cannot decrypt"); goto out; } - + /* read text */ c->state = "read"; if((n=convreadm(c, &txt)) < 0) @@ -60,7 +60,7 @@ xrsadecrypt(Conv *c) convprint(c, "data too short"); goto out; } - + /* encrypt/decrypt */ m = betomp((uchar*)txt, n, nil); if(m == nil) @@ -72,7 +72,7 @@ xrsadecrypt(Conv *c) if(mm == nil) goto out; n = mptobe(mm, (uchar*)buf, sizeof buf, nil); - + /* send response */ c->state = "write"; convwrite(c, buf, n); @@ -98,7 +98,7 @@ xrsasign(Conv *c) char *sig2; ret = -1; - + /* fetch key */ c->state = "keylookup"; k = keylookup("%A", c->attr); @@ -112,7 +112,7 @@ xrsasign(Conv *c) werrstr("missing private half of key -- cannot sign"); goto out; } - + /* get hash type from key */ hash = strfindattr(k->attr, "hash"); if(hash == nil) @@ -144,7 +144,7 @@ xrsasign(Conv *c) /* read signature */ if((n = convreadm(c, &sig2)) < 0) goto out; - + /* verify */ if(rsaverify(&key->pub, hashfn, digest, dlen, (uchar*)sig2, n) == 0) convprint(c, "ok"); @@ -160,7 +160,7 @@ out: } /* - * convert to canonical form (lower case) + * convert to canonical form (lower case) * for use in attribute matches. */ static void @@ -180,22 +180,22 @@ readrsapriv(Key *k) priv = rsaprivalloc(); - if((a=strfindattr(k->attr, "ek"))==nil + if((a=strfindattr(k->attr, "ek"))==nil || (priv->pub.ek=strtomp(a, nil, 16, nil))==nil) goto Error; strlwr(a); - if((a=strfindattr(k->attr, "n"))==nil + if((a=strfindattr(k->attr, "n"))==nil || (priv->pub.n=strtomp(a, nil, 16, nil))==nil) goto Error; strlwr(a); if(k->privattr == nil) /* only public half */ return priv; - if((a=strfindattr(k->privattr, "!p"))==nil + if((a=strfindattr(k->privattr, "!p"))==nil || (priv->p=strtomp(a, nil, 16, nil))==nil) goto Error; strlwr(a); - if((a=strfindattr(k->privattr, "!q"))==nil + if((a=strfindattr(k->privattr, "!q"))==nil || (priv->q=strtomp(a, nil, 16, nil))==nil) goto Error; strlwr(a); @@ -203,19 +203,19 @@ readrsapriv(Key *k) werrstr("rsa: p or q not prime"); goto Error; } - if((a=strfindattr(k->privattr, "!kp"))==nil + if((a=strfindattr(k->privattr, "!kp"))==nil || (priv->kp=strtomp(a, nil, 16, nil))==nil) goto Error; strlwr(a); - if((a=strfindattr(k->privattr, "!kq"))==nil + if((a=strfindattr(k->privattr, "!kq"))==nil || (priv->kq=strtomp(a, nil, 16, nil))==nil) goto Error; strlwr(a); - if((a=strfindattr(k->privattr, "!c2"))==nil + if((a=strfindattr(k->privattr, "!c2"))==nil || (priv->c2=strtomp(a, nil, 16, nil))==nil) goto Error; strlwr(a); - if((a=strfindattr(k->privattr, "!dk"))==nil + if((a=strfindattr(k->privattr, "!dk"))==nil || (priv->dk=strtomp(a, nil, 16, nil))==nil) goto Error; strlwr(a); @@ -230,7 +230,7 @@ static int rsacheck(Key *k) { static int first = 1; - + if(first){ fmtinstall('B', mpfmt); first = 0; @@ -251,7 +251,7 @@ rsaclose(Key *k) } static Role -rsaroles[] = +rsaroles[] = { "sign", xrsasign, "verify", xrsasign, /* public operation */ diff --git a/src/cmd/auth/factotum/secstore.c b/src/cmd/auth/factotum/secstore.c index c17c3cf2..9928d361 100644 --- a/src/cmd/auth/factotum/secstore.c +++ b/src/cmd/auth/factotum/secstore.c @@ -659,4 +659,3 @@ Out: free(sta); return rv; } - diff --git a/src/cmd/auth/factotum/std.h b/src/cmd/auth/factotum/std.h index 814664e0..52c55b7c 100644 --- a/src/cmd/auth/factotum/std.h +++ b/src/cmd/auth/factotum/std.h @@ -7,4 +7,3 @@ #include <thread.h> #include <fcall.h> #include <9p.h> - diff --git a/src/cmd/auth/factotum/util.c b/src/cmd/auth/factotum/util.c index accddddd..dce37dca 100644 --- a/src/cmd/auth/factotum/util.c +++ b/src/cmd/auth/factotum/util.c @@ -50,5 +50,3 @@ estrappend(char *s, char *fmt, ...) free(t); return s; } - - diff --git a/src/cmd/auth/factotum/wep.c b/src/cmd/auth/factotum/wep.c index 1d516db2..701018e7 100644 --- a/src/cmd/auth/factotum/wep.c +++ b/src/cmd/auth/factotum/wep.c @@ -11,11 +11,11 @@ wepclient(Conv *c) char *dev, buf[128], *p, *kp; Key *k; int ret, fd, cfd; - + fd = cfd = -1; ret = -1; dev = nil; - + if((k = keylookup("%A !key1?", c->attr)) == nil && (k = keylookup("%A !key2?", c->attr)) == nil && (k = keylookup("%A !key3?", c->attr)) == nil){ @@ -73,7 +73,7 @@ static Role weproles[] = { 0 }; -Proto wep = +Proto wep = { "wep", weproles, diff --git a/src/cmd/auth/factotum/xio.c b/src/cmd/auth/factotum/xio.c index 2e6b141b..116fccaf 100644 --- a/src/cmd/auth/factotum/xio.c +++ b/src/cmd/auth/factotum/xio.c @@ -9,7 +9,7 @@ xioproc(void) { Ioproc *c; int i; - + for(i=0; i<ncache; i++){ if(c = cache[i]){ cache[i] = nil; @@ -162,4 +162,3 @@ xioasgetticket(int fd, char *trbuf, char *tbuf) n = 0; return n; } - diff --git a/src/cmd/auth/passwd.c b/src/cmd/auth/passwd.c index da23638f..0b5e0453 100644 --- a/src/cmd/auth/passwd.c +++ b/src/cmd/auth/passwd.c @@ -41,7 +41,7 @@ void readln(char *prompt, char *buf, int nbuf, int secret) { char *p; - + p = readcons(prompt, nil, secret); if(p == nil) sysfatal("user terminated input"); diff --git a/src/cmd/auth/respond.c b/src/cmd/auth/respond.c index c6634220..68f9d400 100644 --- a/src/cmd/auth/respond.c +++ b/src/cmd/auth/respond.c @@ -30,5 +30,3 @@ main(int argc, char **argv) write(1, buf, n); print("\n"); } - -
\ No newline at end of file diff --git a/src/cmd/auth/rsa2any.c b/src/cmd/auth/rsa2any.c index 8538ac38..e306cdec 100644 --- a/src/cmd/auth/rsa2any.c +++ b/src/cmd/auth/rsa2any.c @@ -109,27 +109,27 @@ getkey(int argc, char **argv, int needprivate, Attr **pa) } if((key->kp = strtomp(p, &p, 16, nil)) == nil || *p != 0){ fprint(2, "warning: bad !kp\n"); - regen = 1; + regen = 1; goto regen; } if((p = _strfindattr(a, "!kq")) == nil){ fprint(2, "warning: no !kq\n"); - regen = 1; + regen = 1; goto regen; } if((key->kq = strtomp(p, &p, 16, nil)) == nil || *p != 0){ fprint(2, "warning: bad !kq\n"); - regen = 1; + regen = 1; goto regen; } if((p = _strfindattr(a, "!c2")) == nil){ fprint(2, "warning: no !c2\n"); - regen = 1; + regen = 1; goto regen; } if((key->c2 = strtomp(p, &p, 16, nil)) == nil || *p != 0){ fprint(2, "warning: bad !c2\n"); - regen = 1; + regen = 1; goto regen; } regen: @@ -285,7 +285,7 @@ uchar* putmp2(uchar *p, mpint *b) { int bits, n; - + if(mpcmp(b, mpzero) == 0) return put4(p, 0); bits = mpsignif(b); diff --git a/src/cmd/auth/rsa2pub.c b/src/cmd/auth/rsa2pub.c index c0a208a7..e45c0491 100644 --- a/src/cmd/auth/rsa2pub.c +++ b/src/cmd/auth/rsa2pub.c @@ -35,7 +35,7 @@ main(int argc, char **argv) sysfatal("%r"); s = smprint("key %A size=%d ek=%lB n=%lB\n", - a, + a, mpsignif(key->pub.n), key->pub.ek, key->pub.n); if(s == nil) sysfatal("smprint: %r"); diff --git a/src/cmd/auth/rsa2ssh.c b/src/cmd/auth/rsa2ssh.c index 3de2792e..9951106b 100644 --- a/src/cmd/auth/rsa2ssh.c +++ b/src/cmd/auth/rsa2ssh.c @@ -19,7 +19,7 @@ main(int argc, char **argv) { RSApriv *k; char *comment; - + fmtinstall('B', mpfmt); fmtinstall('[', encodefmt); comment = ""; @@ -42,7 +42,7 @@ main(int argc, char **argv) if(ssh2){ uchar buf[8192], *p; - + p = buf; p = put4(p, 7); p = putn(p, "ssh-rsa", 7); diff --git a/src/cmd/auth/rsafill.c b/src/cmd/auth/rsafill.c index 08cb8599..efab877e 100644 --- a/src/cmd/auth/rsafill.c +++ b/src/cmd/auth/rsafill.c @@ -35,7 +35,7 @@ main(int argc, char **argv) sysfatal("%r"); s = smprint("key %A size=%d ek=%lB !dk=%lB n=%lB !p=%lB !q=%lB !kp=%lB !kq=%lB !c2=%lB\n", - a, + a, mpsignif(key->pub.n), key->pub.ek, key->dk, key->pub.n, key->p, key->q, key->kp, key->kq, key->c2); diff --git a/src/cmd/auth/rsagen.c b/src/cmd/auth/rsagen.c index d51560b6..2ca99d34 100644 --- a/src/cmd/auth/rsagen.c +++ b/src/cmd/auth/rsagen.c @@ -55,6 +55,6 @@ main(int argc, char **argv) if(write(1, s, strlen(s)) != strlen(s)) sysfatal("write: %r"); - + exits(nil); } diff --git a/src/cmd/auth/secstore/SConn.c b/src/cmd/auth/secstore/SConn.c index 07e92327..9ffb3d93 100644 --- a/src/cmd/auth/secstore/SConn.c +++ b/src/cmd/auth/secstore/SConn.c @@ -211,4 +211,3 @@ readstr(SConn *conn, char *s) } return n; } - diff --git a/src/cmd/auth/secstore/SConn.h b/src/cmd/auth/secstore/SConn.h index 31765f3e..09ddb637 100644 --- a/src/cmd/auth/secstore/SConn.h +++ b/src/cmd/auth/secstore/SConn.h @@ -23,4 +23,3 @@ extern int readstr(SConn*, char*); /* call with buf of size Maxmsg+1 */ extern void *emalloc(ulong); /* dies on failure; clears memory */ extern void *erealloc(void *, ulong); extern char *estrdup(char *); - diff --git a/src/cmd/auth/secstore/dirls.c b/src/cmd/auth/secstore/dirls.c index eaae8cdc..39542a52 100644 --- a/src/cmd/auth/secstore/dirls.c +++ b/src/cmd/auth/secstore/dirls.c @@ -84,4 +84,3 @@ dirls(char *path) free(dirbuf); return list; } - diff --git a/src/cmd/auth/secstore/pak.c b/src/cmd/auth/secstore/pak.c index effc01d9..1f1a09c5 100644 --- a/src/cmd/auth/secstore/pak.c +++ b/src/cmd/auth/secstore/pak.c @@ -341,4 +341,3 @@ done: mpfree(H); return rc; } - diff --git a/src/cmd/auth/secstore/password.c b/src/cmd/auth/secstore/password.c index b2a00e72..c9e63d19 100644 --- a/src/cmd/auth/secstore/password.c +++ b/src/cmd/auth/secstore/password.c @@ -133,4 +133,3 @@ freePW(PW *pw) mpfree(pw->Hi); free(pw); } - diff --git a/src/cmd/auth/secstore/secstore.c b/src/cmd/auth/secstore/secstore.c index 571c6fae..2b33e5d4 100644 --- a/src/cmd/auth/secstore/secstore.c +++ b/src/cmd/auth/secstore/secstore.c @@ -85,7 +85,7 @@ getfile(SConn *conn, char *gf, uchar **buf, ulong *buflen, uchar *key, int nkey) return 0; } - /* conn is already encrypted against wiretappers, + /* conn is already encrypted against wiretappers, but gf is also encrypted against server breakin. */ if(buf == nil && (fd =create(gf, OWRITE, 0600)) < 0){ fprint(2, "can't open %s: %r\n", gf); @@ -197,7 +197,7 @@ putfile(SConn *conn, char *pf, uchar *buf, ulong len, uchar *key, int nkey) return -1; } }else{ - if((n = len - bufi) > Maxmsg-ivo) + if((n = len - bufi) > Maxmsg-ivo) n = Maxmsg-ivo; memcpy(b+ivo, buf+bufi, n); bufi += n; @@ -578,4 +578,3 @@ main(int argc, char **argv) exits(""); return 0; } - diff --git a/src/cmd/auth/secstore/secstore.h b/src/cmd/auth/secstore/secstore.h index d9cb807d..dfc07730 100644 --- a/src/cmd/auth/secstore/secstore.h +++ b/src/cmd/auth/secstore/secstore.h @@ -28,4 +28,3 @@ char *PAK_Hi(char *, char *, mpint *, mpint *); #define LOG "secstore" extern char *SECSTORE_DIR; - diff --git a/src/cmd/auth/secstore/secstored.c b/src/cmd/auth/secstore/secstored.c index 9a3c4b66..d32ec64c 100644 --- a/src/cmd/auth/secstore/secstored.c +++ b/src/cmd/auth/secstore/secstored.c @@ -24,7 +24,7 @@ usage(void) static int getdir(SConn *conn, char *id) { - char *ls, *s; + char *ls, *s; uchar *msg; int n, len; @@ -417,4 +417,3 @@ main(int argc, char **argv) } } } - diff --git a/src/cmd/auth/secstore/secureidcheck.c b/src/cmd/auth/secstore/secureidcheck.c index 8ef6f6aa..9d8e81ad 100644 --- a/src/cmd/auth/secstore/secureidcheck.c +++ b/src/cmd/auth/secstore/secureidcheck.c @@ -417,7 +417,7 @@ secureidcheck(char *user, char *response) resp = nil; continue; } - + switch(resp->code){ case R_AccessAccept: syslog(0, AUTHLOG, "%s accepted ruser=%s", dest, ruser); diff --git a/src/cmd/auth/secstore/secuser.c b/src/cmd/auth/secstore/secuser.c index 31ba184b..8e4eae60 100644 --- a/src/cmd/auth/secstore/secuser.c +++ b/src/cmd/auth/secstore/secuser.c @@ -241,4 +241,3 @@ userinput(char *buf, int blen) exits("input too large"); } } - diff --git a/src/cmd/auth/ssh-agent.c b/src/cmd/auth/ssh-agent.c index 40516a77..c3b0c7ef 100644 --- a/src/cmd/auth/ssh-agent.c +++ b/src/cmd/auth/ssh-agent.c @@ -25,7 +25,7 @@ enum /* agent protocol packet types */ SSH_AGENTC_ADD_RSA_IDENTITY, SSH_AGENTC_REMOVE_RSA_IDENTITY, SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES, - + SSH2_AGENTC_REQUEST_IDENTITIES = 11, SSH2_AGENT_IDENTITIES_ANSWER, SSH2_AGENTC_SIGN_REQUEST, @@ -42,12 +42,12 @@ enum /* agent protocol packet types */ SSH_AGENTC_ADD_RSA_ID_CONSTRAINED, SSH2_AGENTC_ADD_ID_CONSTRAINED, SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED, - + SSH_AGENT_CONSTRAIN_LIFETIME = 1, SSH_AGENT_CONSTRAIN_CONFIRM = 2, SSH2_AGENT_FAILURE = 30, - + SSH_COM_AGENT2_FAILURE = 102, SSH_AGENT_OLD_SIGNATURE = 0x01 }; @@ -121,12 +121,12 @@ threadmain(int argc, char **argv) default: usage(); }ARGEND - + if(argc > 1) usage(); if(argc == 1) factotum = argv[0]; - + if(dotextlist) listkeystext(); @@ -145,7 +145,7 @@ threadmain(int argc, char **argv) if((afd = announce(addr, adir)) < 0) sysfatal("announce %s: %r", addr); - + print("SSH_AUTH_SOCK=%s;\n", sock); if(export) print("export SSH_AUTH_SOCK;\n"); @@ -178,7 +178,7 @@ agentproc(void *v) { Aconn *a; int n; - + a = v; a->fd = accept(a->ctl, a->dir); close(a->ctl); @@ -209,7 +209,7 @@ int get2(Msg *m) { uint x; - + if(m->p+2 > m->ep) return 0; x = (m->p[0]<<8)|m->p[1]; @@ -232,7 +232,7 @@ uchar* getn(Msg *m, uint n) { uchar *p; - + if(m->p+n > m->ep) return nil; p = m->p; @@ -261,7 +261,7 @@ getmp(Msg *m) { int n; uchar *p; - + n = (get2(m)+7)/8; if((p=getn(m, n)) == nil) return nil; @@ -273,7 +273,7 @@ getmp2(Msg *m) { int n; uchar *p; - + n = get4(m); if((p = getn(m, n)) == nil) return nil; @@ -301,7 +301,7 @@ getm(Msg *m, Msg *mm) { uint n; uchar *p; - + n = get4(m); if((p = getn(m, n)) == nil) return nil; @@ -347,7 +347,7 @@ void put4(Msg *m, uint n) { uchar *p; - + p = ensure(m, 4); p[0] = (n>>24)&0xFF; p[1] = (n>>16)&0xFF; @@ -359,7 +359,7 @@ void put2(Msg *m, uint n) { uchar *p; - + p = ensure(m, 2); p[0] = (n>>8)&0xFF; p[1] = n&0xFF; @@ -369,7 +369,7 @@ void put1(Msg *m, uint n) { uchar *p; - + p = ensure(m, 1); p[0] = n&0xFF; } @@ -378,7 +378,7 @@ void putn(Msg *m, void *a, uint n) { uchar *p; - + p = ensure(m, n); memmove(p, a, n); } @@ -388,7 +388,7 @@ putmp(Msg *m, mpint *b) { int bits, n; uchar *p; - + bits = mpsignif(b); put2(m, bits); n = (bits+7)/8; @@ -401,7 +401,7 @@ putmp2(Msg *m, mpint *b) { int bits, n; uchar *p; - + if(mpcmp(b, mpzero) == 0){ put4(m, 0); return; @@ -421,7 +421,7 @@ void putstr(Msg *m, char *s) { int n; - + n = strlen(s); put4(m, n); putn(m, s, n); @@ -431,7 +431,7 @@ void putm(Msg *m, Msg *mm) { uint n; - + n = mm->p - mm->bp; put4(m, n); putn(m, mm->bp, n); @@ -450,7 +450,7 @@ reply(Aconn *a, Msg *m) { uint n; uchar *p; - + n = (m->p - m->bp) - 4; p = m->bp; p[0] = (n>>24)&0xFF; @@ -513,7 +513,7 @@ void printattr(char **f, int nf) { int i; - + print("#"); for(i=0; i<nf; i++) print(" %s", f[i]); @@ -571,7 +571,7 @@ RSApub* getrsapub(Msg *m) { RSApub *k; - + k = rsapuballoc(); if(k == nil) return nil; @@ -624,7 +624,7 @@ putkey2(Msg *m, int (*put)(Msg*,char**,int), char **f, int nf) { char *p; Msg mm; - + newmsg(&mm); if(put(&mm, f, nf) < 0) return -1; @@ -642,7 +642,7 @@ printkey(char *type, int (*put)(Msg*,char**,int), char **f, int nf) { Msg m; char *p; - + newmsg(&m); if(put(&m, f, nf) < 0) return -1; @@ -660,7 +660,7 @@ DSApub* getdsapub(Msg *m) { DSApub *k; - + k = dsapuballoc(); if(k == nil) return nil; @@ -825,7 +825,7 @@ dorsa(Aconn *a, mpint *mod, mpint *exp, mpint *chal, uchar chalbuf[32]) auth_freerpc(rpc); return -1; } - + p = mptoa(chal, 16, nil, 0); if(p == nil){ fprint(2, "ssh-agent: dorsa: mptoa: %r\n"); @@ -874,7 +874,7 @@ keysign(Msg *mkey, Msg *mdata, Msg *msig) DSApub *dsa; char buf[4096]; uchar digest[SHA1dlen]; - + s = getstr(mkey); if(strcmp(s, "ssh-rsa") == 0){ rsa = getrsapub(mkey); @@ -935,7 +935,7 @@ runmsg(Aconn *a) uint len, flags; DigestState *s; Msg m, mkey, mdata, msig; - + if(a->ndata < 4) return 0; len = (a->data[0]<<24)|(a->data[1]<<16)|(a->data[2]<<8)|a->data[3]; @@ -993,7 +993,7 @@ runmsg(Aconn *a) goto Failchal; md5(sessid, 16, digest, s); print("md5 %.*H %.*H => %.*H\n", 32, chalbuf, 16, sessid, MD5dlen, digest); - + newreply(&m, SSH_AGENT_RSA_RESPONSE); putn(&m, digest, 16); reply(a, &m); @@ -1020,22 +1020,22 @@ runmsg(Aconn *a) mreset(&msig); reply(a, &m); break; - + case SSH_AGENTC_ADD_RSA_IDENTITY: /* msg: n[4] mod[mp] pubexp[exp] privexp[mp] p^-1 mod q[mp] p[mp] q[mp] comment[str] */ goto Failure; - + case SSH_AGENTC_REMOVE_RSA_IDENTITY: /* msg: n[4] mod[mp] pubexp[mp] */ goto Failure; - + } - + a->ndata -= 4+len; memmove(a->data, a->data+4+len, a->ndata); return 1; @@ -1064,4 +1064,3 @@ erealloc(void *v, int n) } return v; } - diff --git a/src/cmd/auxstats/Darwin.c b/src/cmd/auxstats/Darwin.c index b92f682e..836de520 100644 --- a/src/cmd/auxstats/Darwin.c +++ b/src/cmd/auxstats/Darwin.c @@ -79,7 +79,7 @@ void sampleinit(void) { mach_timebase_info_data_t info; - + if(stat_port) return; @@ -115,7 +115,7 @@ samplenet(void) sample.net_obytes = 0; sample.net_errors = 0; sample.net_ifaces = 0; - + for(ifa=ifa_list; ifa; ifa=ifa->ifa_next){ if(ifa->ifa_addr->sa_family != AF_LINK) continue; @@ -125,7 +125,7 @@ samplenet(void) continue; if(strncmp(ifa->ifa_name, "lo", 2) == 0) /* loopback */ continue; - + if_data = (struct if_data*)ifa->ifa_data; sample.net_ipackets += if_data->ifi_ipackets; sample.net_opackets += if_data->ifi_opackets; @@ -144,7 +144,7 @@ samplenet(void) * all the other stat monitoring apps get set: * * -rwsr-xr-x 1 root wheel 83088 Mar 20 2005 /usr/bin/top - * -rwsrwxr-x 1 root admin 54048 Mar 20 2005 + * -rwsrwxr-x 1 root admin 54048 Mar 20 2005 * /Applications/Utilities/Activity Monitor.app/Contents/Resources/pmTool * * If Darwin eventually encompases more into sysctl then this @@ -165,7 +165,7 @@ sampleevents(void) mach_error_string(error)); return; } - + sample.p_syscalls_mach = sample.syscalls_mach; sample.p_syscalls_unix = sample.syscalls_unix; sample.p_csw = sample.csw; @@ -173,7 +173,7 @@ sampleevents(void) sample.syscalls_mach = 0; sample.syscalls_unix = 0; sample.csw = 0; - + for(i=0; i<pcnt; i++){ if((error=host_processor_set_priv(stat_port, psets[i], &pset)) != KERN_SUCCESS){ Bprint(&bout, "host_processor_set_priv: %s\n", mach_error_string(error)); @@ -190,24 +190,24 @@ sampleevents(void) sample.syscalls_unix += events.syscalls_unix; sample.csw += events.csw; } - + if(tasks[j] != mach_task_self()) mach_port_deallocate(mach_task_self(), tasks[j]); } - - if((error = vm_deallocate((vm_map_t)mach_task_self(), + + if((error = vm_deallocate((vm_map_t)mach_task_self(), (vm_address_t)tasks, tcnt*sizeof(task_t))) != KERN_SUCCESS){ Bprint(&bout, "vm_deallocate: %s\n", mach_error_string(error)); return; } - + if((error = mach_port_deallocate(mach_task_self(), pset)) != KERN_SUCCESS || (error = mach_port_deallocate(mach_task_self(), psets[i])) != KERN_SUCCESS){ Bprint(&bout, "mach_port_deallocate: %s\n", mach_error_string(error)); return; } } - + if((error = vm_deallocate((vm_map_t)mach_task_self(), (vm_address_t)psets, pcnt*sizeof(processor_set_t))) != KERN_SUCCESS){ Bprint(&bout, "vm_deallocate: %s\n", mach_error_string(error)); @@ -221,12 +221,12 @@ xsample(int first) int mib[2]; mach_msg_type_number_t count; size_t len; - + if(first){ sampleinit(); return; } - + sample.seq++; sample.p_time = sample.time; sample.time = mach_absolute_time(); @@ -234,7 +234,7 @@ xsample(int first) sample.p_vm_stat = sample.vm_stat; count = sizeof(sample.vm_stat) / sizeof(natural_t); host_statistics(stat_port, HOST_VM_INFO, (host_info_t)&sample.vm_stat, &count); - + if(sample.seq == 1) sample.p_vm_stat = sample.vm_stat; @@ -267,7 +267,7 @@ xapm(int first) if(first) return; - + src = IOPSCopyPowerSourcesInfo(); array = IOPSCopyPowerSourcesList(src); @@ -294,14 +294,14 @@ xnet(int first) { uint n; ulong err, in, inb, out, outb; - + n = sample.net_ifaces; in = sample.net_ipackets - sample.p_net_ipackets; out = sample.net_opackets - sample.p_net_opackets; inb = sample.net_ibytes - sample.p_net_ibytes; outb = sample.net_obytes - sample.p_net_obytes; err = sample.net_errors - sample.p_net_errors; - + Bprint(&bout, "etherb %lud %d\n", inb+outb, n*1000000); Bprint(&bout, "ether %lud %d\n", in+out, n*1000); Bprint(&bout, "ethererr %lud %d\n", err, n*1000); @@ -347,7 +347,7 @@ xvm(int first) + sample.vm_stat.active_count + sample.vm_stat.inactive_count + sample.vm_stat.wire_count; - + active = sample.vm_stat.active_count + sample.vm_stat.inactive_count + sample.vm_stat.wire_count; @@ -357,10 +357,10 @@ xvm(int first) Bprint(&bout, "context %lld 1000\n", (vlong)sample.csw); Bprint(&bout, "syscall %lld 1000\n", (vlong)sample.syscalls_mach+sample.syscalls_unix); - Bprint(&bout, "intr %lld 1000\n", + Bprint(&bout, "intr %lld 1000\n", isys("vm.stats.sys.v_intr") +isys("vm.stats.sys.v_trap")); - + Bprint(&bout, "fault %lld 1000\n", sample.vm_stat.faults); Bprint(&bout, "fork %lld 1000\n", isys("vm.stats.vm.v_rforks") @@ -388,7 +388,7 @@ xcpu(int first) sample.p_cpu.cpu_ticks[CPU_STATE_USER]; nice = sample.cpu.cpu_ticks[CPU_STATE_NICE] - sample.p_cpu.cpu_ticks[CPU_STATE_NICE]; - + t = sys+idle+user+nice; Bprint(&bout, "user =%lud %lud\n", user, t); @@ -418,8 +418,8 @@ xswap(int first) #ifdef VM_SWAPUSAGE if(sample.xsu_valid) - Bprint(&bout, "swap %lld %lld\n", - (vlong)sample.xsu.xsu_used, + Bprint(&bout, "swap %lld %lld\n", + (vlong)sample.xsu.xsu_used, (vlong)sample.xsu.xsu_total); #endif } diff --git a/src/cmd/auxstats/DragonFly.c b/src/cmd/auxstats/DragonFly.c index ec931044..33ebdedc 100644 --- a/src/cmd/auxstats/DragonFly.c +++ b/src/cmd/auxstats/DragonFly.c @@ -3,8 +3,7 @@ #include <bio.h> #include "dat.h" -void (*statfn[])(int) = +void (*statfn[])(int) = { 0 }; - diff --git a/src/cmd/auxstats/FreeBSD.c b/src/cmd/auxstats/FreeBSD.c index 2497fe35..2cc82879 100644 --- a/src/cmd/auxstats/FreeBSD.c +++ b/src/cmd/auxstats/FreeBSD.c @@ -203,8 +203,8 @@ xsysctl(int first) pgsize = 4096; } - Bprint(&bout, "mem =%lld %lld\n", - isys("vm.stats.vm.v_active_count")*pgsize, + Bprint(&bout, "mem =%lld %lld\n", + isys("vm.stats.vm.v_active_count")*pgsize, isys("vm.stats.vm.v_page_count")*pgsize); Bprint(&bout, "context %lld 1000\n", isys("vm.stats.sys.v_swtch")); Bprint(&bout, "syscall %lld 1000\n", isys("vm.stats.sys.v_syscall")); @@ -284,4 +284,3 @@ xswap(int first) Bprint(&bout, "swap =%lld %lld\n", s.ksw_used*(vlong)pgsize, s.ksw_total*(vlong)pgsize); } - diff --git a/src/cmd/auxstats/Linux.c b/src/cmd/auxstats/Linux.c index 64c86a26..7bc4b720 100644 --- a/src/cmd/auxstats/Linux.c +++ b/src/cmd/auxstats/Linux.c @@ -39,12 +39,12 @@ xapm(int first) readfile(fd); tokens(0); curr = atoi(tok[0]); - + if(curr != -1) Bprint(&bout, "battery =%d 100\n", curr); } - + void xloadavg(int first) { @@ -236,7 +236,7 @@ xwireless(int first) { static int fd = -1; int i; - + if(first){ fd = open("/proc/net/wireless", OREAD); return; diff --git a/src/cmd/auxstats/NetBSD.c b/src/cmd/auxstats/NetBSD.c index ec931044..33ebdedc 100644 --- a/src/cmd/auxstats/NetBSD.c +++ b/src/cmd/auxstats/NetBSD.c @@ -3,8 +3,7 @@ #include <bio.h> #include "dat.h" -void (*statfn[])(int) = +void (*statfn[])(int) = { 0 }; - diff --git a/src/cmd/auxstats/SunOS.c b/src/cmd/auxstats/SunOS.c index ec931044..33ebdedc 100644 --- a/src/cmd/auxstats/SunOS.c +++ b/src/cmd/auxstats/SunOS.c @@ -3,8 +3,7 @@ #include <bio.h> #include "dat.h" -void (*statfn[])(int) = +void (*statfn[])(int) = { 0 }; - diff --git a/src/cmd/auxstats/main.c b/src/cmd/auxstats/main.c index d1c35561..3fd77ac4 100644 --- a/src/cmd/auxstats/main.c +++ b/src/cmd/auxstats/main.c @@ -120,4 +120,3 @@ tokens(int i) } ntok = tokenize(line[i], tok, nelem(tok)); } - diff --git a/src/cmd/awk/awk.h b/src/cmd/awk/awk.h index 1853381d..913f4509 100644 --- a/src/cmd/awk/awk.h +++ b/src/cmd/awk/awk.h @@ -134,7 +134,7 @@ extern Node *nullnode; #define CCOPY 6 #define CCON 5 #define CTEMP 4 -#define CNAME 3 +#define CNAME 3 #define CVAR 2 #define CFLD 1 #define CUNK 0 @@ -182,4 +182,3 @@ extern int pairstack[], paircnt; #define freeable(p) ( ((p)->tval & (STR|DONTFREE)) == STR ) #include "proto.h" - diff --git a/src/cmd/awk/lex.c b/src/cmd/awk/lex.c index 74a99030..0a051ede 100644 --- a/src/cmd/awk/lex.c +++ b/src/cmd/awk/lex.c @@ -140,7 +140,7 @@ int gettok(char **pbuf, int *psz) /* get next input token */ if (bp-buf >= sz) if (!adjbuf(&buf, &sz, bp-buf+2, 100, &bp, 0)) FATAL( "out of space for number %.10s...", buf ); - if (isdigit(c) || c == 'e' || c == 'E' + if (isdigit(c) || c == 'e' || c == 'E' || c == '.' || c == '+' || c == '-') *bp++ = c; else { @@ -191,7 +191,7 @@ int yylex(void) /* should this also have STR set? */ RET(NUMBER); } - + yylval.i = c; switch (c) { case '\n': /* {EOL} */ @@ -220,7 +220,7 @@ int yylex(void) case '&': if (peek() == '&') { input(); RET(AND); - } else + } else RET('&'); case '|': if (peek() == '|') { @@ -295,7 +295,7 @@ int yylex(void) input(); yylval.i = POWEQ; RET(ASGNOP); } else RET(POWER); - + case '$': /* BUG: awkward, if not wrong */ c = gettok(&buf, &bufsize); @@ -313,7 +313,7 @@ int yylex(void) unputstr(buf); RET(INDIRECT); } - + case '}': if (--bracecnt < 0) SYNTAX( "extra }" ); @@ -336,10 +336,10 @@ int yylex(void) case '(': parencnt++; RET('('); - + case '"': return string(); /* BUG: should be like tran.c ? */ - + default: RET(c); } @@ -369,7 +369,7 @@ int string(void) c = input(); switch (c) { case '"': *bp++ = '"'; break; - case 'n': *bp++ = '\n'; break; + case 'n': *bp++ = '\n'; break; case 't': *bp++ = '\t'; break; case 'f': *bp++ = '\f'; break; case 'r': *bp++ = '\r'; break; @@ -406,7 +406,7 @@ int string(void) break; } - default: + default: *bp++ = c; break; } @@ -416,7 +416,7 @@ int string(void) break; } } - *bp = 0; + *bp = 0; s = tostring(buf); *bp++ = ' '; *bp++ = 0; yylval.cp = setsymtab(buf, s, 0.0, CON|STR|DONTFREE, symtab); @@ -442,7 +442,7 @@ int binsearch(char *w, Keyword *kp, int n) return -1; } -int word(char *w) +int word(char *w) { Keyword *kp; int c, n; @@ -504,11 +504,11 @@ int regexpr(void) if (!adjbuf(&buf, &bufsz, bp-buf+3, 500, &bp, 0)) FATAL("out of space for reg expr %.10s...", buf); if (c == '\n') { - SYNTAX( "newline in regular expression %.10s...", buf ); + SYNTAX( "newline in regular expression %.10s...", buf ); unput('\n'); break; } else if (c == '\\') { - *bp++ = '\\'; + *bp++ = '\\'; *bp++ = input(); } else { *bp++ = c; @@ -567,4 +567,3 @@ void unputstr(char *s) /* put a string back on input */ for (i = strlen(s)-1; i >= 0; i--) unput(s[i]); } - diff --git a/src/cmd/awk/lib.c b/src/cmd/awk/lib.c index 3eb30687..30c3ddd4 100644 --- a/src/cmd/awk/lib.c +++ b/src/cmd/awk/lib.c @@ -435,7 +435,7 @@ int refldbld(char *rec, char *fs) /* build fields from reg expr in FS */ break; } } - return i; + return i; } void recbld(void) /* create $0 from $1..$NF if necessary */ @@ -715,4 +715,3 @@ int is_number(char *s) else return 0; } - diff --git a/src/cmd/awk/main.c b/src/cmd/awk/main.c index ea20f63e..532cc1f6 100644 --- a/src/cmd/awk/main.c +++ b/src/cmd/awk/main.c @@ -195,4 +195,3 @@ char *cursource(void) /* current source file name */ else return NULL; } - diff --git a/src/cmd/awk/maketab.c b/src/cmd/awk/maketab.c index 50908ce9..13d34e96 100644 --- a/src/cmd/awk/maketab.c +++ b/src/cmd/awk/maketab.c @@ -166,4 +166,3 @@ int main(int argc, char *argv[]) printf("}\n"); return 0; } - diff --git a/src/cmd/awk/parse.c b/src/cmd/awk/parse.c index d4c88324..2ee6eca6 100644 --- a/src/cmd/awk/parse.c +++ b/src/cmd/awk/parse.c @@ -269,4 +269,3 @@ Node *itonp(int i) /* and vice versa */ { return (Node *) (long) i; } - diff --git a/src/cmd/awk/proto.h b/src/cmd/awk/proto.h index f124f4e4..d12a9322 100644 --- a/src/cmd/awk/proto.h +++ b/src/cmd/awk/proto.h @@ -177,4 +177,3 @@ extern Cell *gsub(Node **, int); extern FILE *popen(const char *, const char *); extern int pclose(FILE *); - diff --git a/src/cmd/awk/re.c b/src/cmd/awk/re.c index a15d2f4d..2a226768 100644 --- a/src/cmd/awk/re.c +++ b/src/cmd/awk/re.c @@ -215,7 +215,7 @@ nematch(void *p, char *s, char *start) if (pmatch(p, s, start) == 1 && patlen > 0) return 1; patlen = -1; - patbeg = start; + patbeg = start; return 0; } /* in the parsing of regular expressions, metacharacters like . have */ @@ -322,4 +322,3 @@ overflow(void) { FATAL("%s", "regular expression too big"); } - diff --git a/src/cmd/awk/run.c b/src/cmd/awk/run.c index b145758c..9aa3e0e4 100644 --- a/src/cmd/awk/run.c +++ b/src/cmd/awk/run.c @@ -506,7 +506,7 @@ Cell *awkdelete(Node **a, int n) /* a[0] is symtab, a[1] is list of subscripts * s = getsval(y); if (!adjbuf(&buf, &bufsz, strlen(buf)+strlen(s)+nsub+1, recsize, 0, 0)) FATAL("out of memory deleting %s[%s...]", x->nval, buf); - strcat(buf, s); + strcat(buf, s); if (np->nnext) strcat(buf, *SUBSEP); tempfree(y); @@ -1914,4 +1914,3 @@ void backsub(char **pb_ptr, char **sptr_ptr) /* handle \\& variations */ *pb_ptr = pb; *sptr_ptr = sptr; } - diff --git a/src/cmd/awk/tran.c b/src/cmd/awk/tran.c index 272a7fdc..387bc00b 100644 --- a/src/cmd/awk/tran.c +++ b/src/cmd/awk/tran.c @@ -167,7 +167,7 @@ void freesymtab(Cell *ap) /* free a symbol table */ if (freeable(cp)) xfree(cp->sval); temp = cp->cnext; /* avoids freeing then using */ - free(cp); + free(cp); } tp->tab[i] = 0; } @@ -180,7 +180,7 @@ void freeelem(Cell *ap, char *s) /* free elem s from ap (i.e., ap["s"] */ Array *tp; Cell *p, *prev = NULL; int h; - + tp = (Array *) ap->sval; h = hash(s, tp->size); for (p = tp->tab[h]; p != NULL; prev = p, p = p->cnext) @@ -275,7 +275,7 @@ Awkfloat setfval(Cell *vp, Awkfloat f) /* set float val of a Cell */ { int fldno; - if ((vp->tval & (NUM | STR)) == 0) + if ((vp->tval & (NUM | STR)) == 0) funnyvar(vp, "assign to"); if (isfld(vp)) { donerec = 0; /* mark $0 invalid */ @@ -405,7 +405,7 @@ char *qstring(char *s, int delim) /* collect string up to next delim */ if (c == 0) { /* \ at end */ *bp++ = '\\'; break; /* for loop */ - } + } switch (c) { case '\\': *bp++ = '\\'; break; case 'n': *bp++ = '\n'; break; @@ -432,4 +432,3 @@ char *qstring(char *s, int delim) /* collect string up to next delim */ *bp++ = 0; return buf; } - diff --git a/src/cmd/bzip2/bunzip2.c b/src/cmd/bzip2/bunzip2.c index 653ebc33..38abb7ed 100644 --- a/src/cmd/bzip2/bunzip2.c +++ b/src/cmd/bzip2/bunzip2.c @@ -151,7 +151,7 @@ bunzip(int ofd, char *ofile, Biobuf *bin) if(!done && strm.avail_in < sizeof buf) { if(strm.avail_in) memmove(buf, strm.next_in, strm.avail_in); - + n = Bread(bin, buf+strm.avail_in, sizeof(buf)-strm.avail_in); if(n <= 0) done = 1; diff --git a/src/cmd/bzip2/bzip2.c b/src/cmd/bzip2/bzip2.c index cc21a57c..6743acb8 100644 --- a/src/cmd/bzip2/bzip2.c +++ b/src/cmd/bzip2/bzip2.c @@ -175,7 +175,7 @@ bzip(char *file, long mtime, int ifd, Biobuf *bout) if(!done && strm.avail_in < sizeof buf) { if(strm.avail_in) memmove(buf, strm.next_in, strm.avail_in); - + n = Bread(&bin, buf+strm.avail_in, sizeof(buf)-strm.avail_in); if(n <= 0) done = 1; diff --git a/src/cmd/bzip2/bzip2recover.c b/src/cmd/bzip2/bzip2recover.c index ba3d1756..c31c50ab 100644 --- a/src/cmd/bzip2/bzip2recover.c +++ b/src/cmd/bzip2/bzip2recover.c @@ -5,7 +5,7 @@ /*-----------------------------------------------------------*/ /*-- - This program is bzip2recover, a program to attempt data + This program is bzip2recover, a program to attempt data salvage from damaged files created by the accompanying bzip2-1.0 program. @@ -18,16 +18,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -324,10 +324,10 @@ Int32 main ( Int32 argc, Char** argv ) } buffHi = (buffHi << 1) | (buffLo >> 31); buffLo = (buffLo << 1) | (b & 1); - if ( ( (buffHi & 0x0000ffff) == BLOCK_HEADER_HI + if ( ( (buffHi & 0x0000ffff) == BLOCK_HEADER_HI && buffLo == BLOCK_HEADER_LO) - || - ( (buffHi & 0x0000ffff) == BLOCK_ENDMARK_HI + || + ( (buffHi & 0x0000ffff) == BLOCK_ENDMARK_HI && buffLo == BLOCK_ENDMARK_LO) ) { if (bitsRead > 49) @@ -378,7 +378,7 @@ Int32 main ( Int32 argc, Char** argv ) if (b == 2) break; buffHi = (buffHi << 1) | (buffLo >> 31); buffLo = (buffLo << 1) | (b & 1); - if (bitsRead == 47+rbStart[wrBlock]) + if (bitsRead == 47+rbStart[wrBlock]) blockCRC = (buffHi << 16) | (buffLo >> 16); if (outFile != NULL && bitsRead >= rbStart[wrBlock] diff --git a/src/cmd/bzip2/lib/blocksort.c b/src/cmd/bzip2/lib/blocksort.c index f43d569e..e6d154b3 100644 --- a/src/cmd/bzip2/lib/blocksort.c +++ b/src/cmd/bzip2/lib/blocksort.c @@ -17,16 +17,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -57,8 +57,8 @@ For more information on these sources, see the manual. - To get some idea how the block sorting algorithms in this file - work, read my paper + To get some idea how the block sorting algorithms in this file + work, read my paper On the Performance of BWT Sorting Algorithms in Proceedings of the IEEE Data Compression Conference 2000, Snowbird, Utah, USA, 27-30 March 2000. The main sort in this @@ -75,11 +75,11 @@ /*---------------------------------------------*/ /*---------------------------------------------*/ -static +static __inline__ -void fallbackSimpleSort ( UInt32* fmap, - UInt32* eclass, - Int32 lo, +void fallbackSimpleSort ( UInt32* fmap, + UInt32* eclass, + Int32 lo, Int32 hi ) { Int32 i, j, tmp; @@ -138,9 +138,9 @@ void fallbackSimpleSort ( UInt32* fmap, static -void fallbackQSort3 ( UInt32* fmap, +void fallbackQSort3 ( UInt32* fmap, UInt32* eclass, - Int32 loSt, + Int32 loSt, Int32 hiSt ) { Int32 unLo, unHi, ltLo, gtHi, n, m; @@ -165,9 +165,9 @@ void fallbackQSort3 ( UInt32* fmap, } /* Random partitioning. Median of 3 sometimes fails to - avoid bad cases. Median of 9 seems to help but + avoid bad cases. Median of 9 seems to help but looks rather expensive. This too seems to work but - is cheaper. Guidance for the magic constants + is cheaper. Guidance for the magic constants 7621 and 32768 is taken from Sedgewick's algorithms book, chapter 35. */ @@ -184,10 +184,10 @@ void fallbackQSort3 ( UInt32* fmap, while (1) { if (unLo > unHi) break; n = (Int32)eclass[fmap[unLo]] - (Int32)med; - if (n == 0) { - fswap(fmap[unLo], fmap[ltLo]); - ltLo++; unLo++; - continue; + if (n == 0) { + fswap(fmap[unLo], fmap[ltLo]); + ltLo++; unLo++; + continue; }; if (n > 0) break; unLo++; @@ -195,10 +195,10 @@ void fallbackQSort3 ( UInt32* fmap, while (1) { if (unLo > unHi) break; n = (Int32)eclass[fmap[unHi]] - (Int32)med; - if (n == 0) { - fswap(fmap[unHi], fmap[gtHi]); - gtHi--; unHi--; - continue; + if (n == 0) { + fswap(fmap[unHi], fmap[gtHi]); + gtHi--; unHi--; + continue; }; if (n < 0) break; unHi--; @@ -257,8 +257,8 @@ void fallbackQSort3 ( UInt32* fmap, #define UNALIGNED_BH(zz) ((zz) & 0x01f) static -void fallbackSort ( UInt32* fmap, - UInt32* eclass, +void fallbackSort ( UInt32* fmap, + UInt32* eclass, UInt32* bhtab, Int32 nblock, Int32 verb ) @@ -299,7 +299,7 @@ void fallbackSort ( UInt32* fmap, --*/ /*-- set sentinel bits for block-end detection --*/ - for (i = 0; i < 32; i++) { + for (i = 0; i < 32; i++) { SET_BH(nblock + 2*i); CLEAR_BH(nblock + 2*i + 1); } @@ -308,7 +308,7 @@ void fallbackSort ( UInt32* fmap, H = 1; while (1) { - if (verb >= 4) + if (verb >= 4) VPrintf1 ( " depth %6d has ", H ); j = 0; @@ -353,14 +353,14 @@ void fallbackSort ( UInt32* fmap, } } - if (verb >= 4) + if (verb >= 4) VPrintf1 ( "%6d unresolved strings\n", nNotDone ); H *= 2; if (H > nblock || nNotDone == 0) break; } - /*-- + /*-- Reconstruct the original block in eclass8 [0 .. nblock-1], since the previous phase destroyed it. @@ -392,9 +392,9 @@ void fallbackSort ( UInt32* fmap, /*---------------------------------------------*/ static __inline__ -Bool mainGtU ( UInt32 i1, +Bool mainGtU ( UInt32 i1, UInt32 i2, - UChar* block, + UChar* block, UInt16* quadrant, UInt32 nblock, Int32* budget ) @@ -534,8 +534,8 @@ void mainSimpleSort ( UInt32* ptr, UChar* block, UInt16* quadrant, Int32 nblock, - Int32 lo, - Int32 hi, + Int32 lo, + Int32 hi, Int32 d, Int32* budget ) { @@ -559,8 +559,8 @@ void mainSimpleSort ( UInt32* ptr, if (i > hi) break; v = ptr[i]; j = i; - while ( mainGtU ( - ptr[j-h]+d, v+d, block, quadrant, nblock, budget + while ( mainGtU ( + ptr[j-h]+d, v+d, block, quadrant, nblock, budget ) ) { ptr[j] = ptr[j-h]; j = j - h; @@ -573,8 +573,8 @@ void mainSimpleSort ( UInt32* ptr, if (i > hi) break; v = ptr[i]; j = i; - while ( mainGtU ( - ptr[j-h]+d, v+d, block, quadrant, nblock, budget + while ( mainGtU ( + ptr[j-h]+d, v+d, block, quadrant, nblock, budget ) ) { ptr[j] = ptr[j-h]; j = j - h; @@ -587,8 +587,8 @@ void mainSimpleSort ( UInt32* ptr, if (i > hi) break; v = ptr[i]; j = i; - while ( mainGtU ( - ptr[j-h]+d, v+d, block, quadrant, nblock, budget + while ( mainGtU ( + ptr[j-h]+d, v+d, block, quadrant, nblock, budget ) ) { ptr[j] = ptr[j-h]; j = j - h; @@ -626,13 +626,13 @@ void mainSimpleSort ( UInt32* ptr, } \ } -static +static __inline__ UChar mmed3 ( UChar a, UChar b, UChar c ) { UChar t; if (a > b) { t = a; a = b; b = t; }; - if (b > c) { + if (b > c) { b = c; if (a > b) b = a; } @@ -670,8 +670,8 @@ void mainQSort3 ( UInt32* ptr, UChar* block, UInt16* quadrant, Int32 nblock, - Int32 loSt, - Int32 hiSt, + Int32 loSt, + Int32 hiSt, Int32 dSt, Int32* budget ) { @@ -694,14 +694,14 @@ void mainQSort3 ( UInt32* ptr, AssertH ( sp < MAIN_QSORT_STACK_SIZE, 1001 ); mpop ( lo, hi, d ); - if (hi - lo < MAIN_QSORT_SMALL_THRESH || + if (hi - lo < MAIN_QSORT_SMALL_THRESH || d > MAIN_QSORT_DEPTH_THRESH) { mainSimpleSort ( ptr, block, quadrant, nblock, lo, hi, d, budget ); if (*budget < 0) return; continue; } - med = (Int32) + med = (Int32) mmed3 ( block[ptr[ lo ]+d], block[ptr[ hi ]+d], block[ptr[ (lo+hi)>>1 ]+d] ); @@ -713,9 +713,9 @@ void mainQSort3 ( UInt32* ptr, while (True) { if (unLo > unHi) break; n = ((Int32)block[ptr[unLo]+d]) - med; - if (n == 0) { - mswap(ptr[unLo], ptr[ltLo]); - ltLo++; unLo++; continue; + if (n == 0) { + mswap(ptr[unLo], ptr[ltLo]); + ltLo++; unLo++; continue; }; if (n > 0) break; unLo++; @@ -723,9 +723,9 @@ void mainQSort3 ( UInt32* ptr, while (True) { if (unLo > unHi) break; n = ((Int32)block[ptr[unHi]+d]) - med; - if (n == 0) { - mswap(ptr[unHi], ptr[gtHi]); - gtHi--; unHi--; continue; + if (n == 0) { + mswap(ptr[unHi], ptr[gtHi]); + gtHi--; unHi--; continue; }; if (n < 0) break; unHi--; @@ -796,9 +796,9 @@ void mainQSort3 ( UInt32* ptr, #define CLEARMASK (~(SETMASK)) static -void mainSort ( UInt32* ptr, +void mainSort ( UInt32* ptr, UChar* block, - UInt16* quadrant, + UInt16* quadrant, UInt32* ftab, Int32 nblock, Int32 verb, @@ -926,7 +926,7 @@ void mainSort ( UInt32* ptr, /*-- Step 1: Complete the big bucket [ss] by quicksorting - any unsorted small buckets [ss, j], for j != ss. + any unsorted small buckets [ss, j], for j != ss. Hopefully previous pointer-scanning phases have already completed many of the small buckets [ss, j], so we don't have to sort them at all. @@ -942,10 +942,10 @@ void mainSort ( UInt32* ptr, VPrintf4 ( " qsort [0x%x, 0x%x] " "done %d this %d\n", ss, j, numQSorted, hi - lo + 1 ); - mainQSort3 ( - ptr, block, quadrant, nblock, - lo, hi, BZ_N_RADIX, budget - ); + mainQSort3 ( + ptr, block, quadrant, nblock, + lo, hi, BZ_N_RADIX, budget + ); numQSorted += (hi - lo + 1); if (*budget < 0) return; } @@ -977,7 +977,7 @@ void mainSort ( UInt32* ptr, for (j = (ftab[(ss+1) << 8] & CLEARMASK) - 1; j > copyEnd[ss]; j--) { k = ptr[j]-1; if (k < 0) k += nblock; c1 = block[k]; - if (!bigDone[c1]) + if (!bigDone[c1]) ptr[ copyEnd[c1]-- ] = k; } } @@ -996,7 +996,7 @@ void mainSort ( UInt32* ptr, updating for the last bucket is pointless. The quadrant array provides a way to incrementally - cache sort orderings, as they appear, so as to + cache sort orderings, as they appear, so as to make subsequent comparisons in fullGtU() complete faster. For repetitive blocks this makes a big difference (but not big enough to be able to avoid @@ -1006,9 +1006,9 @@ void mainSort ( UInt32* ptr, for 0 <= i < nblock and 0 <= j <= nblock - if block[i] != block[j], + if block[i] != block[j], - then the relative values of quadrant[i] and + then the relative values of quadrant[i] and quadrant[j] are meaningless. else { @@ -1071,7 +1071,7 @@ void mainSort ( UInt32* ptr, */ void BZ2_blockSort ( EState* s ) { - UInt32* ptr = s->ptr; + UInt32* ptr = s->ptr; UChar* block = s->block; UInt32* ftab = s->ftab; Int32 nblock = s->nblock; @@ -1095,8 +1095,8 @@ void BZ2_blockSort ( EState* s ) quadrant = (UInt16*)(&(block[i])); /* (wfact-1) / 3 puts the default-factor-30 - transition point at very roughly the same place as - with v0.1 and v0.9.0. + transition point at very roughly the same place as + with v0.1 and v0.9.0. Not that it particularly matters any more, since the resulting compressed stream is now the same regardless of whether or not we use the main sort or fallback sort. @@ -1107,14 +1107,14 @@ void BZ2_blockSort ( EState* s ) budget = budgetInit; mainSort ( ptr, block, quadrant, ftab, nblock, verb, &budget ); - if (verb >= 3) + if (verb >= 3) VPrintf3 ( " %d work, %d block, ratio %5.2f\n", budgetInit - budget, - nblock, + nblock, (float)(budgetInit - budget) / - (float)(nblock==0 ? 1 : nblock) ); + (float)(nblock==0 ? 1 : nblock) ); if (budget < 0) { - if (verb >= 2) + if (verb >= 2) VPrintf0 ( " too repetitive; using fallback" " sorting algorithm\n" ); fallbackSort ( s->arr1, s->arr2, ftab, nblock, verb ); diff --git a/src/cmd/bzip2/lib/buffcompress.c b/src/cmd/bzip2/lib/buffcompress.c index 849c8ff0..cd350934 100644 --- a/src/cmd/bzip2/lib/buffcompress.c +++ b/src/cmd/bzip2/lib/buffcompress.c @@ -28,16 +28,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -89,30 +89,30 @@ #include "bzlib_private.h" /*---------------------------------------------------*/ -int BZ_API(BZ2_bzBuffToBuffCompress) - ( char* dest, +int BZ_API(BZ2_bzBuffToBuffCompress) + ( char* dest, unsigned int* destLen, - char* source, + char* source, unsigned int sourceLen, - int blockSize100k, - int verbosity, + int blockSize100k, + int verbosity, int workFactor ) { bz_stream strm; int ret; - if (dest == NULL || destLen == NULL || + if (dest == NULL || destLen == NULL || source == NULL || blockSize100k < 1 || blockSize100k > 9 || verbosity < 0 || verbosity > 4 || - workFactor < 0 || workFactor > 250) + workFactor < 0 || workFactor > 250) return BZ_PARAM_ERROR; if (workFactor == 0) workFactor = 30; strm.bzalloc = NULL; strm.bzfree = NULL; strm.opaque = NULL; - ret = BZ2_bzCompressInit ( &strm, blockSize100k, + ret = BZ2_bzCompressInit ( &strm, blockSize100k, verbosity, workFactor ); if (ret != BZ_OK) return ret; @@ -126,7 +126,7 @@ int BZ_API(BZ2_bzBuffToBuffCompress) if (ret != BZ_STREAM_END) goto errhandler; /* normal termination */ - *destLen -= strm.avail_out; + *destLen -= strm.avail_out; BZ2_bzCompressEnd ( &strm ); return BZ_OK; @@ -138,4 +138,3 @@ int BZ_API(BZ2_bzBuffToBuffCompress) BZ2_bzCompressEnd ( &strm ); return ret; } - diff --git a/src/cmd/bzip2/lib/buffdecompress.c b/src/cmd/bzip2/lib/buffdecompress.c index 944166f3..47492470 100644 --- a/src/cmd/bzip2/lib/buffdecompress.c +++ b/src/cmd/bzip2/lib/buffdecompress.c @@ -28,16 +28,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -89,10 +89,10 @@ #include "bzlib_private.h" /*---------------------------------------------------*/ -int BZ_API(BZ2_bzBuffToBuffDecompress) - ( char* dest, +int BZ_API(BZ2_bzBuffToBuffDecompress) + ( char* dest, unsigned int* destLen, - char* source, + char* source, unsigned int sourceLen, int small, int verbosity ) @@ -100,10 +100,10 @@ int BZ_API(BZ2_bzBuffToBuffDecompress) bz_stream strm; int ret; - if (dest == NULL || destLen == NULL || + if (dest == NULL || destLen == NULL || source == NULL || (small != 0 && small != 1) || - verbosity < 0 || verbosity > 4) + verbosity < 0 || verbosity > 4) return BZ_PARAM_ERROR; strm.bzalloc = NULL; @@ -133,11 +133,9 @@ int BZ_API(BZ2_bzBuffToBuffDecompress) } else { BZ2_bzDecompressEnd ( &strm ); return BZ_OUTBUFF_FULL; - }; + }; errhandler: BZ2_bzDecompressEnd ( &strm ); - return ret; + return ret; } - - diff --git a/src/cmd/bzip2/lib/bzassert.c b/src/cmd/bzip2/lib/bzassert.c index 56d58fc2..8a578bd0 100644 --- a/src/cmd/bzip2/lib/bzassert.c +++ b/src/cmd/bzip2/lib/bzassert.c @@ -28,16 +28,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -93,7 +93,7 @@ void BZ2_bz__AssertH__fail ( int errcode ) { - fprintf(stderr, + fprintf(stderr, "\n\nbzip2/libbzip2: internal error number %d.\n" "This is a bug in bzip2/libbzip2, %s.\n" "Please report it to me at: jseward@acm.org. If this happened\n" diff --git a/src/cmd/bzip2/lib/bzbuffcompress.c b/src/cmd/bzip2/lib/bzbuffcompress.c index 849c8ff0..cd350934 100644 --- a/src/cmd/bzip2/lib/bzbuffcompress.c +++ b/src/cmd/bzip2/lib/bzbuffcompress.c @@ -28,16 +28,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -89,30 +89,30 @@ #include "bzlib_private.h" /*---------------------------------------------------*/ -int BZ_API(BZ2_bzBuffToBuffCompress) - ( char* dest, +int BZ_API(BZ2_bzBuffToBuffCompress) + ( char* dest, unsigned int* destLen, - char* source, + char* source, unsigned int sourceLen, - int blockSize100k, - int verbosity, + int blockSize100k, + int verbosity, int workFactor ) { bz_stream strm; int ret; - if (dest == NULL || destLen == NULL || + if (dest == NULL || destLen == NULL || source == NULL || blockSize100k < 1 || blockSize100k > 9 || verbosity < 0 || verbosity > 4 || - workFactor < 0 || workFactor > 250) + workFactor < 0 || workFactor > 250) return BZ_PARAM_ERROR; if (workFactor == 0) workFactor = 30; strm.bzalloc = NULL; strm.bzfree = NULL; strm.opaque = NULL; - ret = BZ2_bzCompressInit ( &strm, blockSize100k, + ret = BZ2_bzCompressInit ( &strm, blockSize100k, verbosity, workFactor ); if (ret != BZ_OK) return ret; @@ -126,7 +126,7 @@ int BZ_API(BZ2_bzBuffToBuffCompress) if (ret != BZ_STREAM_END) goto errhandler; /* normal termination */ - *destLen -= strm.avail_out; + *destLen -= strm.avail_out; BZ2_bzCompressEnd ( &strm ); return BZ_OK; @@ -138,4 +138,3 @@ int BZ_API(BZ2_bzBuffToBuffCompress) BZ2_bzCompressEnd ( &strm ); return ret; } - diff --git a/src/cmd/bzip2/lib/bzcompress.c b/src/cmd/bzip2/lib/bzcompress.c index d27e6757..7f3deec0 100644 --- a/src/cmd/bzip2/lib/bzcompress.c +++ b/src/cmd/bzip2/lib/bzcompress.c @@ -28,16 +28,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -125,8 +125,8 @@ Bool isempty_RL ( EState* s ) /*---------------------------------------------------*/ -int BZ_API(BZ2_bzCompressInit) - ( bz_stream* strm, +int BZ_API(BZ2_bzCompressInit) + ( bz_stream* strm, int blockSize100k, int verbosity, int workFactor ) @@ -136,7 +136,7 @@ int BZ_API(BZ2_bzCompressInit) if (!bz_config_ok()) return BZ_CONFIG_ERROR; - if (strm == NULL || + if (strm == NULL || blockSize100k < 1 || blockSize100k > 9 || workFactor < 0 || workFactor > 250) return BZ_PARAM_ERROR; @@ -279,7 +279,7 @@ Bool copy_input_until_stop ( EState* s ) /*-- no input? --*/ if (s->strm->avail_in == 0) break; progress_in = True; - ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) ); + ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) ); s->strm->next_in++; s->strm->avail_in--; s->strm->total_in_lo32++; @@ -297,7 +297,7 @@ Bool copy_input_until_stop ( EState* s ) /*-- flush/finish end? --*/ if (s->avail_in_expect == 0) break; progress_in = True; - ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) ); + ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) ); s->strm->next_in++; s->strm->avail_in--; s->strm->total_in_lo32++; @@ -343,18 +343,18 @@ Bool handle_compress ( bz_stream* strm ) Bool progress_in = False; Bool progress_out = False; EState* s = strm->state; - + while (True) { if (s->state == BZ_S_OUTPUT) { progress_out |= copy_output_until_stop ( s ); if (s->state_out_pos < s->numZ) break; - if (s->mode == BZ_M_FINISHING && + if (s->mode == BZ_M_FINISHING && s->avail_in_expect == 0 && isempty_RL(s)) break; prepare_new_block ( s ); s->state = BZ_S_INPUT; - if (s->mode == BZ_M_FLUSHING && + if (s->mode == BZ_M_FLUSHING && s->avail_in_expect == 0 && isempty_RL(s)) break; } @@ -402,7 +402,7 @@ int BZ_API(BZ2_bzCompress) ( bz_stream *strm, int action ) if (action == BZ_RUN) { progress = handle_compress ( strm ); return progress ? BZ_RUN_OK : BZ_PARAM_ERROR; - } + } else if (action == BZ_FLUSH) { s->avail_in_expect = strm->avail_in; @@ -415,12 +415,12 @@ int BZ_API(BZ2_bzCompress) ( bz_stream *strm, int action ) s->mode = BZ_M_FINISHING; goto preswitch; } - else + else return BZ_PARAM_ERROR; case BZ_M_FLUSHING: if (action != BZ_FLUSH) return BZ_SEQUENCE_ERROR; - if (s->avail_in_expect != s->strm->avail_in) + if (s->avail_in_expect != s->strm->avail_in) return BZ_SEQUENCE_ERROR; progress = handle_compress ( strm ); if (!progress) return BZ_SEQUENCE_ERROR; /*rsc added */ @@ -431,7 +431,7 @@ int BZ_API(BZ2_bzCompress) ( bz_stream *strm, int action ) case BZ_M_FINISHING: if (action != BZ_FINISH) return BZ_SEQUENCE_ERROR; - if (s->avail_in_expect != s->strm->avail_in) + if (s->avail_in_expect != s->strm->avail_in) return BZ_SEQUENCE_ERROR; progress = handle_compress ( strm ); if (!progress) return BZ_SEQUENCE_ERROR; @@ -458,8 +458,7 @@ int BZ_API(BZ2_bzCompressEnd) ( bz_stream *strm ) if (s->ftab != NULL) BZFREE(s->ftab); BZFREE(strm->state); - strm->state = NULL; + strm->state = NULL; return BZ_OK; } - diff --git a/src/cmd/bzip2/lib/bzdecompress.c b/src/cmd/bzip2/lib/bzdecompress.c index 25ed9253..da3251fb 100644 --- a/src/cmd/bzip2/lib/bzdecompress.c +++ b/src/cmd/bzip2/lib/bzdecompress.c @@ -28,16 +28,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -93,8 +93,8 @@ /*---------------------------------------------------*/ /*---------------------------------------------------*/ -int BZ_API(BZ2_bzDecompressInit) - ( bz_stream* strm, +int BZ_API(BZ2_bzDecompressInit) + ( bz_stream* strm, int verbosity, int small ) { @@ -153,34 +153,34 @@ void unRLE_obuf_to_output_FAST ( DState* s ) s->strm->total_out_lo32++; if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++; } - + /* can a new run be started? */ if (s->nblock_used == s->save_nblock+1) return; - - + + s->state_out_len = 1; s->state_out_ch = s->k0; - BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; + BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; k1 ^= BZ_RAND_MASK; s->nblock_used++; if (s->nblock_used == s->save_nblock+1) continue; if (k1 != s->k0) { s->k0 = k1; continue; }; - + s->state_out_len = 2; - BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; + BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; k1 ^= BZ_RAND_MASK; s->nblock_used++; if (s->nblock_used == s->save_nblock+1) continue; if (k1 != s->k0) { s->k0 = k1; continue; }; - + s->state_out_len = 3; - BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; + BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; k1 ^= BZ_RAND_MASK; s->nblock_used++; if (s->nblock_used == s->save_nblock+1) continue; if (k1 != s->k0) { s->k0 = k1; continue; }; - - BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; + + BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; k1 ^= BZ_RAND_MASK; s->nblock_used++; s->state_out_len = ((Int32)k1) + 4; - BZ_GET_FAST(s->k0); BZ_RAND_UPD_MASK; + BZ_GET_FAST(s->k0); BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; s->nblock_used++; } @@ -217,7 +217,7 @@ void unRLE_obuf_to_output_FAST ( DState* s ) } s_state_out_len_eq_one: { - if (cs_avail_out == 0) { + if (cs_avail_out == 0) { c_state_out_len = 1; goto return_notr; }; *( (UChar*)(cs_next_out) ) = c_state_out_ch; @@ -225,29 +225,29 @@ void unRLE_obuf_to_output_FAST ( DState* s ) cs_next_out++; cs_avail_out--; } - } + } /* can a new run be started? */ if (c_nblock_used == s_save_nblockPP) { c_state_out_len = 0; goto return_notr; - }; + }; c_state_out_ch = c_k0; BZ_GET_FAST_C(k1); c_nblock_used++; - if (k1 != c_k0) { - c_k0 = k1; goto s_state_out_len_eq_one; + if (k1 != c_k0) { + c_k0 = k1; goto s_state_out_len_eq_one; }; - if (c_nblock_used == s_save_nblockPP) + if (c_nblock_used == s_save_nblockPP) goto s_state_out_len_eq_one; - + c_state_out_len = 2; BZ_GET_FAST_C(k1); c_nblock_used++; if (c_nblock_used == s_save_nblockPP) continue; if (k1 != c_k0) { c_k0 = k1; continue; }; - + c_state_out_len = 3; BZ_GET_FAST_C(k1); c_nblock_used++; if (c_nblock_used == s_save_nblockPP) continue; if (k1 != c_k0) { c_k0 = k1; continue; }; - + BZ_GET_FAST_C(k1); c_nblock_used++; c_state_out_len = ((Int32)k1) + 4; BZ_GET_FAST_C(c_k0); c_nblock_used++; @@ -311,34 +311,34 @@ void unRLE_obuf_to_output_SMALL ( DState* s ) s->strm->total_out_lo32++; if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++; } - + /* can a new run be started? */ if (s->nblock_used == s->save_nblock+1) return; - - + + s->state_out_len = 1; s->state_out_ch = s->k0; - BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; + BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; k1 ^= BZ_RAND_MASK; s->nblock_used++; if (s->nblock_used == s->save_nblock+1) continue; if (k1 != s->k0) { s->k0 = k1; continue; }; - + s->state_out_len = 2; - BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; + BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; k1 ^= BZ_RAND_MASK; s->nblock_used++; if (s->nblock_used == s->save_nblock+1) continue; if (k1 != s->k0) { s->k0 = k1; continue; }; - + s->state_out_len = 3; - BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; + BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; k1 ^= BZ_RAND_MASK; s->nblock_used++; if (s->nblock_used == s->save_nblock+1) continue; if (k1 != s->k0) { s->k0 = k1; continue; }; - - BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; + + BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; k1 ^= BZ_RAND_MASK; s->nblock_used++; s->state_out_len = ((Int32)k1) + 4; - BZ_GET_SMALL(s->k0); BZ_RAND_UPD_MASK; + BZ_GET_SMALL(s->k0); BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; s->nblock_used++; } @@ -357,26 +357,26 @@ void unRLE_obuf_to_output_SMALL ( DState* s ) s->strm->total_out_lo32++; if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++; } - + /* can a new run be started? */ if (s->nblock_used == s->save_nblock+1) return; - + s->state_out_len = 1; s->state_out_ch = s->k0; BZ_GET_SMALL(k1); s->nblock_used++; if (s->nblock_used == s->save_nblock+1) continue; if (k1 != s->k0) { s->k0 = k1; continue; }; - + s->state_out_len = 2; BZ_GET_SMALL(k1); s->nblock_used++; if (s->nblock_used == s->save_nblock+1) continue; if (k1 != s->k0) { s->k0 = k1; continue; }; - + s->state_out_len = 3; BZ_GET_SMALL(k1); s->nblock_used++; if (s->nblock_used == s->save_nblock+1) continue; if (k1 != s->k0) { s->k0 = k1; continue; }; - + BZ_GET_SMALL(k1); s->nblock_used++; s->state_out_len = ((Int32)k1) + 4; BZ_GET_SMALL(s->k0); s->nblock_used++; @@ -403,14 +403,14 @@ int BZ_API(BZ2_bzDecompress) ( bz_stream *strm ) unRLE_obuf_to_output_FAST ( s ); if (s->nblock_used == s->save_nblock+1 && s->state_out_len == 0) { BZ_FINALISE_CRC ( s->calculatedBlockCRC ); - if (s->verbosity >= 3) - VPrintf2 ( " {0x%x, 0x%x}", s->storedBlockCRC, + if (s->verbosity >= 3) + VPrintf2 ( " {0x%x, 0x%x}", s->storedBlockCRC, s->calculatedBlockCRC ); if (s->verbosity >= 2) VPrintf0 ( "]" ); if (s->calculatedBlockCRC != s->storedBlockCRC) return BZ_DATA_ERROR; - s->calculatedCombinedCRC - = (s->calculatedCombinedCRC << 1) | + s->calculatedCombinedCRC + = (s->calculatedCombinedCRC << 1) | (s->calculatedCombinedCRC >> 31); s->calculatedCombinedCRC ^= s->calculatedBlockCRC; s->state = BZ_X_BLKHDR_1; @@ -422,7 +422,7 @@ int BZ_API(BZ2_bzDecompress) ( bz_stream *strm ) Int32 r = BZ2_decompress ( s ); if (r == BZ_STREAM_END) { if (s->verbosity >= 3) - VPrintf2 ( "\n combined CRCs: stored = 0x%x, computed = 0x%x", + VPrintf2 ( "\n combined CRCs: stored = 0x%x, computed = 0x%x", s->storedCombinedCRC, s->calculatedCombinedCRC ); if (s->calculatedCombinedCRC != s->storedCombinedCRC) return BZ_DATA_ERROR; @@ -435,7 +435,7 @@ int BZ_API(BZ2_bzDecompress) ( bz_stream *strm ) /* AssertH ( 0, 6001 ); - return 0; + return 0; */ } @@ -458,4 +458,3 @@ int BZ_API(BZ2_bzDecompressEnd) ( bz_stream *strm ) return BZ_OK; } - diff --git a/src/cmd/bzip2/lib/bzfeof.c b/src/cmd/bzip2/lib/bzfeof.c index 74e1f88d..c96974da 100644 --- a/src/cmd/bzip2/lib/bzfeof.c +++ b/src/cmd/bzip2/lib/bzfeof.c @@ -28,16 +28,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -97,4 +97,3 @@ Bool bz_feof ( FILE* f ) ungetc ( c, f ); return False; } - diff --git a/src/cmd/bzip2/lib/bzlib.c b/src/cmd/bzip2/lib/bzlib.c index 66b89a2e..12a4bf90 100644 --- a/src/cmd/bzip2/lib/bzlib.c +++ b/src/cmd/bzip2/lib/bzlib.c @@ -28,16 +28,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS diff --git a/src/cmd/bzip2/lib/bzlib.h b/src/cmd/bzip2/lib/bzlib.h index 0ece4e8a..fae78bcb 100644 --- a/src/cmd/bzip2/lib/bzlib.h +++ b/src/cmd/bzip2/lib/bzlib.h @@ -29,16 +29,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -96,7 +96,7 @@ extern "C" { #define BZ_OUTBUFF_FULL (-8) #define BZ_CONFIG_ERROR (-9) -typedef +typedef struct { char *next_in; unsigned int avail_in; @@ -113,7 +113,7 @@ typedef void *(*bzalloc)(void *,int,int); void (*bzfree)(void *,void *); void *opaque; - } + } bz_stream; @@ -144,57 +144,57 @@ typedef /*-- Core (low-level) library functions --*/ -BZ_EXTERN int BZ_API(BZ2_bzCompressInit) ( - bz_stream* strm, - int blockSize100k, - int verbosity, - int workFactor +BZ_EXTERN int BZ_API(BZ2_bzCompressInit) ( + bz_stream* strm, + int blockSize100k, + int verbosity, + int workFactor ); -BZ_EXTERN int BZ_API(BZ2_bzCompress) ( - bz_stream* strm, - int action +BZ_EXTERN int BZ_API(BZ2_bzCompress) ( + bz_stream* strm, + int action ); -BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) ( - bz_stream* strm +BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) ( + bz_stream* strm ); -BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) ( - bz_stream *strm, - int verbosity, +BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) ( + bz_stream *strm, + int verbosity, int small ); -BZ_EXTERN int BZ_API(BZ2_bzDecompress) ( - bz_stream* strm +BZ_EXTERN int BZ_API(BZ2_bzDecompress) ( + bz_stream* strm ); -BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) ( - bz_stream *strm +BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) ( + bz_stream *strm ); /*-- Utility functions --*/ -BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) ( - char* dest, +BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) ( + char* dest, unsigned int* destLen, - char* source, + char* source, unsigned int sourceLen, - int blockSize100k, - int verbosity, - int workFactor + int blockSize100k, + int verbosity, + int workFactor ); -BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) ( - char* dest, +BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) ( + char* dest, unsigned int* destLen, - char* source, + char* source, unsigned int sourceLen, - int small, - int verbosity + int small, + int verbosity ); diff --git a/src/cmd/bzip2/lib/bzlib_private.h b/src/cmd/bzip2/lib/bzlib_private.h index ad578706..002d79b3 100644 --- a/src/cmd/bzip2/lib/bzlib_private.h +++ b/src/cmd/bzip2/lib/bzlib_private.h @@ -29,16 +29,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -80,7 +80,7 @@ #ifndef __GNUC__ #define __inline__ /* */ -#endif +#endif /* these #defines can be overridden by bzlib_stdio.h */ extern void bz_internal_error ( int errcode ); @@ -257,19 +257,19 @@ typedef /*-- externs for compression. --*/ -extern void +extern void BZ2_blockSort ( EState* ); -extern void +extern void BZ2_compressBlock ( EState*, Bool ); -extern void +extern void BZ2_bsInitWrite ( EState* ); -extern void +extern void BZ2_hbAssignCodes ( Int32*, UChar*, Int32, Int32, Int32 ); -extern void +extern void BZ2_hbMakeCodeLengths ( UChar*, Int32*, Int32, Int32 ); @@ -413,7 +413,7 @@ typedef Int32 save_N; Int32 save_curr; Int32 save_zt; - Int32 save_zn; + Int32 save_zn; Int32 save_zvec; Int32 save_zj; Int32 save_gSel; @@ -463,13 +463,13 @@ typedef /*-- externs for decompression. --*/ -extern Int32 +extern Int32 BZ2_indexIntoF ( Int32, Int32* ); -extern Int32 +extern Int32 BZ2_decompress ( DState* ); -extern void +extern void BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*, Int32, Int32, Int32 ); diff --git a/src/cmd/bzip2/lib/bzlib_stdio.h b/src/cmd/bzip2/lib/bzlib_stdio.h index 30d41d99..18805f0b 100644 --- a/src/cmd/bzip2/lib/bzlib_stdio.h +++ b/src/cmd/bzip2/lib/bzlib_stdio.h @@ -28,16 +28,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -99,17 +99,17 @@ BZ_EXTERN BZFILE * BZ_API(BZ2_bzdopen) ( int fd, const char *mode ); - + BZ_EXTERN int BZ_API(BZ2_bzread) ( - BZFILE* b, - void* buf, - int len + BZFILE* b, + void* buf, + int len ); BZ_EXTERN int BZ_API(BZ2_bzwrite) ( - BZFILE* b, - void* buf, - int len + BZFILE* b, + void* buf, + int len ); BZ_EXTERN int BZ_API(BZ2_bzflush) ( @@ -121,70 +121,69 @@ BZ_EXTERN void BZ_API(BZ2_bzclose) ( ); BZ_EXTERN const char * BZ_API(BZ2_bzerror) ( - BZFILE *b, + BZFILE *b, int *errnum ); /*-- High(er) level library functions --*/ -BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) ( - int* bzerror, - FILE* f, - int verbosity, +BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) ( + int* bzerror, + FILE* f, + int verbosity, int small, - void* unused, - int nUnused + void* unused, + int nUnused ); -BZ_EXTERN void BZ_API(BZ2_bzReadClose) ( - int* bzerror, - BZFILE* b +BZ_EXTERN void BZ_API(BZ2_bzReadClose) ( + int* bzerror, + BZFILE* b ); -BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) ( - int* bzerror, - BZFILE* b, - void** unused, - int* nUnused +BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) ( + int* bzerror, + BZFILE* b, + void** unused, + int* nUnused ); -BZ_EXTERN int BZ_API(BZ2_bzRead) ( - int* bzerror, - BZFILE* b, - void* buf, - int len +BZ_EXTERN int BZ_API(BZ2_bzRead) ( + int* bzerror, + BZFILE* b, + void* buf, + int len ); -BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) ( - int* bzerror, - FILE* f, - int blockSize100k, - int verbosity, - int workFactor +BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) ( + int* bzerror, + FILE* f, + int blockSize100k, + int verbosity, + int workFactor ); -BZ_EXTERN void BZ_API(BZ2_bzWrite) ( - int* bzerror, - BZFILE* b, - void* buf, - int len +BZ_EXTERN void BZ_API(BZ2_bzWrite) ( + int* bzerror, + BZFILE* b, + void* buf, + int len ); -BZ_EXTERN void BZ_API(BZ2_bzWriteClose) ( - int* bzerror, - BZFILE* b, - int abandon, - unsigned int* nbytes_in, - unsigned int* nbytes_out +BZ_EXTERN void BZ_API(BZ2_bzWriteClose) ( + int* bzerror, + BZFILE* b, + int abandon, + unsigned int* nbytes_in, + unsigned int* nbytes_out ); -BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) ( - int* bzerror, - BZFILE* b, - int abandon, - unsigned int* nbytes_in_lo32, - unsigned int* nbytes_in_hi32, - unsigned int* nbytes_out_lo32, +BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) ( + int* bzerror, + BZFILE* b, + int abandon, + unsigned int* nbytes_in_lo32, + unsigned int* nbytes_in_hi32, + unsigned int* nbytes_out_lo32, unsigned int* nbytes_out_hi32 ); - diff --git a/src/cmd/bzip2/lib/bzlib_stdio_private.h b/src/cmd/bzip2/lib/bzlib_stdio_private.h index 24b31144..caacf36a 100644 --- a/src/cmd/bzip2/lib/bzlib_stdio_private.h +++ b/src/cmd/bzip2/lib/bzlib_stdio_private.h @@ -53,7 +53,7 @@ extern void BZ2_bz__AssertH__fail ( int errcode ); if (bzf != NULL) bzf->lastErr = eee; \ } -typedef +typedef struct { FILE* handle; Char buf[BZ_MAX_UNUSED]; @@ -66,4 +66,3 @@ typedef bzFile; extern Bool bz_feof( FILE* ); - diff --git a/src/cmd/bzip2/lib/bzread.c b/src/cmd/bzip2/lib/bzread.c index 8bd03888..e523d249 100644 --- a/src/cmd/bzip2/lib/bzread.c +++ b/src/cmd/bzip2/lib/bzread.c @@ -19,16 +19,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -82,9 +82,9 @@ #include "bzlib_stdio_private.h" /*---------------------------------------------------*/ -BZFILE* BZ_API(BZ2_bzReadOpen) - ( int* bzerror, - FILE* f, +BZFILE* BZ_API(BZ2_bzReadOpen) + ( int* bzerror, + FILE* f, int verbosity, int small, void* unused, @@ -95,7 +95,7 @@ BZFILE* BZ_API(BZ2_bzReadOpen) BZ_SETERR(BZ_OK); - if (f == NULL || + if (f == NULL || (small != 0 && small != 1) || (verbosity < 0 || verbosity > 4) || (unused == NULL && nUnused != 0) || @@ -106,7 +106,7 @@ BZFILE* BZ_API(BZ2_bzReadOpen) { BZ_SETERR(BZ_IO_ERROR); return NULL; }; bzf = malloc ( sizeof(bzFile) ); - if (bzf == NULL) + if (bzf == NULL) { BZ_SETERR(BZ_MEM_ERROR); return NULL; }; BZ_SETERR(BZ_OK); @@ -118,7 +118,7 @@ BZFILE* BZ_API(BZ2_bzReadOpen) bzf->strm.bzalloc = NULL; bzf->strm.bzfree = NULL; bzf->strm.opaque = NULL; - + while (nUnused > 0) { bzf->buf[bzf->bufN] = *((UChar*)(unused)); bzf->bufN++; unused = ((void*)( 1 + ((UChar*)(unused)) )); @@ -133,7 +133,7 @@ BZFILE* BZ_API(BZ2_bzReadOpen) bzf->strm.next_in = bzf->buf; bzf->initialisedOk = True; - return bzf; + return bzf; } @@ -156,10 +156,10 @@ void BZ_API(BZ2_bzReadClose) ( int *bzerror, BZFILE *b ) /*---------------------------------------------------*/ -int BZ_API(BZ2_bzRead) - ( int* bzerror, - BZFILE* b, - void* buf, +int BZ_API(BZ2_bzRead) + ( int* bzerror, + BZFILE* b, + void* buf, int len ) { Int32 n, ret; @@ -181,11 +181,11 @@ int BZ_API(BZ2_bzRead) while (True) { - if (ferror(bzf->handle)) + if (ferror(bzf->handle)) { BZ_SETERR(BZ_IO_ERROR); return 0; }; if (bzf->strm.avail_in == 0 && !bz_feof(bzf->handle)) { - n = fread ( bzf->buf, sizeof(UChar), + n = fread ( bzf->buf, sizeof(UChar), BZ_MAX_UNUSED, bzf->handle ); if (ferror(bzf->handle)) { BZ_SETERR(BZ_IO_ERROR); return 0; }; @@ -199,7 +199,7 @@ int BZ_API(BZ2_bzRead) if (ret != BZ_OK && ret != BZ_STREAM_END) { BZ_SETERR(ret); return 0; }; - if (ret == BZ_OK && bz_feof(bzf->handle) && + if (ret == BZ_OK && bz_feof(bzf->handle) && bzf->strm.avail_in == 0 && bzf->strm.avail_out > 0) { BZ_SETERR(BZ_UNEXPECTED_EOF); return 0; }; @@ -208,7 +208,7 @@ int BZ_API(BZ2_bzRead) return len - bzf->strm.avail_out; }; if (bzf->strm.avail_out == 0) { BZ_SETERR(BZ_OK); return len; }; - + } /* return 0; not reached*/ @@ -216,10 +216,10 @@ int BZ_API(BZ2_bzRead) /*---------------------------------------------------*/ -void BZ_API(BZ2_bzReadGetUnused) - ( int* bzerror, - BZFILE* b, - void** unused, +void BZ_API(BZ2_bzReadGetUnused) + ( int* bzerror, + BZFILE* b, + void** unused, int* nUnused ) { bzFile* bzf = (bzFile*)b; diff --git a/src/cmd/bzip2/lib/bzstdio.c b/src/cmd/bzip2/lib/bzstdio.c index 3e1f2de5..31b0a768 100644 --- a/src/cmd/bzip2/lib/bzstdio.c +++ b/src/cmd/bzip2/lib/bzstdio.c @@ -28,16 +28,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -95,4 +95,3 @@ Bool bz_feof ( FILE* f ) ungetc ( c, f ); return False; } - diff --git a/src/cmd/bzip2/lib/bzversion.c b/src/cmd/bzip2/lib/bzversion.c index 5320144b..601d0c91 100644 --- a/src/cmd/bzip2/lib/bzversion.c +++ b/src/cmd/bzip2/lib/bzversion.c @@ -28,16 +28,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -96,4 +96,3 @@ const char * BZ_API(BZ2_bzlibVersion)(void) { return BZ_VERSION; } - diff --git a/src/cmd/bzip2/lib/bzwrite.c b/src/cmd/bzip2/lib/bzwrite.c index a37a66ba..086b6e2d 100644 --- a/src/cmd/bzip2/lib/bzwrite.c +++ b/src/cmd/bzip2/lib/bzwrite.c @@ -19,16 +19,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -82,10 +82,10 @@ #include "bzlib_stdio_private.h" /*---------------------------------------------------*/ -BZFILE* BZ_API(BZ2_bzWriteOpen) - ( int* bzerror, - FILE* f, - int blockSize100k, +BZFILE* BZ_API(BZ2_bzWriteOpen) + ( int* bzerror, + FILE* f, + int blockSize100k, int verbosity, int workFactor ) { @@ -117,23 +117,23 @@ BZFILE* BZ_API(BZ2_bzWriteOpen) bzf->strm.opaque = NULL; if (workFactor == 0) workFactor = 30; - ret = BZ2_bzCompressInit ( &(bzf->strm), blockSize100k, + ret = BZ2_bzCompressInit ( &(bzf->strm), blockSize100k, verbosity, workFactor ); if (ret != BZ_OK) { BZ_SETERR(ret); free(bzf); return NULL; }; bzf->strm.avail_in = 0; bzf->initialisedOk = True; - return bzf; + return bzf; } /*---------------------------------------------------*/ void BZ_API(BZ2_bzWrite) - ( int* bzerror, - BZFILE* b, - void* buf, + ( int* bzerror, + BZFILE* b, + void* buf, int len ) { Int32 n, n2, ret; @@ -162,7 +162,7 @@ void BZ_API(BZ2_bzWrite) if (bzf->strm.avail_out < BZ_MAX_UNUSED) { n = BZ_MAX_UNUSED - bzf->strm.avail_out; - n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar), + n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar), n, bzf->handle ); if (n != n2 || ferror(bzf->handle)) { BZ_SETERR(BZ_IO_ERROR); return; }; @@ -176,20 +176,20 @@ void BZ_API(BZ2_bzWrite) /*---------------------------------------------------*/ void BZ_API(BZ2_bzWriteClose) - ( int* bzerror, - BZFILE* b, + ( int* bzerror, + BZFILE* b, int abandon, unsigned int* nbytes_in, unsigned int* nbytes_out ) { - BZ2_bzWriteClose64 ( bzerror, b, abandon, + BZ2_bzWriteClose64 ( bzerror, b, abandon, nbytes_in, NULL, nbytes_out, NULL ); } void BZ_API(BZ2_bzWriteClose64) - ( int* bzerror, - BZFILE* b, + ( int* bzerror, + BZFILE* b, int abandon, unsigned int* nbytes_in_lo32, unsigned int* nbytes_in_hi32, @@ -221,7 +221,7 @@ void BZ_API(BZ2_bzWriteClose64) if (bzf->strm.avail_out < BZ_MAX_UNUSED) { n = BZ_MAX_UNUSED - bzf->strm.avail_out; - n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar), + n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar), n, bzf->handle ); if (n != n2 || ferror(bzf->handle)) { BZ_SETERR(BZ_IO_ERROR); return; }; @@ -250,4 +250,3 @@ void BZ_API(BZ2_bzWriteClose64) BZ2_bzCompressEnd ( &(bzf->strm) ); free ( bzf ); } - diff --git a/src/cmd/bzip2/lib/bzzlib.c b/src/cmd/bzip2/lib/bzzlib.c index 87b69128..56b0b7de 100644 --- a/src/cmd/bzip2/lib/bzzlib.c +++ b/src/cmd/bzip2/lib/bzzlib.c @@ -28,16 +28,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -128,7 +128,7 @@ BZFILE * bzopen_or_bzdopen int verbosity = 0; int workFactor = 30; int smallMode = 0; - int nUnused = 0; + int nUnused = 0; if (mode == NULL) return NULL; while (*mode) { @@ -168,7 +168,7 @@ BZFILE * bzopen_or_bzdopen if (writing) { /* Guard against total chaos and anarchy -- JRS */ if (blockSize100k < 1) blockSize100k = 1; - if (blockSize100k > 9) blockSize100k = 9; + if (blockSize100k > 9) blockSize100k = 9; bzfp = BZ2_bzWriteOpen(&bzerr,fp,blockSize100k, verbosity,workFactor); } else { @@ -247,7 +247,7 @@ void BZ_API(BZ2_bzclose) (BZFILE* b) { int bzerr; FILE *fp = ((bzFile *)b)->handle; - + if (b==NULL) {return;} if(((bzFile*)b)->writing){ BZ2_bzWriteClose(&bzerr,b,0,NULL,NULL); @@ -265,7 +265,7 @@ void BZ_API(BZ2_bzclose) (BZFILE* b) /*---------------------------------------------------*/ /*-- - return last error code + return last error code --*/ static char *bzerrorstrings[] = { "OK" diff --git a/src/cmd/bzip2/lib/compress.c b/src/cmd/bzip2/lib/compress.c index 96c55918..c7a1aa80 100644 --- a/src/cmd/bzip2/lib/compress.c +++ b/src/cmd/bzip2/lib/compress.c @@ -17,16 +17,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -66,7 +66,7 @@ 0.9.0a/b -- no changes in this file. 0.9.0c - * changed setting of nGroups in sendMTFValues() so as to + * changed setting of nGroups in sendMTFValues() so as to do a bit better on small files --*/ @@ -171,11 +171,11 @@ void generateMTFValues ( EState* s ) Int32 wr; Int32 EOB; - /* + /* After sorting (eg, here), s->arr1 [ 0 .. s->nblock-1 ] holds sorted order, and - ((UChar*)s->arr2) [ 0 .. s->nblock-1 ] + ((UChar*)s->arr2) [ 0 .. s->nblock-1 ] holds the original block data. The first thing to do is generate the MTF values, @@ -190,7 +190,7 @@ void generateMTFValues ( EState* s ) (UChar*) (&((UChar*)s->arr2)[s->nblock]) These storage aliases are set up in bzCompressInit(), - except for the last one, which is arranged in + except for the last one, which is arranged in compressBlock(). */ UInt32* ptr = s->ptr; @@ -213,7 +213,7 @@ void generateMTFValues ( EState* s ) ll_i = s->unseqToSeq[block[j]]; AssertD ( ll_i < s->nInUse, "generateMTFValues(2a)" ); - if (yy[0] == ll_i) { + if (yy[0] == ll_i) { zPend++; } else { @@ -221,11 +221,11 @@ void generateMTFValues ( EState* s ) zPend--; while (True) { if (zPend & 1) { - mtfv[wr] = BZ_RUNB; wr++; - s->mtfFreq[BZ_RUNB]++; + mtfv[wr] = BZ_RUNB; wr++; + s->mtfFreq[BZ_RUNB]++; } else { - mtfv[wr] = BZ_RUNA; wr++; - s->mtfFreq[BZ_RUNA]++; + mtfv[wr] = BZ_RUNA; wr++; + s->mtfFreq[BZ_RUNA]++; } if (zPend < 2) break; zPend = (zPend - 2) / 2; @@ -259,11 +259,11 @@ void generateMTFValues ( EState* s ) zPend--; while (True) { if (zPend & 1) { - mtfv[wr] = BZ_RUNB; wr++; - s->mtfFreq[BZ_RUNB]++; + mtfv[wr] = BZ_RUNB; wr++; + s->mtfFreq[BZ_RUNB]++; } else { - mtfv[wr] = BZ_RUNA; wr++; - s->mtfFreq[BZ_RUNA]++; + mtfv[wr] = BZ_RUNA; wr++; + s->mtfFreq[BZ_RUNA]++; } if (zPend < 2) break; zPend = (zPend - 2) / 2; @@ -306,7 +306,7 @@ void sendMTFValues ( EState* s ) if (s->verbosity >= 3) VPrintf3( " %d in block, %d after MTF & 1-2 coding, " - "%d+2 syms in use\n", + "%d+2 syms in use\n", s->nblock, s->nMTF, s->nInUse ); alphaSize = s->nInUse+2; @@ -323,7 +323,7 @@ void sendMTFValues ( EState* s ) nGroups = 6; /*--- Generate an initial set of coding tables ---*/ - { + { Int32 nPart, remF, tFreq, aFreq; nPart = nGroups; @@ -338,8 +338,8 @@ void sendMTFValues ( EState* s ) aFreq += s->mtfFreq[ge]; } - if (ge > gs - && nPart != nGroups && nPart != 1 + if (ge > gs + && nPart != nGroups && nPart != 1 && ((nGroups-nPart) % 2 == 1)) { aFreq -= s->mtfFreq[ge]; ge--; @@ -348,21 +348,21 @@ void sendMTFValues ( EState* s ) if (s->verbosity >= 3) VPrintf5( " initial group %d, [%d .. %d], " "has %d syms (%4.1f%%)\n", - nPart, gs, ge, aFreq, + nPart, gs, ge, aFreq, (100.0 * (float)aFreq) / (float)(s->nMTF) ); - + for (v = 0; v < alphaSize; v++) - if (v >= gs && v <= ge) + if (v >= gs && v <= ge) s->len[nPart-1][v] = BZ_LESSER_ICOST; else s->len[nPart-1][v] = BZ_GREATER_ICOST; - + nPart--; gs = ge+1; remF -= aFreq; } } - /*--- + /*--- Iterate up to BZ_N_ITERS times to improve the tables. ---*/ nSelectors = 40000; /* shut up some compilers' warnings about used and not set */ @@ -377,7 +377,7 @@ void sendMTFValues ( EState* s ) /*--- Set up an auxiliary length table which is used to fast-track - the common case (nGroups == 6). + the common case (nGroups == 6). ---*/ if (nGroups == 6) { for (v = 0; v < alphaSize; v++) { @@ -394,10 +394,10 @@ void sendMTFValues ( EState* s ) /*--- Set group start & end marks. --*/ if (gs >= s->nMTF) break; - ge = gs + BZ_G_SIZE - 1; + ge = gs + BZ_G_SIZE - 1; if (ge >= s->nMTF) ge = s->nMTF-1; - /*-- + /*-- Calculate the cost of this group as coded by each of the coding tables. --*/ @@ -434,13 +434,13 @@ void sendMTFValues ( EState* s ) } else { /*--- slow version which correctly handles all situations ---*/ - for (i = gs; i <= ge; i++) { + for (i = gs; i <= ge; i++) { UInt16 icv = mtfv[i]; for (t = 0; t < nGroups; t++) cost[t] += s->len[t][icv]; } } - - /*-- + + /*-- Find the coding table which is best for this group, and record its identity in the selector table. --*/ @@ -452,7 +452,7 @@ void sendMTFValues ( EState* s ) s->selector[nSelectors] = bt; nSelectors++; - /*-- + /*-- Increment the symbol frequencies for the selected table. --*/ if (nGroups == 6 && 50 == ge-gs+1) { @@ -482,7 +482,7 @@ void sendMTFValues ( EState* s ) gs = ge+1; } if (s->verbosity >= 3) { - VPrintf2 ( " pass %d: size is %d, grp uses are ", + VPrintf2 ( " pass %d: size is %d, grp uses are ", iter+1, totc/8 ); for (t = 0; t < nGroups; t++) VPrintf1 ( "%d ", fave[t] ); @@ -493,7 +493,7 @@ void sendMTFValues ( EState* s ) Recompute the tables based on the accumulated frequencies. --*/ for (t = 0; t < nGroups; t++) - BZ2_hbMakeCodeLengths ( &(s->len[t][0]), &(s->rfreq[t][0]), + BZ2_hbMakeCodeLengths ( &(s->len[t][0]), &(s->rfreq[t][0]), alphaSize, 20 ); } @@ -533,19 +533,19 @@ void sendMTFValues ( EState* s ) } AssertH ( !(maxLen > 20), 3004 ); AssertH ( !(minLen < 1), 3005 ); - BZ2_hbAssignCodes ( &(s->code[t][0]), &(s->len[t][0]), + BZ2_hbAssignCodes ( &(s->code[t][0]), &(s->len[t][0]), minLen, maxLen, alphaSize ); } /*--- Transmit the mapping table. ---*/ - { + { Bool inUse16[16]; for (i = 0; i < 16; i++) { inUse16[i] = False; for (j = 0; j < 16; j++) if (s->inUse[i * 16 + j]) inUse16[i] = True; } - + nBytes = s->numZ; for (i = 0; i < 16; i++) if (inUse16[i]) bsW(s,1,1); else bsW(s,1,0); @@ -556,7 +556,7 @@ void sendMTFValues ( EState* s ) if (s->inUse[i * 16 + j]) bsW(s,1,1); else bsW(s,1,0); } - if (s->verbosity >= 3) + if (s->verbosity >= 3) VPrintf1( " bytes: mapping %d, ", s->numZ-nBytes ); } @@ -564,7 +564,7 @@ void sendMTFValues ( EState* s ) nBytes = s->numZ; bsW ( s, 3, nGroups ); bsW ( s, 15, nSelectors ); - for (i = 0; i < nSelectors; i++) { + for (i = 0; i < nSelectors; i++) { for (j = 0; j < s->selectorMtf[i]; j++) bsW(s,1,1); bsW(s,1,0); } @@ -593,14 +593,14 @@ void sendMTFValues ( EState* s ) gs = 0; while (True) { if (gs >= s->nMTF) break; - ge = gs + BZ_G_SIZE - 1; + ge = gs + BZ_G_SIZE - 1; if (ge >= s->nMTF) ge = s->nMTF-1; AssertH ( s->selector[selCtr] < nGroups, 3006 ); if (nGroups == 6 && 50 == ge-gs+1) { /*--- fast track the common case ---*/ UInt16 mtfv_i; - UChar* s_len_sel_selCtr + UChar* s_len_sel_selCtr = &(s->len[s->selector[selCtr]][0]); Int32* s_code_sel_selCtr = &(s->code[s->selector[selCtr]][0]); @@ -627,7 +627,7 @@ void sendMTFValues ( EState* s ) } else { /*--- slow version which correctly handles all situations ---*/ for (i = gs; i <= ge; i++) { - bsW ( s, + bsW ( s, s->len [s->selector[selCtr]] [mtfv[i]], s->code [s->selector[selCtr]] [mtfv[i]] ); } @@ -682,8 +682,8 @@ void BZ2_compressBlock ( EState* s, Bool is_last_block ) /*-- Now the block's CRC, so it is in a known place. --*/ bsPutUInt32 ( s, s->blockCRC ); - /*-- - Now a single bit indicating (non-)randomisation. + /*-- + Now a single bit indicating (non-)randomisation. As of version 0.9.5, we use a better sorting algorithm which makes randomisation unnecessary. So always set the randomised bit to 'no'. Of course, the decoder diff --git a/src/cmd/bzip2/lib/crctable.c b/src/cmd/bzip2/lib/crctable.c index db1eb93f..efd1f8fb 100644 --- a/src/cmd/bzip2/lib/crctable.c +++ b/src/cmd/bzip2/lib/crctable.c @@ -17,16 +17,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS diff --git a/src/cmd/bzip2/lib/decompress.c b/src/cmd/bzip2/lib/decompress.c index 734bfee7..e9f8a59d 100644 --- a/src/cmd/bzip2/lib/decompress.c +++ b/src/cmd/bzip2/lib/decompress.c @@ -17,16 +17,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -169,7 +169,7 @@ Int32 BZ2_decompress ( DState* s ) Int32 N; Int32 curr; Int32 zt; - Int32 zn; + Int32 zn; Int32 zvec; Int32 zj; Int32 gSel; @@ -223,7 +223,7 @@ Int32 BZ2_decompress ( DState* s ) N = s->save_N; curr = s->save_curr; zt = s->save_zt; - zn = s->save_zn; + zn = s->save_zn; zvec = s->save_zvec; zj = s->save_zj; gSel = s->save_gSel; @@ -246,14 +246,14 @@ Int32 BZ2_decompress ( DState* s ) if (uc != 'h') RETURN(BZ_DATA_ERROR_MAGIC); GET_BITS(BZ_X_MAGIC_4, s->blockSize100k, 8) - if (s->blockSize100k < '1' || + if (s->blockSize100k < '1' || s->blockSize100k > '9') RETURN(BZ_DATA_ERROR_MAGIC); s->blockSize100k -= '0'; if (s->smallDecompress) { s->ll16 = BZALLOC( s->blockSize100k * 100000 * sizeof(UInt16) ); - s->ll4 = BZALLOC( - ((1 + s->blockSize100k * 100000) >> 1) * sizeof(UChar) + s->ll4 = BZALLOC( + ((1 + s->blockSize100k * 100000) >> 1) * sizeof(UChar) ); if (s->ll16 == NULL || s->ll4 == NULL) RETURN(BZ_MEM_ERROR); } else { @@ -279,7 +279,7 @@ Int32 BZ2_decompress ( DState* s ) s->currBlockNo++; if (s->verbosity >= 2) VPrintf1 ( "\n [%d: huff+mtf ", s->currBlockNo ); - + s->storedBlockCRC = 0; GET_UCHAR(BZ_X_BCRC_1, uc); s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc); @@ -302,14 +302,14 @@ Int32 BZ2_decompress ( DState* s ) if (s->origPtr < 0) RETURN(BZ_DATA_ERROR); - if (s->origPtr > 10 + 100000*s->blockSize100k) + if (s->origPtr > 10 + 100000*s->blockSize100k) RETURN(BZ_DATA_ERROR); /*--- Receive the mapping table ---*/ for (i = 0; i < 16; i++) { GET_BIT(BZ_X_MAPPING_1, uc); - if (uc == 1) - s->inUse16[i] = True; else + if (uc == 1) + s->inUse16[i] = True; else s->inUse16[i] = False; } @@ -345,7 +345,7 @@ Int32 BZ2_decompress ( DState* s ) { UChar pos[BZ_N_GROUPS], tmp, v; for (v = 0; v < nGroups; v++) pos[v] = v; - + for (i = 0; i < nSelectors; i++) { v = s->selectorMtf[i]; tmp = pos[v]; @@ -378,10 +378,10 @@ Int32 BZ2_decompress ( DState* s ) if (s->len[t][i] > maxLen) maxLen = s->len[t][i]; if (s->len[t][i] < minLen) minLen = s->len[t][i]; } - BZ2_hbCreateDecodeTables ( - &(s->limit[t][0]), - &(s->base[t][0]), - &(s->perm[t][0]), + BZ2_hbCreateDecodeTables ( + &(s->limit[t][0]), + &(s->base[t][0]), + &(s->perm[t][0]), &(s->len[t][0]), minLen, maxLen, alphaSize ); @@ -473,23 +473,23 @@ Int32 BZ2_decompress ( DState* s ) s->mtfa[(z)-3] = s->mtfa[(z)-4]; nn -= 4; } - while (nn > 0) { - s->mtfa[(pp+nn)] = s->mtfa[(pp+nn)-1]; nn--; + while (nn > 0) { + s->mtfa[(pp+nn)] = s->mtfa[(pp+nn)-1]; nn--; }; s->mtfa[pp] = uc; - } else { + } else { /* general case */ lno = nn / MTFL_SIZE; off = nn % MTFL_SIZE; pp = s->mtfbase[lno] + off; uc = s->mtfa[pp]; - while (pp > s->mtfbase[lno]) { - s->mtfa[pp] = s->mtfa[pp-1]; pp--; + while (pp > s->mtfbase[lno]) { + s->mtfa[pp] = s->mtfa[pp-1]; pp--; }; s->mtfbase[lno]++; while (lno > 0) { s->mtfbase[lno]--; - s->mtfa[s->mtfbase[lno]] + s->mtfa[s->mtfbase[lno]] = s->mtfa[s->mtfbase[lno-1] + MTFL_SIZE - 1]; lno--; } @@ -565,7 +565,7 @@ Int32 BZ2_decompress ( DState* s ) if (s->blockRandomised) { BZ_RAND_INIT_MASK; BZ_GET_SMALL(s->k0); s->nblock_used++; - BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; + BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; } else { BZ_GET_SMALL(s->k0); s->nblock_used++; } @@ -584,7 +584,7 @@ Int32 BZ2_decompress ( DState* s ) if (s->blockRandomised) { BZ_RAND_INIT_MASK; BZ_GET_FAST(s->k0); s->nblock_used++; - BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; + BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; } else { BZ_GET_FAST(s->k0); s->nblock_used++; } @@ -653,7 +653,7 @@ Int32 BZ2_decompress ( DState* s ) s->save_gBase = gBase; s->save_gPerm = gPerm; - return retVal; + return retVal; } diff --git a/src/cmd/bzip2/lib/huffman.c b/src/cmd/bzip2/lib/huffman.c index 9cad0970..9388ef21 100644 --- a/src/cmd/bzip2/lib/huffman.c +++ b/src/cmd/bzip2/lib/huffman.c @@ -17,16 +17,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -102,7 +102,7 @@ /*---------------------------------------------------*/ -void BZ2_hbMakeCodeLengths ( UChar *len, +void BZ2_hbMakeCodeLengths ( UChar *len, Int32 *freq, Int32 alphaSize, Int32 maxLen ) @@ -116,7 +116,7 @@ void BZ2_hbMakeCodeLengths ( UChar *len, Int32 heap [ BZ_MAX_ALPHA_SIZE + 2 ]; Int32 weight [ BZ_MAX_ALPHA_SIZE * 2 ]; - Int32 parent [ BZ_MAX_ALPHA_SIZE * 2 ]; + Int32 parent [ BZ_MAX_ALPHA_SIZE * 2 ]; for (i = 0; i < alphaSize; i++) weight[i+1] = (freq[i] == 0 ? 1 : freq[i]) << 8; @@ -138,7 +138,7 @@ void BZ2_hbMakeCodeLengths ( UChar *len, } AssertH( nHeap < (BZ_MAX_ALPHA_SIZE+2), 2001 ); - + while (nHeap > 1) { n1 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1); n2 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1); @@ -161,7 +161,7 @@ void BZ2_hbMakeCodeLengths ( UChar *len, len[i-1] = j; if (j > maxLen) tooLong = True; } - + if (! tooLong) break; for (i = 1; i < alphaSize; i++) { diff --git a/src/cmd/bzip2/lib/os.h b/src/cmd/bzip2/lib/os.h index aa196a87..1236e5d5 100644 --- a/src/cmd/bzip2/lib/os.h +++ b/src/cmd/bzip2/lib/os.h @@ -76,7 +76,7 @@ typedef int Int32; typedef unsigned int UInt32; typedef short Int16; typedef unsigned short UInt16; - + #define True ((Bool)1) #define False ((Bool)0) @@ -85,4 +85,3 @@ typedef unsigned short UInt16; Only here to avoid probs with 64-bit platforms. --*/ typedef int IntNative; - diff --git a/src/cmd/bzip2/lib/randtable.c b/src/cmd/bzip2/lib/randtable.c index 2ab1e952..c6d70773 100644 --- a/src/cmd/bzip2/lib/randtable.c +++ b/src/cmd/bzip2/lib/randtable.c @@ -17,16 +17,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -64,58 +64,58 @@ /*---------------------------------------------*/ -Int32 BZ2_rNums[512] = { - 619, 720, 127, 481, 931, 816, 813, 233, 566, 247, - 985, 724, 205, 454, 863, 491, 741, 242, 949, 214, - 733, 859, 335, 708, 621, 574, 73, 654, 730, 472, - 419, 436, 278, 496, 867, 210, 399, 680, 480, 51, - 878, 465, 811, 169, 869, 675, 611, 697, 867, 561, - 862, 687, 507, 283, 482, 129, 807, 591, 733, 623, - 150, 238, 59, 379, 684, 877, 625, 169, 643, 105, - 170, 607, 520, 932, 727, 476, 693, 425, 174, 647, - 73, 122, 335, 530, 442, 853, 695, 249, 445, 515, - 909, 545, 703, 919, 874, 474, 882, 500, 594, 612, - 641, 801, 220, 162, 819, 984, 589, 513, 495, 799, - 161, 604, 958, 533, 221, 400, 386, 867, 600, 782, - 382, 596, 414, 171, 516, 375, 682, 485, 911, 276, - 98, 553, 163, 354, 666, 933, 424, 341, 533, 870, - 227, 730, 475, 186, 263, 647, 537, 686, 600, 224, - 469, 68, 770, 919, 190, 373, 294, 822, 808, 206, - 184, 943, 795, 384, 383, 461, 404, 758, 839, 887, - 715, 67, 618, 276, 204, 918, 873, 777, 604, 560, - 951, 160, 578, 722, 79, 804, 96, 409, 713, 940, - 652, 934, 970, 447, 318, 353, 859, 672, 112, 785, - 645, 863, 803, 350, 139, 93, 354, 99, 820, 908, - 609, 772, 154, 274, 580, 184, 79, 626, 630, 742, - 653, 282, 762, 623, 680, 81, 927, 626, 789, 125, - 411, 521, 938, 300, 821, 78, 343, 175, 128, 250, - 170, 774, 972, 275, 999, 639, 495, 78, 352, 126, - 857, 956, 358, 619, 580, 124, 737, 594, 701, 612, - 669, 112, 134, 694, 363, 992, 809, 743, 168, 974, - 944, 375, 748, 52, 600, 747, 642, 182, 862, 81, - 344, 805, 988, 739, 511, 655, 814, 334, 249, 515, - 897, 955, 664, 981, 649, 113, 974, 459, 893, 228, - 433, 837, 553, 268, 926, 240, 102, 654, 459, 51, - 686, 754, 806, 760, 493, 403, 415, 394, 687, 700, - 946, 670, 656, 610, 738, 392, 760, 799, 887, 653, - 978, 321, 576, 617, 626, 502, 894, 679, 243, 440, - 680, 879, 194, 572, 640, 724, 926, 56, 204, 700, - 707, 151, 457, 449, 797, 195, 791, 558, 945, 679, - 297, 59, 87, 824, 713, 663, 412, 693, 342, 606, - 134, 108, 571, 364, 631, 212, 174, 643, 304, 329, - 343, 97, 430, 751, 497, 314, 983, 374, 822, 928, - 140, 206, 73, 263, 980, 736, 876, 478, 430, 305, - 170, 514, 364, 692, 829, 82, 855, 953, 676, 246, - 369, 970, 294, 750, 807, 827, 150, 790, 288, 923, - 804, 378, 215, 828, 592, 281, 565, 555, 710, 82, - 896, 831, 547, 261, 524, 462, 293, 465, 502, 56, - 661, 821, 976, 991, 658, 869, 905, 758, 745, 193, - 768, 550, 608, 933, 378, 286, 215, 979, 792, 961, - 61, 688, 793, 644, 986, 403, 106, 366, 905, 644, - 372, 567, 466, 434, 645, 210, 389, 550, 919, 135, - 780, 773, 635, 389, 707, 100, 626, 958, 165, 504, - 920, 176, 193, 713, 857, 265, 203, 50, 668, 108, - 645, 990, 626, 197, 510, 357, 358, 850, 858, 364, +Int32 BZ2_rNums[512] = { + 619, 720, 127, 481, 931, 816, 813, 233, 566, 247, + 985, 724, 205, 454, 863, 491, 741, 242, 949, 214, + 733, 859, 335, 708, 621, 574, 73, 654, 730, 472, + 419, 436, 278, 496, 867, 210, 399, 680, 480, 51, + 878, 465, 811, 169, 869, 675, 611, 697, 867, 561, + 862, 687, 507, 283, 482, 129, 807, 591, 733, 623, + 150, 238, 59, 379, 684, 877, 625, 169, 643, 105, + 170, 607, 520, 932, 727, 476, 693, 425, 174, 647, + 73, 122, 335, 530, 442, 853, 695, 249, 445, 515, + 909, 545, 703, 919, 874, 474, 882, 500, 594, 612, + 641, 801, 220, 162, 819, 984, 589, 513, 495, 799, + 161, 604, 958, 533, 221, 400, 386, 867, 600, 782, + 382, 596, 414, 171, 516, 375, 682, 485, 911, 276, + 98, 553, 163, 354, 666, 933, 424, 341, 533, 870, + 227, 730, 475, 186, 263, 647, 537, 686, 600, 224, + 469, 68, 770, 919, 190, 373, 294, 822, 808, 206, + 184, 943, 795, 384, 383, 461, 404, 758, 839, 887, + 715, 67, 618, 276, 204, 918, 873, 777, 604, 560, + 951, 160, 578, 722, 79, 804, 96, 409, 713, 940, + 652, 934, 970, 447, 318, 353, 859, 672, 112, 785, + 645, 863, 803, 350, 139, 93, 354, 99, 820, 908, + 609, 772, 154, 274, 580, 184, 79, 626, 630, 742, + 653, 282, 762, 623, 680, 81, 927, 626, 789, 125, + 411, 521, 938, 300, 821, 78, 343, 175, 128, 250, + 170, 774, 972, 275, 999, 639, 495, 78, 352, 126, + 857, 956, 358, 619, 580, 124, 737, 594, 701, 612, + 669, 112, 134, 694, 363, 992, 809, 743, 168, 974, + 944, 375, 748, 52, 600, 747, 642, 182, 862, 81, + 344, 805, 988, 739, 511, 655, 814, 334, 249, 515, + 897, 955, 664, 981, 649, 113, 974, 459, 893, 228, + 433, 837, 553, 268, 926, 240, 102, 654, 459, 51, + 686, 754, 806, 760, 493, 403, 415, 394, 687, 700, + 946, 670, 656, 610, 738, 392, 760, 799, 887, 653, + 978, 321, 576, 617, 626, 502, 894, 679, 243, 440, + 680, 879, 194, 572, 640, 724, 926, 56, 204, 700, + 707, 151, 457, 449, 797, 195, 791, 558, 945, 679, + 297, 59, 87, 824, 713, 663, 412, 693, 342, 606, + 134, 108, 571, 364, 631, 212, 174, 643, 304, 329, + 343, 97, 430, 751, 497, 314, 983, 374, 822, 928, + 140, 206, 73, 263, 980, 736, 876, 478, 430, 305, + 170, 514, 364, 692, 829, 82, 855, 953, 676, 246, + 369, 970, 294, 750, 807, 827, 150, 790, 288, 923, + 804, 378, 215, 828, 592, 281, 565, 555, 710, 82, + 896, 831, 547, 261, 524, 462, 293, 465, 502, 56, + 661, 821, 976, 991, 658, 869, 905, 758, 745, 193, + 768, 550, 608, 933, 378, 286, 215, 979, 792, 961, + 61, 688, 793, 644, 986, 403, 106, 366, 905, 644, + 372, 567, 466, 434, 645, 210, 389, 550, 919, 135, + 780, 773, 635, 389, 707, 100, 626, 958, 165, 504, + 920, 176, 193, 713, 857, 265, 203, 50, 668, 108, + 645, 990, 626, 197, 510, 357, 358, 850, 858, 364, 936, 638 }; diff --git a/src/cmd/bzip2/lib/unix.h b/src/cmd/bzip2/lib/unix.h index e47197b8..797ba118 100644 --- a/src/cmd/bzip2/lib/unix.h +++ b/src/cmd/bzip2/lib/unix.h @@ -5,4 +5,3 @@ #include <math.h> #include <errno.h> #include <ctype.h> - diff --git a/src/cmd/calendar.c b/src/cmd/calendar.c index 778c7608..c936a286 100644 --- a/src/cmd/calendar.c +++ b/src/cmd/calendar.c @@ -99,7 +99,7 @@ main(int argc, char *argv[]) exits(""); } -char *months[] = +char *months[] = { "january", "february", @@ -146,7 +146,7 @@ dates(Date **last, Tm *tm) first = alloc(sizeof(Date)); if(*last) (*last)->next = first; - first->p = regcomp(buf); + first->p = regcomp(buf); if (matchyear) snprint(buf, sizeof buf, @@ -159,7 +159,7 @@ dates(Date **last, Tm *tm) if(debug) print("%s\n", buf); nd = alloc(sizeof(Date)); - nd->p = regcomp(buf); + nd->p = regcomp(buf); nd->next = 0; first->next = nd; *last = nd; diff --git a/src/cmd/cat.c b/src/cmd/cat.c index ac588897..8fdcf4ec 100644 --- a/src/cmd/cat.c +++ b/src/cmd/cat.c @@ -33,4 +33,3 @@ main(int argc, char *argv[]) } exits(0); } - diff --git a/src/cmd/cb/cb.c b/src/cmd/cb/cb.c index 9e611f04..ebca5cc5 100644 --- a/src/cmd/cb/cb.c +++ b/src/cmd/cb/cb.c @@ -1007,7 +1007,7 @@ clearif(struct indent *cl) int i; for(i=0;i<IFLEVEL-1;i++)cl->ifc[i] = 0; } -char +char puttmp(char c, int keep) { if(tp < &temp[TEMP-120]) diff --git a/src/cmd/cmp.c b/src/cmd/cmp.c index 4f69e181..f06f12a5 100644 --- a/src/cmd/cmp.c +++ b/src/cmd/cmp.c @@ -88,7 +88,7 @@ main(int argc, char *argv[]) print("%6lld 0x%.2x 0x%.2x\n", nc+i, *p, *q); } } - } + } if(Lflag) for(p = b1s; p < b1e;) if(*p++ == '\n') diff --git a/src/cmd/date.c b/src/cmd/date.c index fc2ec5af..272f5ec8 100644 --- a/src/cmd/date.c +++ b/src/cmd/date.c @@ -25,6 +25,6 @@ main(int argc, char *argv[]) print("%s", asctime(gmtime(now))); else print("%s", ctime(now)); - + exits(0); } diff --git a/src/cmd/db/command.c b/src/cmd/db/command.c index 55ed02a8..b89318e8 100644 --- a/src/cmd/db/command.c +++ b/src/cmd/db/command.c @@ -76,26 +76,26 @@ command(char *buf, int defcom) break; case '>': - lastcom = savecom; + lastcom = savecom; savc=rdc(); if (reg=regname(savc)) rput(correg, reg, dot); - else + else error("bad variable"); break; case '!': lastcom=savecom; - shell(); + shell(); break; case '$': lastcom=savecom; - printdollar(nextchar()); + printdollar(nextchar()); break; case ':': - if (!executing) { + if (!executing) { executing=TRUE; subpcs(nextchar()); executing=FALSE; @@ -107,7 +107,7 @@ command(char *buf, int defcom) prints(DBNAME); break; - default: + default: error("bad command"); } flushbuf(); @@ -159,21 +159,21 @@ acommand(int pc) { case 'm': if (eqcom) - error(BADEQ); + error(BADEQ); cmdmap(map); break; case 'L': case 'l': if (eqcom) - error(BADEQ); + error(BADEQ); cmdsrc(lastc, map); break; case 'W': case 'w': if (eqcom) - error(BADEQ); + error(BADEQ); cmdwrite(lastc, map); break; @@ -199,10 +199,10 @@ cmdsrc(int c, Map *map) else dotinc = 2; savdot=dot; - expr(1); + expr(1); locval=expv; if (expr(0)) - locmsk=expv; + locmsk=expv; else locmsk = ~0; if (c == 'L') @@ -211,8 +211,8 @@ cmdsrc(int c, Map *map) else while ((ret = get2(map, dot, &sh)) > 0 && (sh&locmsk) != locval) dot = inkdot(dotinc); - if (ret < 0) { - dot=savdot; + if (ret < 0) { + dot=savdot; error("%r"); } symoff(buf, 512, dot, CANY); @@ -235,7 +235,7 @@ cmdwrite(int wcom, Map *map) expr(1); pass = 0; do { - pass++; + pass++; savdot=dot; exform(1, 1, format, map, 0, pass); dot=savdot; @@ -247,7 +247,7 @@ cmdwrite(int wcom, Map *map) error(badwrite); } savdot=dot; - dprint("=%8t"); + dprint("=%8t"); exform(1, 0, format, map, 0, pass); newline(); } while (expr(0)); @@ -305,7 +305,7 @@ shell(void) } break; } - prints("!"); + prints("!"); reread(); } } diff --git a/src/cmd/db/expr.c b/src/cmd/db/expr.c index 74c9319a..72b8c906 100644 --- a/src/cmd/db/expr.c +++ b/src/cmd/db/expr.c @@ -186,7 +186,7 @@ item(int a) return 1; } error("bad file location"); - } else if (symchar(0)) { + } else if (symchar(0)) { readsym(gsym); if (lastc=='.') { readchar(); /* ugh */ @@ -212,7 +212,7 @@ item(int a) reread(); } else if (getnum(readchar)) { ; - } else if (lastc=='.') { + } else if (lastc=='.') { readchar(); if (!symchar(0) && lastc != '.') { expv = dot; @@ -228,7 +228,7 @@ item(int a) if (localaddr(cormap, correg, s.name, lsym, &u) < 0) error("%r"); expv = u; - } + } reread(); } else if (lastc=='"') { expv=ditto; @@ -245,7 +245,7 @@ item(int a) expv = ascval(); else if (a) error("address expected"); - else { + else { reread(); return(0); } diff --git a/src/cmd/db/input.c b/src/cmd/db/input.c index 8cd091b0..bd97cd70 100644 --- a/src/cmd/db/input.c +++ b/src/cmd/db/input.c @@ -144,7 +144,7 @@ getformat(char *deformat) * * we handle this case specially because we have to look ahead * at the token after the colon to decide if it is a file reference - * or a colon-command with a symbol name prefix. + * or a colon-command with a symbol name prefix. */ int diff --git a/src/cmd/db/output.c b/src/cmd/db/output.c index 176cec28..db4d0fa2 100644 --- a/src/cmd/db/output.c +++ b/src/cmd/db/output.c @@ -77,7 +77,7 @@ iclose(int stack, int err) infile = STDIN; } else { if (infile) { - close(infile); + close(infile); infile=STDIN; } if (ifiledepth > 0) { diff --git a/src/cmd/db/pcs.c b/src/cmd/db/pcs.c index b876f50a..681819da 100644 --- a/src/cmd/db/pcs.c +++ b/src/cmd/db/pcs.c @@ -29,7 +29,7 @@ subpcs(int modif) switch (modif) { /* delete breakpoint */ - case 'd': + case 'd': case 'D': if ((bk=scanbkpt(dot)) == 0) error("no breakpoint set"); @@ -37,7 +37,7 @@ subpcs(int modif) return; /* set breakpoint */ - case 'b': + case 'b': case 'B': if (bk=scanbkpt(dot)) bk->flag=BKPTCLR; @@ -80,7 +80,7 @@ subpcs(int modif) return; /* run program */ - case 'r': + case 'r': case 'R': endpcs(); setup(); @@ -88,7 +88,7 @@ subpcs(int modif) break; /* single step */ - case 's': + case 's': if (pid == 0) { setup(); loopcnt--; @@ -119,8 +119,8 @@ subpcs(int modif) loopcnt = 0; break; /* continue with optional note */ - case 'c': - case 'C': + case 'c': + case 'C': if (pid==0) error(NOPCS); runmode=CONTIN; diff --git a/src/cmd/db/setup.c b/src/cmd/db/setup.c index eaeb61f2..15a196e1 100644 --- a/src/cmd/db/setup.c +++ b/src/cmd/db/setup.c @@ -100,15 +100,15 @@ cmdmap(Map *map) /* textseg(expv, &fhdr); */ map->seg[i].base = expv; } else - error("Invalid base address"); + error("Invalid base address"); if (expr(0)) map->seg[i].size = expv - map->seg[i].base; else - error("Invalid end address"); + error("Invalid end address"); if (expr(0)) - map->seg[i].offset = expv; + map->seg[i].offset = expv; else - error("Invalid file offset"); + error("Invalid file offset"); /* if (rdc()=='?' && map == cormap) { if (fcor) diff --git a/src/cmd/deroff.c b/src/cmd/deroff.c index 1b758efe..0ad08375 100644 --- a/src/cmd/deroff.c +++ b/src/cmd/deroff.c @@ -13,7 +13,7 @@ * Deroff follows .so and .nx commands, removes contents of macro * definitions, equations (both .EQ ... .EN and $...$), * Tbl command sequences, and Troff backslash vconstructions. - * + * * All input is through the C macro; the most recently read character is in c. */ @@ -37,7 +37,7 @@ #define C fC() #define C1 fC1() -#define SKIP while(C != '\n') +#define SKIP while(C != '\n') #define SKIP1 while(C1 != '\n') #define SKIP_TO_COM SKIP;\ SKIP;\ @@ -211,7 +211,7 @@ skeqn(void) c = C1; else if(c == '"') while(C1 != '"') - if(c == '\\') + if(c == '\\') C1; if (msflag) eqnflag = 1; @@ -257,9 +257,9 @@ getfname(void) Rune r; Dir *dir; struct chain - { - struct chain* nextp; - char* datap; + { + struct chain* nextp; + char* datap; } *q; static struct chain *namechain= 0; @@ -470,7 +470,7 @@ comx: else if(filesp==files && c1=='T' && (c2=='S' || c2=='C' || c2=='&')) { if(msflag) - stbl(); + stbl(); else tbl(); } @@ -512,11 +512,11 @@ comx: SKIP; else if(c1=='h' && c2=='w') - SKIP; + SKIP; else if(msflag && c1 == 'T' && c2 == 'L') { SKIP_TO_COM; - goto comx; + goto comx; } else if(msflag && c1=='N' && c2 == 'R') @@ -526,17 +526,17 @@ comx: if(mac==MM)SKIP; else { SKIP_TO_COM; - goto comx; + goto comx; } } else if(msflag && c1=='F' && c2=='S') { SKIP_TO_COM; - goto comx; + goto comx; } else if(msflag && (c1=='S' || c1=='N') && c2=='H') { SKIP_TO_COM; - goto comx; + goto comx; } else if(c1 == 'U' && c2 == 'X') { if(wordflag) @@ -546,7 +546,7 @@ comx: } else if(msflag && c1=='O' && c2=='K') { SKIP_TO_COM; - goto comx; + goto comx; } else if(msflag && c1=='N' && c2=='D') SKIP; @@ -565,11 +565,11 @@ comx: if(!msflag && c1=='P' && c2=='S') { inpic(); } else - if(msflag && (c1=='D' || c1=='N' || c1=='K'|| c1=='P') && c2=='S') { - sdis(c1, 'E'); + if(msflag && (c1=='D' || c1=='N' || c1=='K'|| c1=='P') && c2=='S') { + sdis(c1, 'E'); } else - if(msflag && (c1 == 'K' && c2 == 'F')) { - sdis(c1,'E'); + if(msflag && (c1 == 'K' && c2 == 'F')) { + sdis(c1,'E'); } else if(msflag && c1=='n' && c2=='f') sdis('f','i'); @@ -601,8 +601,8 @@ void macro(void) { if(msflag) { - do { - SKIP1; + do { + SKIP1; } while(C1 != '.' || C1 != '.' || C1 == '.'); if(c != '\n') SKIP; @@ -660,7 +660,7 @@ sdis(char a1, char a2) SKIP1; } else if(a1 == 'D' && c1 == 'E' && c2 == 'Q') { - eqn(); + eqn(); eqnf = 0; } else if(a1 == 'f') { @@ -720,8 +720,8 @@ eqn(void) Bputc(&bout, 'x'); Bputc(&bout, ' '); if(last) { - Bputc(&bout, last); - Bputc(&bout, '\n'); + Bputc(&bout, last); + Bputc(&bout, '\n'); } } return; @@ -744,7 +744,7 @@ eqn(void) dflg = 0; } if(c != '\n') - while(C1 != '\n') { + while(C1 != '\n') { if(chars[c] == PUNCT) last = c; else @@ -762,7 +762,7 @@ backsl(void) { int bdelim; -sw: +sw: switch(C1) { case '"': diff --git a/src/cmd/devdraw/bigarrow.h b/src/cmd/devdraw/bigarrow.h index 1221ec8c..4bfe0245 100644 --- a/src/cmd/devdraw/bigarrow.h +++ b/src/cmd/devdraw/bigarrow.h @@ -14,70 +14,70 @@ Cursor bigarrow = { Cursor2 bigarrow2 = { { -2, -2 }, - { 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, - 0xC0, 0x00, 0x00, 0x03, - 0xC0, 0x00, 0x00, 0x07, - 0xC0, 0x00, 0x00, 0x1E, - 0xC0, 0x00, 0x00, 0x3C, - 0xC0, 0x00, 0x00, 0xF0, - 0xC0, 0x00, 0x03, 0xE0, - 0xC0, 0x00, 0x0F, 0x80, - 0xC0, 0x00, 0x0E, 0x00, - 0xC0, 0x00, 0x07, 0x00, - 0xC0, 0x00, 0x03, 0x80, - 0xC0, 0x00, 0x01, 0xC0, - 0xC0, 0x00, 0x00, 0xE0, - 0xC0, 0x00, 0x00, 0x70, - 0xC0, 0x00, 0x00, 0x38, - 0xC0, 0x00, 0x00, 0x1C, - 0xC0, 0x00, 0x00, 0x0E, - 0xC0, 0x00, 0x00, 0x07, - 0xC0, 0x00, 0x00, 0x03, - 0xC0, 0xC0, 0x00, 0x07, - 0xC0, 0xE0, 0x00, 0x0E, - 0xC1, 0xF0, 0x00, 0x1C, - 0xC1, 0xB8, 0x00, 0x38, - 0xC3, 0x9C, 0x00, 0x70, - 0xC3, 0x0E, 0x00, 0xE0, - 0xC7, 0x07, 0x01, 0xC0, - 0xCE, 0x03, 0x83, 0x80, - 0xCC, 0x01, 0xC7, 0x00, - 0xDC, 0x00, 0xEE, 0x00, - 0xF8, 0x00, 0x7C, 0x00, + { 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, + 0xC0, 0x00, 0x00, 0x03, + 0xC0, 0x00, 0x00, 0x07, + 0xC0, 0x00, 0x00, 0x1E, + 0xC0, 0x00, 0x00, 0x3C, + 0xC0, 0x00, 0x00, 0xF0, + 0xC0, 0x00, 0x03, 0xE0, + 0xC0, 0x00, 0x0F, 0x80, + 0xC0, 0x00, 0x0E, 0x00, + 0xC0, 0x00, 0x07, 0x00, + 0xC0, 0x00, 0x03, 0x80, + 0xC0, 0x00, 0x01, 0xC0, + 0xC0, 0x00, 0x00, 0xE0, + 0xC0, 0x00, 0x00, 0x70, + 0xC0, 0x00, 0x00, 0x38, + 0xC0, 0x00, 0x00, 0x1C, + 0xC0, 0x00, 0x00, 0x0E, + 0xC0, 0x00, 0x00, 0x07, + 0xC0, 0x00, 0x00, 0x03, + 0xC0, 0xC0, 0x00, 0x07, + 0xC0, 0xE0, 0x00, 0x0E, + 0xC1, 0xF0, 0x00, 0x1C, + 0xC1, 0xB8, 0x00, 0x38, + 0xC3, 0x9C, 0x00, 0x70, + 0xC3, 0x0E, 0x00, 0xE0, + 0xC7, 0x07, 0x01, 0xC0, + 0xCE, 0x03, 0x83, 0x80, + 0xCC, 0x01, 0xC7, 0x00, + 0xDC, 0x00, 0xEE, 0x00, + 0xF8, 0x00, 0x7C, 0x00, 0xF0, 0x00, 0x38, 0x00, }, - { 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x3F, 0xFF, 0xFF, 0xFC, - 0x3F, 0xFF, 0xFF, 0xF8, - 0x3F, 0xFF, 0xFF, 0xE0, - 0x3F, 0xFF, 0xFF, 0xC0, - 0x3F, 0xFF, 0xFF, 0x00, - 0x3F, 0xFF, 0xFC, 0x00, - 0x3F, 0xFF, 0xF0, 0x00, - 0x3F, 0xFF, 0xF0, 0x00, - 0x3F, 0xFF, 0xF8, 0x00, - 0x3F, 0xFF, 0xFC, 0x00, - 0x3F, 0xFF, 0xFE, 0x00, - 0x3F, 0xFF, 0xFF, 0x00, - 0x3F, 0xFF, 0xFF, 0x80, - 0x3F, 0xFF, 0xFF, 0xC0, - 0x3F, 0xFF, 0xFF, 0xE0, - 0x3F, 0xFF, 0xFF, 0xF0, - 0x3F, 0xFF, 0xFF, 0xF8, - 0x3F, 0xFF, 0xFF, 0xFC, - 0x3F, 0x3F, 0xFF, 0xF8, - 0x3F, 0x1F, 0xFF, 0xF0, - 0x3E, 0x0F, 0xFF, 0xE0, - 0x3E, 0x07, 0xFF, 0xC0, - 0x3C, 0x03, 0xFF, 0x80, - 0x3C, 0x01, 0xFF, 0x00, - 0x38, 0x00, 0xFE, 0x00, - 0x30, 0x00, 0x7C, 0x00, - 0x30, 0x00, 0x38, 0x00, - 0x20, 0x00, 0x10, 0x00, - 0x00, 0x00, 0x00, 0x00, + { 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x3F, 0xFF, 0xFF, 0xFC, + 0x3F, 0xFF, 0xFF, 0xF8, + 0x3F, 0xFF, 0xFF, 0xE0, + 0x3F, 0xFF, 0xFF, 0xC0, + 0x3F, 0xFF, 0xFF, 0x00, + 0x3F, 0xFF, 0xFC, 0x00, + 0x3F, 0xFF, 0xF0, 0x00, + 0x3F, 0xFF, 0xF0, 0x00, + 0x3F, 0xFF, 0xF8, 0x00, + 0x3F, 0xFF, 0xFC, 0x00, + 0x3F, 0xFF, 0xFE, 0x00, + 0x3F, 0xFF, 0xFF, 0x00, + 0x3F, 0xFF, 0xFF, 0x80, + 0x3F, 0xFF, 0xFF, 0xC0, + 0x3F, 0xFF, 0xFF, 0xE0, + 0x3F, 0xFF, 0xFF, 0xF0, + 0x3F, 0xFF, 0xFF, 0xF8, + 0x3F, 0xFF, 0xFF, 0xFC, + 0x3F, 0x3F, 0xFF, 0xF8, + 0x3F, 0x1F, 0xFF, 0xF0, + 0x3E, 0x0F, 0xFF, 0xE0, + 0x3E, 0x07, 0xFF, 0xC0, + 0x3C, 0x03, 0xFF, 0x80, + 0x3C, 0x01, 0xFF, 0x00, + 0x38, 0x00, 0xFE, 0x00, + 0x30, 0x00, 0x7C, 0x00, + 0x30, 0x00, 0x38, 0x00, + 0x20, 0x00, 0x10, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, } }; diff --git a/src/cmd/devdraw/cocoa-srv.c b/src/cmd/devdraw/cocoa-srv.c index c1cf5983..dcb1801a 100644 --- a/src/cmd/devdraw/cocoa-srv.c +++ b/src/cmd/devdraw/cocoa-srv.c @@ -77,7 +77,7 @@ servep9p(void) Wsysmsg m; fmtinstall('W', drawfcallfmt); - + mbuf = nil; nmbuf = 0; while((n = read(3, buf, 4)) == 4){ @@ -106,15 +106,15 @@ void replyerror(Wsysmsg *m) { char err[256]; - + rerrstr(err, sizeof err); m->type = Rerror; m->error = err; replymsg(m); } -/* - * Handle a single wsysmsg. +/* + * Handle a single wsysmsg. * Might queue for later (kbd, mouse read) */ void @@ -123,7 +123,7 @@ runmsg(Wsysmsg *m) static uchar buf[65536]; int n; Memimage *i; - + switch(m->type){ case Tinit: memimageinit(); @@ -176,7 +176,7 @@ runmsg(Wsysmsg *m) setcursor(&m->cursor, &m->cursor2); replymsg(m); break; - + case Tbouncemouse: // _xbouncemouse(&m->mouse); replymsg(m); @@ -222,12 +222,12 @@ runmsg(Wsysmsg *m) replymsg(m); zunlock(); break; - + case Ttop: topwin(); replymsg(m); break; - + case Tresize: resizewindow(m->rect); replymsg(m); @@ -249,7 +249,7 @@ replymsg(Wsysmsg *m) /* T -> R msg */ if(m->type%2 == 0) m->type++; - + if(trace) fprint(2, "%ud [%d] -> %W\n", nsec()/1000000, threadid(), m); /* copy to output buffer */ n = sizeW2M(m); @@ -275,7 +275,7 @@ void matchkbd(void) { Wsysmsg m; - + if(kbd.stall) return; while(kbd.ri != kbd.wi && kbdtags.ri != kbdtags.wi){ @@ -297,7 +297,7 @@ void matchmouse(void) { Wsysmsg m; - + while(mouse.ri != mouse.wi && mousetags.ri != mousetags.wi){ m.type = Rrdmouse; m.tag = mousetags.t[mousetags.ri++]; @@ -321,7 +321,7 @@ void mousetrack(int x, int y, int b, uint ms) { Mouse *m; - + if(x < mouserect.min.x) x = mouserect.min.x; if(x > mouserect.max.x) diff --git a/src/cmd/devdraw/devdraw.c b/src/cmd/devdraw/devdraw.c index 7f0bff21..654ab4af 100644 --- a/src/cmd/devdraw/devdraw.c +++ b/src/cmd/devdraw/devdraw.c @@ -160,11 +160,11 @@ _drawreplacescreenimage(Memimage *m) /* * Replace the screen image because the screen * was resized. - * + * * In theory there should only be one reference * to the current screen image, and that's through * client0's image 0, installed a few lines above. - * Once the client drops the image, the underlying backing + * Once the client drops the image, the underlying backing * store freed properly. The client is being notified * about the resize through external means, so all we * need to do is this assignment. @@ -769,7 +769,7 @@ _drawmsgwrite(void *v, int n) { char cbuf[40], *err, ibuf[12*12+1], *s; int c, ci, doflush, dstid, e0, e1, esize, j, m; - int ni, nw, oesize, oldn, op, ox, oy, repl, scrnid, y; + int ni, nw, oesize, oldn, op, ox, oy, repl, scrnid, y; uchar *a, refresh, *u; u32int chan, value; Client *client; @@ -969,7 +969,7 @@ _drawmsgwrite(void *v, int n) err = "negative ellipse thickness"; goto error; } - + drawpoint(&sp, a+29); c = j; if(*a == 'E') @@ -1073,11 +1073,11 @@ _drawmsgwrite(void *v, int n) ni = sprint(ibuf, "%11d %11d %11s %11d %11d %11d %11d %11d" " %11d %11d %11d %11d ", client->clientid, - client->infoid, + client->infoid, chantostr(cbuf, i->chan), (i->flags&Frepl)==Frepl, i->r.min.x, i->r.min.y, i->r.max.x, i->r.max.y, - i->clipr.min.x, i->clipr.min.y, + i->clipr.min.x, i->clipr.min.y, i->clipr.max.x, i->clipr.max.y); free(client->readdata); client->readdata = malloc(ni); @@ -1087,7 +1087,7 @@ _drawmsgwrite(void *v, int n) client->nreaddata = ni; client->infoid = -1; continue; - + /* query: 'Q' n[1] queryspec[n] */ case 'q': if(n < 2) @@ -1633,5 +1633,3 @@ error: qunlock(&sdraw.lk); return -1; } - - diff --git a/src/cmd/devdraw/drawclient.c b/src/cmd/devdraw/drawclient.c index 87df3f18..f6139289 100644 --- a/src/cmd/devdraw/drawclient.c +++ b/src/cmd/devdraw/drawclient.c @@ -20,7 +20,7 @@ void startsrv(void) { int pid, p[2]; - + if(pipe(p) < 0) sysfatal("pipe"); if((pid=fork()) < 0) @@ -56,7 +56,7 @@ void cmdinit(int argc, char **argv) { Wsysmsg m; - + memset(&m, 0, sizeof m); m.op = Tinit; m.winsize = "100x100"; @@ -70,7 +70,7 @@ void cmdmouse(int argc, char **argv) { Wsysmsg m; - + memset(&m, 0, sizeof m); m.op = Trdmouse; if(domsg(&m) < 0) @@ -86,7 +86,7 @@ void cmdkbd(int argc, char **argv) { Wsysmsg m; - + memset(&m, 0, sizeof m); m.op = Trdkbd; if(domsg(&m) < 0) @@ -125,4 +125,3 @@ fprint(2, "%s...\n", p); } exits(0); } - diff --git a/src/cmd/devdraw/latin1.c b/src/cmd/devdraw/latin1.c index 09c67523..2fa9e29d 100644 --- a/src/cmd/devdraw/latin1.c +++ b/src/cmd/devdraw/latin1.c @@ -58,7 +58,7 @@ _latin1(Rune *k, int n) else return -5; } - + for(l=latintab; l->ld!=0; l++) if(k[0] == l->ld[0]){ if(n == 1) diff --git a/src/cmd/devdraw/mklatinkbd.c b/src/cmd/devdraw/mklatinkbd.c index abd202fb..db34b6ec 100644 --- a/src/cmd/devdraw/mklatinkbd.c +++ b/src/cmd/devdraw/mklatinkbd.c @@ -132,7 +132,7 @@ printtrie(Biobuf *b, Trie *t) printtrie(b, t->link[i]); if(t->n == 0) return; - + if(xflag) { for(i=0; i<256; i++) { if(t->r[i] == 0) @@ -142,7 +142,7 @@ printtrie(Biobuf *b, Trie *t) Bprint(b, " %k", *p); Bprint(b, " %k : \"%C\" U%04X\n", i, t->r[i], t->r[i]); } - return; + return; } Bprint(b, "\t\""); @@ -315,5 +315,3 @@ kfmt(Fmt *f) return fmtprint(f, "<%s>", xkey[i].s); return fmtprint(f, "<%c>", c); } - - diff --git a/src/cmd/devdraw/mouseswap.c b/src/cmd/devdraw/mouseswap.c index e6ece333..29f33b7b 100644 --- a/src/cmd/devdraw/mouseswap.c +++ b/src/cmd/devdraw/mouseswap.c @@ -51,7 +51,7 @@ mouseswap(int but) if(!map.init) initmap(); - + nbut = 0; for(i=0; i<Nbutton; i++) if((but&(1<<i)) && map.b[i] >= 0) diff --git a/src/cmd/devdraw/nowsys.c b/src/cmd/devdraw/nowsys.c index fd8b7ee1..08e0521f 100644 --- a/src/cmd/devdraw/nowsys.c +++ b/src/cmd/devdraw/nowsys.c @@ -18,14 +18,14 @@ main(int argc, char **argv) int n; uchar buf[1024*1024]; Wsysmsg m; - + ARGBEGIN{ case 'D': break; default: usage(); }ARGEND - + if(argc != 0) usage(); diff --git a/src/cmd/devdraw/osx-draw.c b/src/cmd/devdraw/osx-draw.c index d3f08331..fdf7acec 100644 --- a/src/cmd/devdraw/osx-draw.c +++ b/src/cmd/devdraw/osx-draw.c @@ -56,4 +56,3 @@ unloadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) { return _unloadmemimage(i, r, data, ndata); } - diff --git a/src/cmd/devdraw/snarf.c b/src/cmd/devdraw/snarf.c index 1e7a93a1..4d350654 100644 --- a/src/cmd/devdraw/snarf.c +++ b/src/cmd/devdraw/snarf.c @@ -96,7 +96,7 @@ runxevent(XEvent *xev) case Expose: _xexpose(xev); break; - + case DestroyNotify: if(_xdestroy(xev)) exits(0); @@ -107,4 +107,3 @@ runxevent(XEvent *xev) break; } } - diff --git a/src/cmd/devdraw/x11-alloc.c b/src/cmd/devdraw/x11-alloc.c index a465f998..9d85b451 100644 --- a/src/cmd/devdraw/x11-alloc.c +++ b/src/cmd/devdraw/x11-alloc.c @@ -121,4 +121,3 @@ freememimage(Memimage *m) } _freememimage(m); } - diff --git a/src/cmd/devdraw/x11-cload.c b/src/cmd/devdraw/x11-cload.c index 33e3170a..1666eced 100644 --- a/src/cmd/devdraw/x11-cload.c +++ b/src/cmd/devdraw/x11-cload.c @@ -15,4 +15,3 @@ cloadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) _xputxdata(i, r); return n; } - diff --git a/src/cmd/devdraw/x11-draw.c b/src/cmd/devdraw/x11-draw.c index 685ad88a..f3b6a689 100644 --- a/src/cmd/devdraw/x11-draw.c +++ b/src/cmd/devdraw/x11-draw.c @@ -147,4 +147,3 @@ xdraw(Memdrawparam *par) */ return 0; } - diff --git a/src/cmd/devdraw/x11-fill.c b/src/cmd/devdraw/x11-fill.c index fc43a684..adead1ea 100644 --- a/src/cmd/devdraw/x11-fill.c +++ b/src/cmd/devdraw/x11-fill.c @@ -23,7 +23,7 @@ _xfillcolor(Memimage *m, Rectangle r, u32int v) Point p; Xmem *xm; XGC gc; - + xm = m->X; assert(xm != nil); @@ -52,5 +52,3 @@ _xfillcolor(Memimage *m, Rectangle r, u32int v) p = subpt(r.min, m->r.min); XFillRectangle(_x.display, xm->pixmap, gc, p.x, p.y, Dx(r), Dy(r)); } - - diff --git a/src/cmd/devdraw/x11-get.c b/src/cmd/devdraw/x11-get.c index 1a47be01..61913f18 100644 --- a/src/cmd/devdraw/x11-get.c +++ b/src/cmd/devdraw/x11-get.c @@ -21,7 +21,7 @@ _xgetxdata(Memimage *m, Rectangle r) uchar *p; Point tp, xdelta, delta; Xmem *xm; - + xm = m->X; if(xm == nil) return nil; @@ -83,7 +83,7 @@ _xputxdata(Memimage *m, Rectangle r) XPutImage(_x.display, xm->pixmap, gc, xi, xdelta.x, xdelta.y, delta.x, delta.y, Dx(r), Dy(r)); - + if(_x.usetable && m->chan==CMAP8){ for(y=r.min.y; y<r.max.y; y++) for(x=r.min.x, p=byteaddr(m, Pt(x,y)); x<r.max.x; x++, p++) @@ -103,6 +103,3 @@ _xdirtyxdata(Memimage *m, Rectangle r) xm->dirty = 1; addrect(&xm->dirtyr, r); } - - - diff --git a/src/cmd/devdraw/x11-init.c b/src/cmd/devdraw/x11-init.c index f09963dc..8935c9d1 100644 --- a/src/cmd/devdraw/x11-init.c +++ b/src/cmd/devdraw/x11-init.c @@ -95,7 +95,7 @@ _xattach(char *label, char *winsize) xrootid = DefaultScreen(_x.display); xrootwin = DefaultRootWindow(_x.display); - /* + /* * Figure out underlying screen format. */ if(XMatchVisualInfo(_x.display, xrootid, 24, TrueColor, &xvi) @@ -207,7 +207,7 @@ _xattach(char *label, char *winsize) /* * Parse the various X resources. Thanks to Peter Canning. */ - char *screen_resources, *display_resources, *geom, + char *screen_resources, *display_resources, *geom, *geomrestype, *home, *file, *dpitype; XrmDatabase database; XrmValue geomres, dpires; @@ -548,7 +548,7 @@ plan9cmap(void) * be the default depth. On such "suboptimal" systems, we have to allocate an * empty color map anyway, according to Axel Belinfante. */ -static int +static int setupcmap(XWindow w) { char buf[30]; @@ -561,16 +561,16 @@ setupcmap(XWindow w) if(_x.depth >= 24) { if(_x.usetable == 0) - _x.cmap = XCreateColormap(_x.display, w, _x.vis, AllocNone); + _x.cmap = XCreateColormap(_x.display, w, _x.vis, AllocNone); /* * The pixel value returned from XGetPixel needs to * be converted to RGB so we can call rgb2cmap() * to translate between 24 bit X and our color. Unfortunately, - * the return value appears to be display server endian + * the return value appears to be display server endian * dependant. Therefore, we run some heuristics to later * determine how to mask the int value correctly. - * Yeah, I know we can look at _x.vis->byte_order but + * Yeah, I know we can look at _x.vis->byte_order but * some displays say MSB even though they run on LSB. * Besides, this is more anal. */ @@ -611,7 +611,7 @@ setupcmap(XWindow w) _x.cmap = XCreateColormap(_x.display, w, _x.vis, AllocNone); }else if(_x.vis->class == PseudoColor){ if(_x.usetable == 0){ - _x.cmap = XCreateColormap(_x.display, w, _x.vis, AllocAll); + _x.cmap = XCreateColormap(_x.display, w, _x.vis, AllocAll); XStoreColors(_x.display, _x.cmap, _x.map, 256); for(i = 0; i < 256; i++){ _x.tox11[i] = i; diff --git a/src/cmd/devdraw/x11-itrans.c b/src/cmd/devdraw/x11-itrans.c index 729f2647..bdf7d2b2 100644 --- a/src/cmd/devdraw/x11-itrans.c +++ b/src/cmd/devdraw/x11-itrans.c @@ -97,7 +97,7 @@ __xtoplan9kbd(XEvent *e) case XK_KP_End: k = Kend; break; - case XK_Page_Up: + case XK_Page_Up: case XK_KP_Page_Up: k = Kpgup; break; @@ -243,7 +243,7 @@ _xtoplan9mouse(XEvent *e, Mouse *m) case ButtonPress: be = (XButtonEvent*)e; - /* + /* * Fake message, just sent to make us announce snarf. * Apparently state and button are 16 and 8 bits on * the wire, since they are truncated by the time they @@ -443,7 +443,7 @@ _xgetsnarffrom(XWindow w, Atom clipboard, Atom target, int timeout0, int timeout /* get the property */ xdata = nil; - XGetWindowProperty(_x.display, _x.drawable, prop, 0, SnarfSize/sizeof(ulong), 0, + XGetWindowProperty(_x.display, _x.drawable, prop, 0, SnarfSize/sizeof(ulong), 0, AnyPropertyType, &type, &fmt, &len, &dummy, &xdata); if((type != target && type != XA_STRING && type != _x.utf8string) || len == 0){ if(xdata) @@ -500,7 +500,7 @@ _xgetsnarf(void) data = nil; goto out; } - + if((data = _xgetsnarffrom(w, clipboard, _x.utf8string, 10, 100)) == nil) if((data = _xgetsnarffrom(w, clipboard, XA_STRING, 10, 100)) == nil){ /* nothing left to do */ @@ -554,9 +554,9 @@ if(0) fprint(2, "xselect target=%d requestor=%d property=%d selection=%d (sizeof a[3] = _x.compoundtext; XChangeProperty(_x.display, xe->requestor, xe->property, XA_ATOM, 32, PropModeReplace, (uchar*)a, nelem(a)); - }else if(xe->target == XA_STRING - || xe->target == _x.utf8string - || xe->target == _x.text + }else if(xe->target == XA_STRING + || xe->target == _x.utf8string + || xe->target == _x.text || xe->target == _x.compoundtext || ((name = XGetAtomName(_x.display, xe->target)) && strcmp(name, "text/plain;charset=UTF-8") == 0)){ /* text/plain;charset=UTF-8 seems nonstandard but is used by Synergy */ @@ -643,7 +643,7 @@ _applegetsnarf(void) CFRelease(flavors); } qunlock(&clip.lk); - return nil; + return nil; } void @@ -677,7 +677,7 @@ _appleputsnarf(char *s) qunlock(&clip.lk); return; } - cfdata = CFDataCreate(kCFAllocatorDefault, + cfdata = CFDataCreate(kCFAllocatorDefault, (uchar*)clip.rbuf, runestrlen(clip.rbuf)*2); if(cfdata == nil){ fprint(2, "apple pasteboard cfdatacreate failed\n"); diff --git a/src/cmd/devdraw/x11-keysym2ucs.c b/src/cmd/devdraw/x11-keysym2ucs.c index 108f153c..853fa552 100644 --- a/src/cmd/devdraw/x11-keysym2ucs.c +++ b/src/cmd/devdraw/x11-keysym2ucs.c @@ -34,7 +34,7 @@ */ #ifndef KEYSYM2UCS_INCLUDED - + #include "x11-keysym2ucs.h" #define VISIBLE /* */ diff --git a/src/cmd/devdraw/x11-load.c b/src/cmd/devdraw/x11-load.c index a7446f37..895e1109 100644 --- a/src/cmd/devdraw/x11-load.c +++ b/src/cmd/devdraw/x11-load.c @@ -15,4 +15,3 @@ loadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) _xputxdata(i, r); return n; } - diff --git a/src/cmd/devdraw/x11-pixelbits.c b/src/cmd/devdraw/x11-pixelbits.c index 5cbdded8..5227f39b 100644 --- a/src/cmd/devdraw/x11-pixelbits.c +++ b/src/cmd/devdraw/x11-pixelbits.c @@ -12,5 +12,3 @@ pixelbits(Memimage *m, Point p) _xgetxdata(m, Rect(p.x, p.y, p.x+1, p.y+1)); return _pixelbits(m, p); } - - diff --git a/src/cmd/devdraw/x11-srv.c b/src/cmd/devdraw/x11-srv.c index 81416482..4d72415b 100644 --- a/src/cmd/devdraw/x11-srv.c +++ b/src/cmd/devdraw/x11-srv.c @@ -147,12 +147,12 @@ main(int argc, char **argv) /* * Ignore arguments. They're only for good ps -a listings. */ - + notify(bell); fdin.rp = fdin.wp = fdin.buf; fdin.ep = fdin.buf+sizeof fdin.buf; - + fdout.rp = fdout.wp = fdout.buf; fdout.ep = fdout.buf+sizeof fdout.buf; @@ -222,7 +222,7 @@ main(int argc, char **argv) runmsg(&m); fdin.rp += n; } - + /* slide data to beginning of buf */ fdslide(&fdin); } @@ -277,7 +277,7 @@ void replyerror(Wsysmsg *m) { char err[256]; - + rerrstr(err, sizeof err); m->type = Rerror; m->error = err; @@ -286,8 +286,8 @@ replyerror(Wsysmsg *m) -/* - * Handle a single wsysmsg. +/* + * Handle a single wsysmsg. * Might queue for later (kbd, mouse read) */ void @@ -296,7 +296,7 @@ runmsg(Wsysmsg *m) uchar buf[65536]; int n; Memimage *i; - + switch(m->type){ case Tinit: memimageinit(); @@ -339,7 +339,7 @@ runmsg(Wsysmsg *m) _xsetcursor(&m->cursor); replymsg(m); break; - + case Tbouncemouse: _xbouncemouse(&m->mouse); replymsg(m); @@ -381,12 +381,12 @@ runmsg(Wsysmsg *m) else replymsg(m); break; - + case Ttop: _xtopwindow(); replymsg(m); break; - + case Tresize: _xresizewindow(m->rect); replymsg(m); @@ -405,7 +405,7 @@ replymsg(Wsysmsg *m) /* T -> R msg */ if(m->type%2 == 0) m->type++; - + /* fprint(2, "-> %W\n", m); */ /* copy to output buffer */ n = sizeW2M(m); @@ -422,7 +422,7 @@ void matchkbd(void) { Wsysmsg m; - + if(kbd.stall) return; while(kbd.ri != kbd.wi && kbdtags.ri != kbdtags.wi){ @@ -444,7 +444,7 @@ void matchmouse(void) { Wsysmsg m; - + while(mouse.ri != mouse.wi && mousetags.ri != mousetags.wi){ m.type = Rrdmouse; m.tag = mousetags.t[mousetags.ri++]; @@ -519,7 +519,7 @@ runxevent(XEvent *xev) case Expose: _xexpose(xev); break; - + case DestroyNotify: if(_xdestroy(xev)) exits(0); @@ -552,7 +552,7 @@ runxevent(XEvent *xev) return; sendmouse(m); break; - + case KeyRelease: case KeyPress: ke = (XKeyEvent*)xev; @@ -618,7 +618,7 @@ runxevent(XEvent *xev) kbd.stall = 1; matchkbd(); break; - + case FocusOut: /* * Some key combinations (e.g. Alt-Tab) can cause us @@ -629,10 +629,9 @@ runxevent(XEvent *xev) altdown = 0; abortcompose(); break; - + case SelectionRequest: _xselect(xev); break; } } - diff --git a/src/cmd/devdraw/x11-unload.c b/src/cmd/devdraw/x11-unload.c index d01a232f..2f6241ba 100644 --- a/src/cmd/devdraw/x11-unload.c +++ b/src/cmd/devdraw/x11-unload.c @@ -12,4 +12,3 @@ unloadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) _xgetxdata(i, r); return _unloadmemimage(i, r, data, ndata); } - diff --git a/src/cmd/devdraw/x11-wsys.c b/src/cmd/devdraw/x11-wsys.c index 9095c950..82a7d32c 100644 --- a/src/cmd/devdraw/x11-wsys.c +++ b/src/cmd/devdraw/x11-wsys.c @@ -43,4 +43,3 @@ _xmovewindow(Rectangle r) XConfigureWindow(_x.display, _x.drawable, value_mask, &e); XFlush(_x.display); } - 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, diff --git a/src/cmd/diff/diffio.c b/src/cmd/diff/diffio.c index 93de4e37..75a725ff 100644 --- a/src/cmd/diff/diffio.c +++ b/src/cmd/diff/diffio.c @@ -54,7 +54,7 @@ readline(Biobuf *bp, char *buf) /* * hashing has the effect of * arranging line in 7-bit bytes and then - * summing 1-s complement in 16-bit hunks + * summing 1-s complement in 16-bit hunks */ static int readhash(Biobuf *bp, char *buf) @@ -346,7 +346,7 @@ flushchanges(void) if(nchanges == 0) return; - + for(i=0; i<nchanges; ){ j = changeset(i); a = changes[i].a-Lines; diff --git a/src/cmd/diff/diffreg.c b/src/cmd/diff/diffreg.c index bb3fd112..ed4d17b8 100644 --- a/src/cmd/diff/diffreg.c +++ b/src/cmd/diff/diffreg.c @@ -19,7 +19,7 @@ * on the hash (called value). In particular, this * collects the equivalence classes in file1 together. * Subroutine equiv replaces the value of each line in -* file0 by the index of the first element of its +* file0 by the index of the first element of its * matching equivalence in (the reordered) file1. * To save space equiv squeezes file1 into a single * array member in which the equivalence classes @@ -34,15 +34,15 @@ * of "k-candidates". At step i a k-candidate is a matched * pair of lines x,y (x in file0 y in file1) such that * there is a common subsequence of lenght k -* between the first i lines of file0 and the first y +* between the first i lines of file0 and the first y * lines of file1, but there is no such subsequence for * any smaller y. x is the earliest possible mate to y * that occurs in such a subsequence. * * Whenever any of the members of the equivalence class of -* lines in file1 matable to a line in file0 has serial number -* less than the y of some k-candidate, that k-candidate -* with the smallest such y is replaced. The new +* lines in file1 matable to a line in file0 has serial number +* less than the y of some k-candidate, that k-candidate +* with the smallest such y is replaced. The new * k-candidate is chained (via pred) to the current * k-1 candidate so that the actual subsequence can * be recovered. When a member has serial number greater @@ -64,7 +64,7 @@ * The core requirements for problems larger than somewhat * are (in words) 2*length(file0) + length(file1) + * 3*(number of k-candidates installed), typically about -* 6n words for files of length n. +* 6n words for files of length n. */ /* TIDY THIS UP */ struct cand { @@ -91,7 +91,7 @@ long *ixold; /*will be overlaid on klist*/ long *ixnew; /*will be overlaid on file[1]*/ /* END OF SOME TIDYING */ -static void +static void sort(struct line *a, int n) /*shellsort CACM #201*/ { int m; @@ -352,14 +352,14 @@ cmp(Biobuf* b1, Biobuf* b2) break; if(memcmp((void *)b1s, (void *)b2s, n) != 0){ return 1; - } + } nc += n; b1s += n; b2s += n; } if(b1e - b1s == b2e - b2s) return 0; - return 1; + return 1; } void diff --git a/src/cmd/diff/main.c b/src/cmd/diff/main.c index 408ad90f..2697cb88 100644 --- a/src/cmd/diff/main.c +++ b/src/cmd/diff/main.c @@ -22,7 +22,7 @@ rmtmpfiles(void) } } -void +void done(int status) { rmtmpfiles(); @@ -72,7 +72,7 @@ mkpathname(char *pathname, char *path, char *name) sprint(pathname, "%s/%s", path, name); return 0; } - + static char * mktmpfile(int input, Dir **sb) { @@ -184,7 +184,7 @@ main(int argc, char *argv[]) int i; Dir *fsb, *tsb; extern int _p9usepwlibrary; - + _p9usepwlibrary = 0; Binit(&stdout, 1, OWRITE); progname = *argv; @@ -214,7 +214,7 @@ main(int argc, char *argv[]) break; case 'm': - mflag = 1; + mflag = 1; break; case 'h': diff --git a/src/cmd/disk/mkext.c b/src/cmd/disk/mkext.c index d576d24f..3a135610 100644 --- a/src/cmd/disk/mkext.c +++ b/src/cmd/disk/mkext.c @@ -64,7 +64,7 @@ main(int argc, char **argv) default: usage(); }ARGEND - + Binits(&bin, 0, OREAD, binbuf, sizeof binbuf); while(p = Brdline(&bin, '\n')){ p[Blinelen(&bin)-1] = '\0'; diff --git a/src/cmd/disk/mkfs.c b/src/cmd/disk/mkfs.c index 48de7022..2edb37f4 100644 --- a/src/cmd/disk/mkfs.c +++ b/src/cmd/disk/mkfs.c @@ -151,7 +151,7 @@ main(int argc, char **argv) usage(); }ARGEND - if(!argc) + if(!argc) usage(); buf = emalloc(buflen); @@ -514,7 +514,7 @@ setnames(File *f) strcpy(oldfile, f->old); }else sprint(oldfile, "%s%s", oldroot, f->new); - if(strlen(newfile) >= sizeof newfile + if(strlen(newfile) >= sizeof newfile || strlen(oldfile) >= sizeof oldfile) error("name overfile"); } diff --git a/src/cmd/draw/cmapcube.c b/src/cmd/draw/cmapcube.c index 3d0e14e8..4d56322b 100644 --- a/src/cmd/draw/cmapcube.c +++ b/src/cmd/draw/cmapcube.c @@ -109,7 +109,7 @@ redraw(void) line3(v[0x36], v[0x32]); line3(v[0x32], v[0x3F]); line3(v[0x3F], v[0]); - + line3(v[0xF0], v[0xF3]); line3(v[0xF3], v[0xFF]); line3(v[0xFF], v[0xFC]); diff --git a/src/cmd/draw/crop.c b/src/cmd/draw/crop.c index 10a08f77..d6d89722 100644 --- a/src/cmd/draw/crop.c +++ b/src/cmd/draw/crop.c @@ -76,7 +76,7 @@ crop(Memimage *m, uint32 c) bottom = y; } } - + if(n != nil) freememimage(n); return Rect(left, top, right+1, bottom+1); diff --git a/src/cmd/draw/gview.c b/src/cmd/draw/gview.c index 0794f100..0f5e6905 100644 --- a/src/cmd/draw/gview.c +++ b/src/cmd/draw/gview.c @@ -1547,7 +1547,7 @@ void all_set_clr(fpolygons* fps, Image* clr) for (p=fps->p; p!=0; p=p->link) p->clr = clr; } - + void do_recolor(int but, Mouse* m, int alluniv) { @@ -1819,7 +1819,7 @@ e_action* do_undo(e_action* a0) /* pop off an e_action and (un)do it */ case Erecolor: a->fp->clr = a->clr; eresized(0); break; - case Edelete: + case Edelete: a->fp->link = univ.p; univ.p = a->fp; grow_bb(&univ.bb, &a->fp->bb); diff --git a/src/cmd/draw/mc.c b/src/cmd/draw/mc.c index ea36e28d..ee112194 100644 --- a/src/cmd/draw/mc.c +++ b/src/cmd/draw/mc.c @@ -337,4 +337,3 @@ getwidth(void) }else linewidth = ws.ws_col; } - diff --git a/src/cmd/draw/stats.c b/src/cmd/draw/stats.c index 74b8b76c..3b6471b7 100644 --- a/src/cmd/draw/stats.c +++ b/src/cmd/draw/stats.c @@ -50,7 +50,7 @@ enum }; char* -labels[Nvalue] = +labels[Nvalue] = { "802.11", "battery", @@ -70,7 +70,7 @@ labels[Nvalue] = "sys", "syscall", "user" -}; +}; struct Graph { @@ -435,7 +435,7 @@ newvalue(Machine *m, int i, ulong *v, ulong *vmax) if(m->last[i] == 0) m->last[i] = m->val[i][0]; - + if(i == Vload){ /* * Invert the ewma to obtain the 5s load statistics. @@ -928,4 +928,3 @@ initmach(Machine *m, char *name) *q = 0; return 1; } - diff --git a/src/cmd/draw/statusbar.c b/src/cmd/draw/statusbar.c index fef6d2dd..f67b1041 100644 --- a/src/cmd/draw/statusbar.c +++ b/src/cmd/draw/statusbar.c @@ -108,7 +108,7 @@ resize() p.x = r.min.x+4; p.y += display->defaultfont->height+4; - + q = subpt(r.max, Pt(4,4)); rbar = Rpt(p, q); border(screen, rbar, -2, dark, ZP); @@ -116,12 +116,12 @@ resize() lastp = -1; flushimage(display, 1); - drawbar(); + drawbar(); } void keyboardthread(void *v) -{ +{ Rune r; while(recv(kc->c , &r) == 1){ @@ -132,9 +132,9 @@ keyboardthread(void *v) void mousethread(void *v) -{ +{ USED(v); - + while(recv(mc->c, 0) == 1); /* to unblock mc->c */ } @@ -188,7 +188,7 @@ threadmain(int argc, char **argv) int lfd; p = "300x40@100,100"; - + ARGBEGIN{ case 'W': p = ARGF(); @@ -231,4 +231,3 @@ threadmain(int argc, char **argv) } proccreate(updateproc, nil, STACK); } - diff --git a/src/cmd/draw/tcolors.c b/src/cmd/draw/tcolors.c index caac0be6..9aa4de79 100644 --- a/src/cmd/draw/tcolors.c +++ b/src/cmd/draw/tcolors.c @@ -232,4 +232,3 @@ resizethread(void *v) while(recv(mousectl->resizec, &x) >= 0) eresized(1); } - diff --git a/src/cmd/draw/tweak.c b/src/cmd/draw/tweak.c index 89fdef32..0a71e2dd 100644 --- a/src/cmd/draw/tweak.c +++ b/src/cmd/draw/tweak.c @@ -112,32 +112,32 @@ Cursor sight = { Cursor pixel = { {-7, -7}, {0x1f, 0xf8, 0x3f, 0xfc, 0x7f, 0xfe, 0xf8, 0x1f, - 0xf0, 0x0f, 0xe0, 0x07, 0xe0, 0x07, 0xfe, 0x7f, - 0xfe, 0x7f, 0xe0, 0x07, 0xe0, 0x07, 0xf0, 0x0f, + 0xf0, 0x0f, 0xe0, 0x07, 0xe0, 0x07, 0xfe, 0x7f, + 0xfe, 0x7f, 0xe0, 0x07, 0xe0, 0x07, 0xf0, 0x0f, 0x78, 0x1f, 0x7f, 0xfe, 0x3f, 0xfc, 0x1f, 0xf8, }, - {0x00, 0x00, 0x0f, 0xf0, 0x31, 0x8c, 0x21, 0x84, - 0x41, 0x82, 0x41, 0x82, 0x41, 0x82, 0x40, 0x02, - 0x40, 0x02, 0x41, 0x82, 0x41, 0x82, 0x41, 0x82, + {0x00, 0x00, 0x0f, 0xf0, 0x31, 0x8c, 0x21, 0x84, + 0x41, 0x82, 0x41, 0x82, 0x41, 0x82, 0x40, 0x02, + 0x40, 0x02, 0x41, 0x82, 0x41, 0x82, 0x41, 0x82, 0x21, 0x84, 0x31, 0x8c, 0x0f, 0xf0, 0x00, 0x00, } }; Cursor busy = { {-7, -7}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x8e, 0x1d, 0xc7, - 0xff, 0xe3, 0xff, 0xf3, 0xff, 0xff, 0x7f, 0xfe, + 0xff, 0xe3, 0xff, 0xf3, 0xff, 0xff, 0x7f, 0xfe, 0x3f, 0xf8, 0x17, 0xf0, 0x03, 0xe0, 0x00, 0x00,}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x82, - 0x04, 0x41, 0xff, 0xe1, 0x5f, 0xf1, 0x3f, 0xfe, + 0x04, 0x41, 0xff, 0xe1, 0x5f, 0xf1, 0x3f, 0xfe, 0x17, 0xf0, 0x03, 0xe0, 0x00, 0x00, 0x00, 0x00,} }; Cursor skull = { {-7,-7}, - {0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xe7, 0xe7, - 0xff, 0xff, 0xff, 0xff, 0x3f, 0xfc, 0x1f, 0xf8, - 0x0f, 0xf0, 0x3f, 0xfc, 0xff, 0xff, 0xff, 0xff, + {0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xe7, 0xe7, + 0xff, 0xff, 0xff, 0xff, 0x3f, 0xfc, 0x1f, 0xf8, + 0x0f, 0xf0, 0x3f, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xef, 0xf7, 0xc7, 0xe3, 0x00, 0x00, 0x00, 0x00,}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x03, 0xE7, 0xE7, 0x3F, 0xFC, 0x0F, 0xF0, 0x0D, 0xB0, @@ -372,7 +372,7 @@ stext(Thing *t, char *l0, char *l1) char buf[256]; l1[0] = 0; - sprint(buf, "depth:%d r:%d %d %d %d ", + sprint(buf, "depth:%d r:%d %d %d %d ", t->b->depth, t->b->r.min.x, t->b->r.min.y, t->b->r.max.x, t->b->r.max.y); if(t->parent) @@ -1397,7 +1397,7 @@ openedit(Thing *t, Point pt, int c) } br = t->b->r; if(t->s == 0){ - c = -1; + c = -1; /* if big enough to bother, sweep box */ if(Dx(br)<=16 && Dy(br)<=16) r = br; diff --git a/src/cmd/echo.c b/src/cmd/echo.c index 25b69692..aa620b04 100644 --- a/src/cmd/echo.c +++ b/src/cmd/echo.c @@ -27,7 +27,7 @@ main(int argc, char *argv[]) if(i < argc-1) *p++ = ' '; } - + if(!nflag) *p++ = '\n'; diff --git a/src/cmd/ed.c b/src/cmd/ed.c index 4084994c..8b0f36e5 100644 --- a/src/cmd/ed.c +++ b/src/cmd/ed.c @@ -203,7 +203,7 @@ commands(void) a1 = dol; if((addr2=a1) == 0) { given = 0; - addr2 = dot; + addr2 = dot; } else given = 1; if(addr1 == 0) @@ -726,7 +726,7 @@ getchr(void) i++; if(fullrune(s, i)) break; - + } chartorune(&r, s); lastc = r; @@ -1072,7 +1072,7 @@ Rune* getblock(int atl, int iof) { int bno, off; - + static uchar ibuff[BLKSIZE]; static uchar obuff[BLKSIZE]; @@ -1488,7 +1488,7 @@ match(int *addr) } loc1 = loc2 = 0; return 0; - + } void diff --git a/src/cmd/eqn/diacrit.c b/src/cmd/eqn/diacrit.c index 10dc8c75..54f48f79 100644 --- a/src/cmd/eqn/diacrit.c +++ b/src/cmd/eqn/diacrit.c @@ -64,7 +64,7 @@ void diacrit(int p1, int type) nrwid(c, ps, c); if (lfont[p1] != ITAL) printf(".nr %d 0\n", t); - printf(".as %d \\h'-\\n(%du-\\n(%du/2u+\\n(%du'\\v'0-\\n(10u'\\*(%d", + printf(".as %d \\h'-\\n(%du-\\n(%du/2u+\\n(%du'\\v'0-\\n(10u'\\*(%d", p1, p1, c, t, c); printf("\\v'\\n(10u'\\h'-\\n(%du+\\n(%du/2u-\\n(%du'\n", c, p1, t); if (type != UNDER && type != UTILDE) diff --git a/src/cmd/eqn/eqnbox.c b/src/cmd/eqn/eqnbox.c index 6ec013bb..98006aa9 100644 --- a/src/cmd/eqn/eqnbox.c +++ b/src/cmd/eqn/eqnbox.c @@ -8,7 +8,7 @@ void eqnbox(int p1, int p2, int lu) yyval = p1; b = max(ebase[p1], ebase[p2]); - eht[yyval] = h = b + max(eht[p1]-ebase[p1], + eht[yyval] = h = b + max(eht[p1]-ebase[p1], eht[p2]-ebase[p2]); ebase[yyval] = b; dprintf(".\tS%d <- %d %d; b=%g, h=%g\n", (int)yyval, p1, p2, b, h); diff --git a/src/cmd/eqn/font.c b/src/cmd/eqn/font.c index 3fb01119..961c7bb2 100644 --- a/src/cmd/eqn/font.c +++ b/src/cmd/eqn/font.c @@ -51,7 +51,7 @@ void globfont(void) } else if (strcmp(temp, "R") == 0 || strncmp(temp, "ro", 2) == 0) { ft = ROM; strcpy(temp, "1"); - } else { + } else { ft = ROM; /* assume it's a roman style */ } ftstack[0].ft = ft; diff --git a/src/cmd/eqn/fromto.c b/src/cmd/eqn/fromto.c index cf9c96e5..5dda828c 100644 --- a/src/cmd/eqn/fromto.c +++ b/src/cmd/eqn/fromto.c @@ -28,21 +28,21 @@ void fromto(int p1, int p2, int p3) printf(".ds %d ", (int)yyval); /* bottom of middle box */ if (p2 > 0) { t = eht[p2]-ebase[p2]+b1; - printf("\\v'%gm'\\h'\\n(%du-\\n(%du/2u'%s\\*(%d%s", + printf("\\v'%gm'\\h'\\n(%du-\\n(%du/2u'%s\\*(%d%s", REL(t,ps), (int)yyval, p2, DPS(ps,subps), p2, DPS(subps,ps)); - printf("\\h'-\\n(%du-\\n(%du/2u'\\v'%gm'\\\n", + printf("\\h'-\\n(%du-\\n(%du/2u'\\v'%gm'\\\n", (int)yyval, p2, REL(-t,ps)); } - printf("\\h'\\n(%du-\\n(%du/2u'\\*(%d\\h'\\n(%du-\\n(%du/2u'\\\n", + printf("\\h'\\n(%du-\\n(%du/2u'\\*(%d\\h'\\n(%du-\\n(%du/2u'\\\n", (int)yyval, p1, p1, (int)yyval, p1); if (p3 >0) { t = h1-b1+ebase[p3]; - printf("\\v'%gm'\\h'-\\n(%du-\\n(%du/2u'%s\\*(%d%s\\h'\\n(%du-\\n(%du/2u'\\v'%gm'\\\n", + printf("\\v'%gm'\\h'-\\n(%du-\\n(%du/2u'%s\\*(%d%s\\h'\\n(%du-\\n(%du/2u'\\v'%gm'\\\n", REL(-t,ps), (int)yyval, p3, DPS(ps,subps), p3, DPS(subps,ps), (int)yyval, p3, REL(t,ps)); } printf("\n"); ebase[yyval] = b + b1; - dprintf(".\tS%d <- %d from %d to %d; h=%g b=%g\n", + dprintf(".\tS%d <- %d from %d to %d; h=%g b=%g\n", (int)yyval, p1, p2, p3, eht[yyval], ebase[yyval]); sfree(p1); if (p2 > 0) diff --git a/src/cmd/eqn/funny.c b/src/cmd/eqn/funny.c index 3d0cef74..f5e42758 100644 --- a/src/cmd/eqn/funny.c +++ b/src/cmd/eqn/funny.c @@ -24,7 +24,7 @@ void funny(int n) printf(".ds %d %s\n", (int)yyval, f); eht[yyval] = EM(1.0, ps+Funnyps) - EM(Funnyht, ps); ebase[yyval] = EM(Funnybase, ps); - dprintf(".\tS%d <- %s; h=%g b=%g\n", + dprintf(".\tS%d <- %s; h=%g b=%g\n", (int)yyval, f, eht[yyval], ebase[yyval]); lfont[yyval] = rfont[yyval] = ROM; } diff --git a/src/cmd/eqn/main.c b/src/cmd/eqn/main.c index 25f7eee3..816218c0 100644 --- a/src/cmd/eqn/main.c +++ b/src/cmd/eqn/main.c @@ -188,7 +188,7 @@ void inline(void) printf(".lf %d\n", curfile->lineno+1); if (curfile->lineno > n+3) fprintf(stderr, "eqn warning: multi-line %c...%c, file %s:%d,%d\n", - lefteq, righteq, curfile->fname, n, curfile->lineno); + lefteq, righteq, curfile->fname, n, curfile->lineno); sfree(ds); if (sz1) sfree(sz1); } @@ -276,7 +276,7 @@ char *ABSPS(int dn) /* absolute size dn in printable form \sd or \s(dd (dd >= 40 } else { *lb++ = dn + '0'; } - *lb++ = '\0'; + *lb++ = '\0'; return p; } @@ -307,7 +307,7 @@ char *DPS(int f, int t) /* delta ps (t-f) in printable form \s+d or \s-d or \s+- } else { *lb++ = dn + '0'; } - *lb++ = '\0'; + *lb++ = '\0'; return p; } diff --git a/src/cmd/eqn/mbwc.c b/src/cmd/eqn/mbwc.c index c97b036c..39763508 100644 --- a/src/cmd/eqn/mbwc.c +++ b/src/cmd/eqn/mbwc.c @@ -162,4 +162,3 @@ wcstombs(char *s, const wchar_t *pwcs, size_t n) } return p-s; } - diff --git a/src/cmd/eqn/move.c b/src/cmd/eqn/move.c index 06448add..b6462c78 100644 --- a/src/cmd/eqn/move.c +++ b/src/cmd/eqn/move.c @@ -14,6 +14,6 @@ void move(int dir, int amt, int p) printf("\\v'-%gm'\\*(%d\\v'%gm'\n", a, p, a); else if (dir == DOWN) printf("\\v'%gm'\\*(%d\\v'-%gm'\n", a, p, a); - dprintf(".\tmove %d dir %d amt %g; h=%g b=%g\n", + dprintf(".\tmove %d dir %d amt %g; h=%g b=%g\n", p, dir, a, eht[yyval], ebase[yyval]); } diff --git a/src/cmd/eqn/over.c b/src/cmd/eqn/over.c index 575d1c8e..0d519dd5 100644 --- a/src/cmd/eqn/over.c +++ b/src/cmd/eqn/over.c @@ -11,7 +11,7 @@ void boverb(int p1, int p2) d = EM(Overgap, ps); h = eht[p1] + eht[p2] + d; b = eht[p2] - d; - dprintf(".\tS%d <- %d over %d; b=%g, h=%g\n", + dprintf(".\tS%d <- %d over %d; b=%g, h=%g\n", (int)yyval, p1, p2, b, h); nrwid(p1, ps, p1); nrwid(p2, ps, p2); @@ -19,12 +19,12 @@ void boverb(int p1, int p2) printf(".if \\n(%d>\\n(%d .nr %d \\n(%d\n", p2, treg, treg, p2); printf(".nr %d \\n(%d+%gm\n", treg, treg, Overwid); d2 = eht[p2]-ebase[p2]-d; /* denom */ - printf(".ds %d \\v'%gm'\\h'\\n(%du-\\n(%du/2u'\\*(%d\\v'%gm'\\\n", + printf(".ds %d \\v'%gm'\\h'\\n(%du-\\n(%du/2u'\\*(%d\\v'%gm'\\\n", (int)yyval, REL(d2,ps), treg, p2, p2, REL(-d2,ps)); d1 = 2 * d + ebase[p1]; /* num */ - printf("\\h'-\\n(%du-\\n(%du/2u'\\v'%gm'\\*(%d\\v'%gm'\\\n", + printf("\\h'-\\n(%du-\\n(%du/2u'\\v'%gm'\\*(%d\\v'%gm'\\\n", p2, p1, REL(-d1,ps), p1, REL(d1,ps)); - printf("\\h'-\\n(%du-\\n(%du/2u+%gm'\\v'%gm'\\l'\\n(%du-%gm'\\h'%gm'\\v'%gm'\n", + printf("\\h'-\\n(%du-\\n(%du/2u+%gm'\\v'%gm'\\l'\\n(%du-%gm'\\h'%gm'\\v'%gm'\n", treg, p1, Overline, REL(-d,ps), treg, 2*Overline, Overline, REL(d,ps)); ebase[yyval] = b; diff --git a/src/cmd/eqn/paren.c b/src/cmd/eqn/paren.c index 4a9fea0b..e7d7d7ce 100644 --- a/src/cmd/eqn/paren.c +++ b/src/cmd/eqn/paren.c @@ -121,7 +121,7 @@ void paren(int leftc, int p1, int rightc) printf("\\v'%gm'", -bv); } printf("\n"); - dprintf(".\tcurly: h=%g b=%g n=%d v=%g l=%c, r=%c\n", + dprintf(".\tcurly: h=%g b=%g n=%d v=%g l=%c, r=%c\n", eht[yyval], ebase[yyval], n, v, leftc, rightc); } diff --git a/src/cmd/eqn/pile.c b/src/cmd/eqn/pile.c index a8901721..8052e5c4 100644 --- a/src/cmd/eqn/pile.c +++ b/src/cmd/eqn/pile.c @@ -41,34 +41,34 @@ void pile(int oct) printf(".nr %d \\n(%d\n", (int)yyval, lp[p1]); for (i = p1+1; i < p2; i++) { nrwid(lp[i], ps, lp[i]); - printf(".if \\n(%d>\\n(%d .nr %d \\n(%d\n", + printf(".if \\n(%d>\\n(%d .nr %d \\n(%d\n", lp[i], (int)yyval, (int)yyval, lp[i]); } - printf(".ds %d \\v'%gm'\\h'%du*\\n(%du'\\\n", (int)yyval, REL(ebase[yyval],ps), + printf(".ds %d \\v'%gm'\\h'%du*\\n(%du'\\\n", (int)yyval, REL(ebase[yyval],ps), type==RCOL ? 1 : 0, (int)yyval); sb = 0; /* sum of box hts */ for (i = p2-1; i >= p1; i--) { bi = sb + ebase[lp[i]]; switch (type) { case LCOL: - printf("\\v'%gm'\\*(%d\\h'-\\n(%du'\\v'%gm'\\\n", + printf("\\v'%gm'\\*(%d\\h'-\\n(%du'\\v'%gm'\\\n", REL(-bi,ps), lp[i], lp[i], REL(bi,ps)); break; case RCOL: - printf("\\v'%gm'\\h'-\\n(%du'\\*(%d\\v'%gm'\\\n", + printf("\\v'%gm'\\h'-\\n(%du'\\*(%d\\v'%gm'\\\n", REL(-bi,ps), lp[i], lp[i], REL(bi,ps)); break; case CCOL: case COL: - printf("\\v'%gm'\\h'\\n(%du-\\n(%du/2u'\\*(%d", + printf("\\v'%gm'\\h'\\n(%du-\\n(%du/2u'\\*(%d", REL(-bi,ps), (int)yyval, lp[i], lp[i]); - printf("\\h'-\\n(%du-\\n(%du/2u'\\v'%gm'\\\n", + printf("\\h'-\\n(%du-\\n(%du/2u'\\v'%gm'\\\n", (int)yyval, lp[i], REL(bi,ps)); break; } sb += eht[lp[i]] + gap; } - printf("\\v'%gm'\\h'%du*\\n(%du'\n", REL(-ebase[yyval],ps), + printf("\\v'%gm'\\h'%du*\\n(%du'\n", REL(-ebase[yyval],ps), type!=RCOL ? 1 : 0, (int)yyval); for (i = p1; i < p2; i++) sfree(lp[i]); diff --git a/src/cmd/eqn/shift.c b/src/cmd/eqn/shift.c index 970c13e7..34f04080 100644 --- a/src/cmd/eqn/shift.c +++ b/src/cmd/eqn/shift.c @@ -56,10 +56,10 @@ void bshiftb(int p1, int dir, int p2) sh1 = pad(n); rclass[p1] = rclass[p2]; /* OTHER leaves too much after sup */ } - dprintf(".\tS%d <- %d shift %g %d; b=%g, h=%g, ps=%d, subps=%d\n", + dprintf(".\tS%d <- %d shift %g %d; b=%g, h=%g, ps=%d, subps=%d\n", (int)yyval, p1, shval, p2, ebase[yyval], eht[yyval], ps, subps); sh2 = Sub2space; /* was Sub2space; */ - printf(".as %d \\v'%gm'%s%s\\*(%d%s%s\\v'%gm'\n", + printf(".as %d \\v'%gm'%s%s\\*(%d%s%s\\v'%gm'\n", (int)yyval, REL(shval,ps), DPS(ps,subps), sh1, p2, DPS(subps,ps), sh2, REL(-shval,ps)); rfont[p1] = 0; @@ -105,9 +105,9 @@ void shift2(int p1, int p2, int p3) nrwid(p3, subps, p3); printf(".nr %d \\n(%d\n", treg, p3); printf(".if \\n(%d>\\n(%d .nr %d \\n(%d\n", p2, treg, treg, p2); - printf(".as %d %s\\v'%gm'\\*(%d\\v'%gm'\\h'-\\n(%du'\\\n", + printf(".as %d %s\\v'%gm'\\*(%d\\v'%gm'\\h'-\\n(%du'\\\n", p1, DPS(ps,subps), REL(subsh,subps), p2, REL(-subsh,subps), p2); - printf("\\v'%gm'\\*(%d\\v'%gm'\\h'-\\n(%du+\\n(%du'%s%s\n", + printf("\\v'%gm'\\*(%d\\v'%gm'\\h'-\\n(%du+\\n(%du'%s%s\n", REL(supsh,subps), p3, REL(-supsh,subps), p3, treg, DPS(subps,ps), Sub2space); if (rfont[p2] == ITAL) rfont[yyval] = 0; /* lie */ diff --git a/src/cmd/eqn/size.c b/src/cmd/eqn/size.c index 01837e14..3e57b4de 100644 --- a/src/cmd/eqn/size.c +++ b/src/cmd/eqn/size.c @@ -29,7 +29,7 @@ void size(int p1, int p2) { /* old size in p1, new in ps */ yyval = p2; - dprintf(".\tS%d <- \\s%d %d \\s%d; b=%g, h=%g\n", + dprintf(".\tS%d <- \\s%d %d \\s%d; b=%g, h=%g\n", (int)yyval, ps, p2, p1, ebase[yyval], eht[yyval]); if (szstack[nszstack] != 0) { printf(".ds %d %s\\*(%d\\s\\n(%d\n", (int)yyval, ABSPS(ps), p2, 99-nszstack); diff --git a/src/cmd/eqn/sqrt.c b/src/cmd/eqn/sqrt.c index 69359b67..0963fe45 100644 --- a/src/cmd/eqn/sqrt.c +++ b/src/cmd/eqn/sqrt.c @@ -17,7 +17,7 @@ void sqrt(int p2) eht[yyval] = EM(1.15, nps); else /* DEV202, DEVPOST */ eht[yyval] = EM(1.15, nps); - dprintf(".\tS%d <- sqrt S%d;b=%g, h=%g, nps=%d\n", + dprintf(".\tS%d <- sqrt S%d;b=%g, h=%g, nps=%d\n", (int)yyval, p2, ebase[yyval], eht[yyval], nps); printf(".as %d \\|\n", (int)yyval); nrwid(p2, ps, p2); diff --git a/src/cmd/eqn/text.c b/src/cmd/eqn/text.c index c016cca0..4ca0bbd9 100644 --- a/src/cmd/eqn/text.c +++ b/src/cmd/eqn/text.c @@ -193,7 +193,7 @@ trans(int c, char *p1) cadd(c); psp++; } else { - cadd(c); + cadd(c); } return f; case '-': @@ -263,7 +263,7 @@ char *pad(int n) /* return the padding as a string */ if (n < 0) { sprintf(buf, "\\h'-%du*\\w'\\^'u'", -n); return buf; - } + } for ( ; n > 1; n -= 2) strcat(buf, "\\|"); if (n > 0) diff --git a/src/cmd/faces/facedb.c b/src/cmd/faces/facedb.c index a24a391a..5043aa78 100644 --- a/src/cmd/faces/facedb.c +++ b/src/cmd/faces/facedb.c @@ -112,7 +112,7 @@ readfile(char *s) continue; /* - * if it's less than 30 seconds since we read it, or it + * if it's less than 30 seconds since we read it, or it * hasn't changed, send back our copy */ if(time(0) - r->rdtime < 30) @@ -215,7 +215,7 @@ tryfindpicture(char *dom, char *user, char *dir, char *dict) { static char buf[1024]; char *file, *p, *nextp, *q; - + if((file = readfile(dict)) == nil) return nil; @@ -247,7 +247,7 @@ static char* estrstrdup(char *a, char *b) { char *t; - + t = emalloc(strlen(a)+strlen(b)+1); strcpy(t, a); strcat(t, b); @@ -261,7 +261,7 @@ tryfindfiledir(char *dom, char *user, char *dir) int fd; int i, n; Dir *d; - + /* * If this directory has a .machinelist, use it. */ @@ -279,7 +279,7 @@ tryfindfiledir(char *dom, char *user, char *dir) return x; } free(dict); - + /* * If not, recurse into subdirectories. * Ignore 48x48xN directories for now. @@ -305,7 +305,7 @@ tryfindfiledir(char *dom, char *user, char *dir) free(d); } close(fd); - + /* * Handle 48x48xN directories in the right order. */ @@ -398,7 +398,7 @@ freefacefile(Facefile *f) return; if(++nsaved > Nsave) clearsaved(); -} +} static Image* myallocimage(ulong chan) @@ -413,7 +413,7 @@ myallocimage(ulong chan) } return img; } - + static Image* readbit(int fd, ulong chan) @@ -527,14 +527,14 @@ readface(char *fn) mask = myallocimage(GREY1); if(mask == nil) goto Done; - if(unloadimage(face, face->r, data, Facesize*Facesize) != Facesize*Facesize){ + if(unloadimage(face, face->r, data, Facesize*Facesize) != Facesize*Facesize){ freeimage(mask); goto Done; } bits = 0; p = mdata; for(y=0; y<Facesize; y++){ - for(x=0; x<Facesize; x++){ + for(x=0; x<Facesize; x++){ bits <<= 1; if(data[Facesize*y+x] != 0xFF) bits |= 1; diff --git a/src/cmd/faces/main.c b/src/cmd/faces/main.c index bb36ed7c..30343c74 100644 --- a/src/cmd/faces/main.c +++ b/src/cmd/faces/main.c @@ -19,7 +19,7 @@ enum Infolines = 9, HhmmTime = 18*60*60, /* max age of face to display hh:mm time */ - + STACK = 32768 }; @@ -293,7 +293,7 @@ updatetimes(void) continue; if(((long)(now - f->time) <= HhmmTime) != f->recent) drawface(f, i); - } + } } void @@ -610,7 +610,7 @@ click(int button, Mouse *m) return; }else{ for(i=first; i<last; i++) /* clear vwhois faces */ - if(ptinrect(p, facerect(i-first)) + if(ptinrect(p, facerect(i-first)) && strstr(faces[i]->str[Sshow], "/XXXvwhois")){ lockdisplay(display); delface(i); diff --git a/src/cmd/faces/plumb.c b/src/cmd/faces/plumb.c index 6d82c779..b2fcfa85 100644 --- a/src/cmd/faces/plumb.c +++ b/src/cmd/faces/plumb.c @@ -113,7 +113,7 @@ setname(Face *f, char *sender) static char* months[] = { "jan", "feb", "mar", "apr", - "may", "jun", "jul", "aug", + "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec" }; diff --git a/src/cmd/faces/util.c b/src/cmd/faces/util.c index 22f57549..5f3e7fde 100644 --- a/src/cmd/faces/util.c +++ b/src/cmd/faces/util.c @@ -39,4 +39,3 @@ estrdup(char *s) } return t; } - diff --git a/src/cmd/file.c b/src/cmd/file.c index 32d580cd..0ee1d1cf 100644 --- a/src/cmd/file.c +++ b/src/cmd/file.c @@ -52,7 +52,7 @@ struct "common", Fword, "con", Lword, "data", Fword, - "dimension", Fword, + "dimension", Fword, "double", Cword, "extern", Cword, "bio", I2, @@ -86,7 +86,7 @@ struct enum { Normal = 0, First, /* first entry for language spanning several ranges */ - Multi, /* later entries " " " ... */ + Multi, /* later entries " " " ... */ Shared, /* codes used in several languages */ }; @@ -97,7 +97,7 @@ struct int low; int high; char *name; - + } language[] = { Normal, 0, 0x0080, 0x0080, "Extended Latin", @@ -127,8 +127,8 @@ struct Shared, 0, 0x4e00, 0x9fff, "CJK", Normal, 0, 0, 0, 0, /* terminal entry */ }; - - + + enum { Fascii, /* printable ascii */ @@ -342,7 +342,7 @@ filetype(int fd) * lookup dictionary words */ memset(wfreq, 0, sizeof(wfreq)); - if(guess == Fascii || guess == Flatin || guess == Futf) + if(guess == Fascii || guess == Flatin || guess == Futf) wordfreq(); /* * call individual classify routines @@ -540,7 +540,7 @@ filemagic(Filemagic *tab, int ntab, ulong x) } return 0; } - + int long0(void) { @@ -876,7 +876,7 @@ yes: } if(wfreq[Alword] > 0) print("alef program\n"); - else + else print("c program\n"); return 1; } @@ -1042,7 +1042,7 @@ depthof(char *s, int *newp) s++; /* skip letter */ d += strtoul(s, &s, 10); } - + switch(d){ case 32: case 24: diff --git a/src/cmd/fmt.c b/src/cmd/fmt.c index 1c4de871..047da847 100644 --- a/src/cmd/fmt.c +++ b/src/cmd/fmt.c @@ -104,7 +104,7 @@ indentof(char **linep) ind -= ind%maxtab; break; } - + /* plain white space doesn't change the indent */ *linep = ""; return indent; diff --git a/src/cmd/fontsrv/main.c b/src/cmd/fontsrv/main.c index 37f0da32..ebab6249 100644 --- a/src/cmd/fontsrv/main.c +++ b/src/cmd/fontsrv/main.c @@ -70,7 +70,7 @@ dostat(vlong path, Qid *qid, Dir *dir) vlong length; XFont *f; char buf[100]; - + q.type = 0; q.vers = 0; q.path = path; @@ -98,7 +98,7 @@ dostat(vlong path, Qid *qid, Dir *dir) snprint(buf, sizeof buf, "%lld%s", QSIZE(path), QANTIALIAS(path) ? "a" : ""); name = buf; break; - + case Qfontfile: f = &xfont[QFONT(path)]; load(f); @@ -111,7 +111,7 @@ dostat(vlong path, Qid *qid, Dir *dir) name = buf; break; } - + if(qid) *qid = q; if(dir) { @@ -214,7 +214,7 @@ fontgen(int i, Dir *d, void *v) { vlong path; Fid *f; - + f = v; path = f->qid.path; if(i >= 2*nelem(sizes)) @@ -280,7 +280,7 @@ void responderrstr(Req *r) { char err[ERRMAX]; - + rerrstr(err, sizeof err); respond(r, err); } @@ -295,7 +295,7 @@ xread(Req *r) char *data; Memsubfont *sf; Memimage *m; - + path = r->fid->qid.path; switch(QTYPE(path)) { case Qroot: @@ -377,7 +377,7 @@ static void xdestroyfid(Fid *fid) { Memsubfont *sf; - + sf = fid->aux; if(sf == nil) return; @@ -420,7 +420,7 @@ dump(char *path) // root memset(&fid, 0, sizeof fid); - dostat(0, &fid.qid, nil); + dostat(0, &fid.qid, nil); qid = fid.qid; path0 = path; @@ -440,7 +440,7 @@ dump(char *path) *p++ = '/'; path = p; } - + memset(&r, 0, sizeof r); xsrv.fake = 1; @@ -513,7 +513,7 @@ main(int argc, char **argv) default: usage(); }ARGEND - + xsrv.attach = xattach; xsrv.open = xopen; xsrv.read = xread; @@ -526,7 +526,7 @@ main(int argc, char **argv) memimageinit(); loadfonts(); qsort(xfont, nxfont, sizeof xfont[0], fontcmp); - + if(pflag) { if(argc != 1 || chatty9p || chattyfuse) usage(); @@ -600,4 +600,3 @@ dirpackage(uchar *buf, long ts, Dir **d) return nn; } - diff --git a/src/cmd/fontsrv/osx.c b/src/cmd/fontsrv/osx.c index c01ae6ce..b4dadd90 100644 --- a/src/cmd/fontsrv/osx.c +++ b/src/cmd/fontsrv/osx.c @@ -51,7 +51,7 @@ mac2c(CFStringRef s) char *p; int n; - n = CFStringGetLength(s)*8; + n = CFStringGetLength(s)*8; p = malloc(n); CFStringGetCString(s, p, n, kCFStringEncodingUTF8); return p; @@ -93,7 +93,7 @@ loadfonts(void) if(f == nil) continue; s = CTFontDescriptorCopyAttribute(f, kCTFontNameAttribute); - xfont[nxfont].name = mac2c(s); + xfont[nxfont].name = mac2c(s); CFRelease(s); nxfont++; } @@ -147,7 +147,7 @@ fontheight(XFont *f, int size, int *height, int *ascent) CTLineRef line; str = c2mac(lines[i]); - + // See https://developer.apple.com/library/ios/documentation/StringsTextFonts/Conceptual/CoreText_Programming/LayoutOperations/LayoutOperations.html#//apple_ref/doc/uid/TP40005533-CH12-SW2 attrs = CFDictionaryCreate(kCFAllocatorDefault, (const void**)&keys, (const void**)&values, sizeof(keys) / sizeof(keys[0]), @@ -162,15 +162,15 @@ fontheight(XFont *f, int size, int *height, int *ascent) r.size.width += r.origin.x; r.size.height += r.origin.y; CFRelease(line); - + // fprint(2, "%s: %g %g %g %g\n", lines[i], r.origin.x, r.origin.y, r.size.width, r.size.height); - + if(i == 0) bbox = r; if(bbox.origin.x > r.origin.x) - bbox.origin.x = r.origin.x; + bbox.origin.x = r.origin.x; if(bbox.origin.y > r.origin.y) - bbox.origin.y = r.origin.y; + bbox.origin.y = r.origin.y; if(bbox.size.width < r.size.width) bbox.size.width = r.size.width; if(bbox.size.height < r.size.height) @@ -182,7 +182,7 @@ fontheight(XFont *f, int size, int *height, int *ascent) *height = bbox.size.height + 0.999999; *ascent = *height - (-bbox.origin.y + 0.999999); - + CGContextRelease(ctxt); CFRelease(font); } @@ -232,8 +232,8 @@ mksubfont(XFont *f, char *name, int lo, int hi, int size, int antialias) CFRelease(desc); if(font == nil) return nil; - - + + bbox = CTFontGetBoundingBox(font); x = (int)(bbox.size.width*2 + 0.99999999); @@ -295,7 +295,7 @@ mksubfont(XFont *f, char *name, int lo, int hi, int size, int antialias) sprint(buf, "%C", (Rune)mapUnicode(name, i)); str = c2mac(buf); - + // See https://developer.apple.com/library/ios/documentation/StringsTextFonts/Conceptual/CoreText_Programming/LayoutOperations/LayoutOperations.html#//apple_ref/doc/uid/TP40005533-CH12-SW2 attrs = CFDictionaryCreate(kCFAllocatorDefault, (const void**)&keys, (const void**)&values, sizeof(keys) / sizeof(keys[0]), @@ -309,7 +309,7 @@ mksubfont(XFont *f, char *name, int lo, int hi, int size, int antialias) CGContextSetTextPosition(ctxt, 0, y0); r = CTLineGetImageBounds(line, ctxt); memfillcolor(mc, DBlack); - CTLineDraw(line, ctxt); + CTLineDraw(line, ctxt); CFRelease(line); fc->x = x; @@ -324,7 +324,7 @@ mksubfont(XFont *f, char *name, int lo, int hi, int size, int antialias) if(i == 0) { drawpjw(m, fc, x, (int)(bbox.size.width + 0.99999999), y, y - y0); x += fc->width; - } + } continue; } @@ -357,6 +357,6 @@ mksubfont(XFont *f, char *name, int lo, int hi, int size, int antialias) sf->ascent = Dy(m1->r) - y0; sf->info = fc0; sf->bits = m1; - + return sf; } diff --git a/src/cmd/fontsrv/pjw.c b/src/cmd/fontsrv/pjw.c index 30ebbed2..82e8cfa1 100644 --- a/src/cmd/fontsrv/pjw.c +++ b/src/cmd/fontsrv/pjw.c @@ -96,7 +96,7 @@ drawpjw(Memimage *m, Fontchar *fc, int x, int width, int height, int ascent) Memimage *pm, *pm1, *pm2; Rectangle r; int margin; - + w = width; // assume margin below baseline is @@ -116,7 +116,7 @@ drawpjw(Memimage *m, Fontchar *fc, int x, int width, int height, int ascent) close(p[0]); if(pm == nil) goto Error; - + pm1 = allocmemimage(pm->r, GREY8); memimagedraw(pm1, pm1->r, pm, pm->r.min, nil, ZP, S); pm2 = resample(w, w, pm1); @@ -216,7 +216,7 @@ fac(int L) return f; } -/* +/* * i0(x) is the modified Bessel function, Σ (x/2)^2L / (L!)² * There are faster ways to calculate this, but we precompute * into a table so let's keep it simple. diff --git a/src/cmd/fossil/9fsys.c b/src/cmd/fossil/9fsys.c index ac724251..121e5b66 100644 --- a/src/cmd/fossil/9fsys.c +++ b/src/cmd/fossil/9fsys.c @@ -503,7 +503,7 @@ fsysSync(Fsys* fsys, int argc, char* argv[]) { char *usage = "usage: [fsys name] sync"; int n; - + ARGBEGIN{ default: return cliError(usage); @@ -1307,7 +1307,7 @@ fsckClri(Fsck *fsck, char *name, MetaBlock *mb, int i, Block *b) mbDelete(mb, i); mbPack(mb); - blockDirty(b); + blockDirty(b); } static void @@ -1322,12 +1322,12 @@ fsckClose(Fsck *fsck, Block *b, u32int epoch) consPrint("%#ux is already closed\n", b->addr); return; } - if(epoch){ + if(epoch){ l.state |= BsClosed; l.epochClose = epoch; }else l.state = BsFree; - + if(!blockSetLabel(b, &l, 0)) consPrint("%#ux setlabel: %r\n", b->addr); } diff --git a/src/cmd/fossil/9lstn.c b/src/cmd/fossil/9lstn.c index b4023e8b..4f960729 100644 --- a/src/cmd/fossil/9lstn.c +++ b/src/cmd/fossil/9lstn.c @@ -46,7 +46,7 @@ lstnListen(void* a) Lstn *lstn; int dfd, lfd; char newdir[NETPATHLEN]; - + threadsetname("listen"); lstn = a; diff --git a/src/cmd/fossil/9p.c b/src/cmd/fossil/9p.c index 6738670e..e15622af 100644 --- a/src/cmd/fossil/9p.c +++ b/src/cmd/fossil/9p.c @@ -939,7 +939,7 @@ parseAname(char *aname, char **fsname, char **path) /* * Check remote IP address against /mnt/ipok. * Sources.cs.bell-labs.com uses this to disallow - * network connections from Sudan, Libya, etc., + * network connections from Sudan, Libya, etc., * following U.S. cryptography export regulations. */ static int @@ -955,7 +955,7 @@ conIPCheck(Con* con) } if(access("/mnt/ipok/ok", AEXIST) < 0){ /* mount closes the fd on success */ - if((fd = open("/srv/ipok", ORDWR)) >= 0 + if((fd = open("/srv/ipok", ORDWR)) >= 0 && mount(fd, -1, "/mnt/ipok", MREPL, "") < 0) close(fd); if(access("/mnt/ipok/ok", AEXIST) < 0){ diff --git a/src/cmd/fossil/9ping.c b/src/cmd/fossil/9ping.c index dbf628c5..d820f208 100644 --- a/src/cmd/fossil/9ping.c +++ b/src/cmd/fossil/9ping.c @@ -37,7 +37,7 @@ main(int argc, char *argv[]) int n = 1000, m; int s = 1; double *t, t0, t1; - uchar *buf; + uchar *buf; double a, d, max, min; m = OREAD; @@ -67,7 +67,7 @@ main(int argc, char *argv[]) buf = malloc(s); t = malloc(n*sizeof(double)); - + t0 = nsec(); for(i=0; i<n; i++){ if(m == OREAD){ @@ -96,7 +96,7 @@ main(int argc, char *argv[]) } a /= n; - + for(i=0; i<n; i++) d += (a - t[i]) * (a - t[i]); d /= n; diff --git a/src/cmd/fossil/archive.c b/src/cmd/fossil/archive.c index 7a88f23e..451fe628 100644 --- a/src/cmd/fossil/archive.c +++ b/src/cmd/fossil/archive.c @@ -273,14 +273,14 @@ if(0) fprint(2, "falling\n"); blockDirty(b); /* * If b is in the active tree, then we need to note that we've - * just removed addr from the active tree (replacing it with the + * just removed addr from the active tree (replacing it with the * copy we just stored to Venti). If addr is in other snapshots, * this will close addr but not free it, since it has a non-empty * epoch range. * * If b is in the active tree but has been copied (this can happen * if we get killed at just the right moment), then we will - * mistakenly leak its kids. + * mistakenly leak its kids. * * The children of an archive directory (e.g., /archive/2004/0604) * are not treated as in the active tree. diff --git a/src/cmd/fossil/bwatch.c b/src/cmd/fossil/bwatch.c index 8cd0956e..7dcd6b2d 100644 --- a/src/cmd/fossil/bwatch.c +++ b/src/cmd/fossil/bwatch.c @@ -124,7 +124,7 @@ _bwatchResetParent(uchar *score) } } /* - * and child + * and child */ static void _bwatchResetChild(uchar *score) @@ -417,4 +417,3 @@ bwatchUnlock(Block *b) }else w->b[i] = w->b[--w->nb]; } - diff --git a/src/cmd/fossil/cache.c b/src/cmd/fossil/cache.c index 23f89461..6707d50a 100644 --- a/src/cmd/fossil/cache.c +++ b/src/cmd/fossil/cache.c @@ -1062,10 +1062,10 @@ if(0)fprint(2, "%s: %d:%x:%d depends on %d:%x:%d\n", argv0, b->part, b->addr, b- /* * Mark an in-memory block as dirty. If there are too many - * dirty blocks, start writing some out to disk. - * + * dirty blocks, start writing some out to disk. + * * If there were way too many dirty blocks, we used to - * try to do some flushing ourselves, but it's just too dangerous -- + * try to do some flushing ourselves, but it's just too dangerous -- * it implies that the callers cannot have any of our priors locked, * but this is hard to avoid in some cases. */ @@ -1332,16 +1332,16 @@ if(0) fprint(2, "%s: iostate part=%d addr=%x %s->%s\n", argv0, b->part, b->addr, } /* - * The active file system is a tree of blocks. + * The active file system is a tree of blocks. * When we add snapshots to the mix, the entire file system * becomes a dag and thus requires a bit more care. - * + * * The life of the file system is divided into epochs. A snapshot * ends one epoch and begins the next. Each file system block * is marked with the epoch in which it was created (b.epoch). * When the block is unlinked from the file system (closed), it is marked - * with the epoch in which it was removed (b.epochClose). - * Once we have discarded or archived all snapshots up to + * with the epoch in which it was removed (b.epochClose). + * Once we have discarded or archived all snapshots up to * b.epochClose, we can reclaim the block. * * If a block was created in a past epoch but is not yet closed, @@ -1359,7 +1359,7 @@ if(0) fprint(2, "%s: iostate part=%d addr=%x %s->%s\n", argv0, b->part, b->addr, * lbb (bb's label block). * * (2) We have to mark b as closed, but only after we switch - * the pointer, so lb must be written out after p. In fact, we + * the pointer, so lb must be written out after p. In fact, we * can't even update the in-memory copy, or the cache might * mistakenly give out b for reuse before p gets written. * @@ -1369,7 +1369,7 @@ if(0) fprint(2, "%s: iostate part=%d addr=%x %s->%s\n", argv0, b->part, b->addr, * to arrange for (2) to happen once p is written. * * Until (2) happens, some pieces of the code (e.g., the archiver) - * still need to know whether a block has been copied, so we + * still need to know whether a block has been copied, so we * set the BsCopied bit in the label and force that to disk *before* * the copy gets written out. */ @@ -1436,7 +1436,7 @@ void blockRemoveLink(Block *b, u32int addr, int type, u32int tag, int recurse) { BList *p, **pp, bl; - + /* remove bb from prior list */ for(pp=&b->prior; (p=*pp)!=nil; ){ if(p->part == PartData && p->addr == addr){ @@ -1479,7 +1479,7 @@ blockRemoveLink(Block *b, u32int addr, int type, u32int tag, int recurse) b->utail = p; } -/* +/* * Process removal of a single block and perhaps its children. */ static void @@ -1592,7 +1592,7 @@ blistAlloc(Block *b) /* * No free BLists. What are our options? */ - + /* Block has no priors? Just write it. */ if(b->prior == nil){ qunlock(&c->lk); diff --git a/src/cmd/fossil/flchk.c b/src/cmd/fossil/flchk.c index c003f706..2068a617 100644 --- a/src/cmd/fossil/flchk.c +++ b/src/cmd/fossil/flchk.c @@ -64,7 +64,7 @@ threadmain(int argc, char *argv[]) int csize = 1000; VtConn *z; char *host = nil; - + fsck.useventi = 1; Binit(&bout, 1, OWRITE); ARGBEGIN{ @@ -119,4 +119,3 @@ threadmain(int argc, char *argv[]) threadexitsall(0); } - diff --git a/src/cmd/fossil/flfmt9660.c b/src/cmd/fossil/flfmt9660.c index ac466bdd..128227d8 100644 --- a/src/cmd/fossil/flfmt9660.c +++ b/src/cmd/fossil/flfmt9660.c @@ -1,7 +1,7 @@ /* * Initialize a fossil file system from an ISO9660 image already in the * file system. This is a fairly bizarre thing to do, but it lets us generate - * installation CDs that double as valid Plan 9 disk partitions. + * installation CDs that double as valid Plan 9 disk partitions. * People having trouble booting the CD can just copy it into a disk * partition and you've got a working Plan 9 system. * @@ -329,7 +329,7 @@ iso9660start(Cdir *c) c = (Cdir*)((uchar*)c+c->len); /* skip dotdot */ /* oops: might happen if leftmost directory is empty or leftmost file is zero length! */ if(little(c->dloc, 4) == 0) - sysfatal("error parsing cd image or unfortunate cd image"); + sysfatal("error parsing cd image or unfortunate cd image"); } return little(c->dloc, 4); } diff --git a/src/cmd/fossil/fs.c b/src/cmd/fossil/fs.c index 5f8a1cfd..d1baf736 100644 --- a/src/cmd/fossil/fs.c +++ b/src/cmd/fossil/fs.c @@ -529,7 +529,7 @@ fsSnapshot(Fs *fs, char *srcpath, char *dstpath, int doarchive) * It is important that we maintain the invariant that: * if both b and bb are marked as Active with start epoch e * and b points at bb, then no other pointers to bb exist. - * + * * When bb is unlinked from b, its close epoch is set to b's epoch. * A block with epoch == close epoch is * treated as free by cacheAllocBlock; this aggressively @@ -1095,4 +1095,3 @@ snapClose(Snap *s) periodicKill(s->tick); vtfree(s); } - diff --git a/src/cmd/fossil/nobwatch.c b/src/cmd/fossil/nobwatch.c index 9f98c03f..e0e7b17e 100644 --- a/src/cmd/fossil/nobwatch.c +++ b/src/cmd/fossil/nobwatch.c @@ -37,4 +37,3 @@ bwatchUnlock(Block *b) { USED(b); } - diff --git a/src/cmd/fossil/pack.c b/src/cmd/fossil/pack.c index b27f90b8..75077a05 100644 --- a/src/cmd/fossil/pack.c +++ b/src/cmd/fossil/pack.c @@ -222,4 +222,3 @@ Err: werrstr(EBadSuper); return 0; } - diff --git a/src/cmd/fossil/periodic.c b/src/cmd/fossil/periodic.c index 634f975d..6164eca2 100644 --- a/src/cmd/fossil/periodic.c +++ b/src/cmd/fossil/periodic.c @@ -79,4 +79,3 @@ periodicThread(void *a) } periodicFree(p); } - diff --git a/src/cmd/fossil/srcload.c b/src/cmd/fossil/srcload.c index 8cf63b4f..97e45541 100644 --- a/src/cmd/fossil/srcload.c +++ b/src/cmd/fossil/srcload.c @@ -39,7 +39,7 @@ main(int argc, char *argv[]) case 'l': length = atoi(ARGF()); break; - case 'b': + case 'b': block = atoi(ARGF()); break; case 'u': @@ -92,7 +92,7 @@ main(int argc, char *argv[]) fprint(2, "count = %d\n", count(r, 1)); fprint(2, "total time = %ld\n", time(0)-t); - + fsClose(fs); vtDetach(); exits(0); @@ -119,7 +119,7 @@ new(Source *s, int trace, int depth) int i, n; Source *ss; Entry e; - + if(depth > maxdepth) maxdepth = depth; @@ -174,7 +174,7 @@ delete(Source *s) } if(i == n) return 0; - + for(;;){ ss = sourceOpen(s, nrand(n), OReadWrite); if(ss == nil) diff --git a/src/cmd/fossil/view.c b/src/cmd/fossil/view.c index ed18febc..659e5380 100644 --- a/src/cmd/fossil/view.c +++ b/src/cmd/fossil/view.c @@ -298,7 +298,7 @@ copyMetaBlock(MetaBlock mb) } /* - * visualizer + * visualizer */ #pragma varargck argpos stringnode 1 @@ -555,7 +555,7 @@ initxentryblock(Block *b, Entry *ed) } typedef struct Xentry Xentry; -struct Xentry +struct Xentry { Tnode t; Entry e; @@ -813,7 +813,7 @@ parseScore(uchar *score, char *buf, int n) if((i & 1) == 0) c <<= 4; - + score[i>>1] |= c; } return 1; @@ -912,7 +912,7 @@ drawnub(Image *m, Image *clipr, Point o, Tnode *t) o.y += (display->defaultfont->height-Nubheight)/2; draw(m, rectaddpt(Rect(0,0,1,Nubheight), o), display->black, clipr, ZP); draw(m, rectaddpt(Rect(0,0,Nubwidth,1), o), display->black, clipr, o); - draw(m, rectaddpt(Rect(Nubwidth-1,0,Nubwidth,Nubheight), o), + draw(m, rectaddpt(Rect(Nubwidth-1,0,Nubwidth,Nubheight), o), display->black, clipr, addpt(o, Pt(Nubwidth-1, 0))); draw(m, rectaddpt(Rect(0, Nubheight-1, Nubwidth, Nubheight), o), display->black, clipr, addpt(o, Pt(0, Nubheight-1))); diff --git a/src/cmd/fossil/walk.c b/src/cmd/fossil/walk.c index 632e3e5e..8fb1ceb7 100644 --- a/src/cmd/fossil/walk.c +++ b/src/cmd/fossil/walk.c @@ -62,4 +62,3 @@ nextWalk(WalkPtr *w, uchar score[VtScoreSize], uchar *type, u32int *tag, Entry * w->n++; return 1; } - diff --git a/src/cmd/getflags.c b/src/cmd/getflags.c index 7c7d1787..e97398a2 100644 --- a/src/cmd/getflags.c +++ b/src/cmd/getflags.c @@ -13,13 +13,13 @@ findarg(char *flags, Rune r) { char *p; Rune rr; - + for(p=flags; p!=(char*)1; p=strchr(p, ',')+1){ chartorune(&rr, p); if(rr == r) return p; } - return nil; + return nil; } int @@ -42,11 +42,11 @@ main(int argc, char *argv[]) char *flags, *p, buf[512]; int i, n; Fmt fmt; - - doquote = needsrcquote; + + doquote = needsrcquote; quotefmtinstall(); argv0 = argv[0]; /* for sysfatal */ - + flags = getenv("flagfmt"); if(flags == nil){ fprint(2, "$flagfmt not set\n"); @@ -72,7 +72,7 @@ main(int argc, char *argv[]) fmtprint(&fmt, "%s%q", i ? " " : "", EARGF(usage())); fmtprint(&fmt, ")\n"); }ARGEND - + fmtprint(&fmt, "*=("); for(i=0; i<argc; i++) fmtprint(&fmt, "%s%q", i ? " " : "", argv[i]); diff --git a/src/cmd/grap/misc.c b/src/cmd/grap/misc.c index 7a68a692..a3c215bd 100644 --- a/src/cmd/grap/misc.c +++ b/src/cmd/grap/misc.c @@ -120,7 +120,7 @@ double setvar(Obj *p, double f) /* set value of variable to f */ Point makepoint(Obj *s, double x, double y) /* make a Point */ { Point p; - + dprintf("makepoint: %s, %g,%g\n", s->name, x, y); p.obj = s; p.x = x; diff --git a/src/cmd/grap/print.c b/src/cmd/grap/print.c index a7497e44..0d4d4ab7 100644 --- a/src/cmd/grap/print.c +++ b/src/cmd/grap/print.c @@ -39,7 +39,7 @@ void print(void) /* arrange final output */ for (p = objlist; p; p = p->next) { dprintf("print: name = <%s>, type = %d\n", p->name, p->type); if (p->type == NAME) { - Point pt, pt1; + Point pt, pt1; pt = p->pt; pt1 = p->pt1; fprintf(tfd, "\t# %s %g .. %g, %g .. %g\n", @@ -78,7 +78,7 @@ void print(void) /* arrange final output */ p->pt1.y = pow(10.0, pt1.y); } dfp = setauto(); - } + } dx = pt1.x - pt.x; dy = pt1.y - pt.y; xfac = dx > 0 ? frame_wid/dx : frame_wid/2; @@ -184,7 +184,7 @@ void do_first(void) /* done at first .G1: definitions, etc. */ FILE *fp; snprintf(buf, sizeof buf, "define pid /%d/\n", getpid()); - pbstr(buf); + pbstr(buf); if (lib != 0) { if ((fp = fopen(lib_defines, "r")) != NULL) { snprintf(buf1, sizeof buf, "copy \"%s\"\n", lib_defines); diff --git a/src/cmd/graph/graph.c b/src/cmd/graph/graph.c index 7da0b81b..1dba7dfc 100644 --- a/src/cmd/graph/graph.c +++ b/src/cmd/graph/graph.c @@ -15,7 +15,7 @@ struct xy { float xquant; /*quantum*/ float xoff; /*screen offset fraction*/ float xsize; /*screen fraction*/ - int xbot,xtop; /*screen coords of border*/ + int xbot,xtop; /*screen coords of border*/ float xmult; /*scaling constant*/ } xd,yd; struct val { @@ -83,7 +83,7 @@ static void initpalette(void) { int i; - + for(i=0; i<nelem(colors); i++){ palette[(uchar)colors[i][0]].name = colors[i]; palette[(uchar)colors[i][0]].next = colors[i][0]; @@ -442,12 +442,12 @@ void setlim(struct xy *p){ if(ub > 0) { ub = 2*ub; lb = 0; - } + } else if(lb < 0) { lb = 2*lb; ub = 0; - } + } else { ub = 1; lb = -1; @@ -729,7 +729,7 @@ symbol(int ix, int iy, int k){ if(mode==0) point(ix,iy); return(1); - } + } else { move(ix,iy); text(k>=0?labels+k:plotsymb); diff --git a/src/cmd/grep/grep.h b/src/cmd/grep/grep.h index 777bd1e8..ac86b86d 100644 --- a/src/cmd/grep/grep.h +++ b/src/cmd/grep/grep.h @@ -36,7 +36,7 @@ struct Re { Rune lo; Rune hi; - } x; + } x; Rune val; /* char */ } u; Re* next; diff --git a/src/cmd/gzip/gunzip.c b/src/cmd/gzip/gunzip.c index bb348bc8..d9ef2e22 100644 --- a/src/cmd/gzip/gunzip.c +++ b/src/cmd/gzip/gunzip.c @@ -348,7 +348,7 @@ error(char *fmt, ...) vfprint(2, fmt, arg); va_end(arg); fprint(2, "\n"); - + if(delfile != nil){ fprint(2, "gunzip: removing output file %s\n", delfile); remove(delfile); diff --git a/src/cmd/gzip/zip.c b/src/cmd/gzip/zip.c index 5480ba84..d25fa369 100644 --- a/src/cmd/gzip/zip.c +++ b/src/cmd/gzip/zip.c @@ -136,7 +136,7 @@ zip(Biobuf *bout, char *file, int stdout) zh->madevers = (2 * 10) + 0; zh->extos = ZDos; zh->extvers = (2 * 10) + 0; - + t = localtime(dir->mtime); zh->modtime = (t->hour<<11) | (t->min<<5) | (t->sec>>1); zh->moddate = ((t->year-80)<<9) | ((t->mon+1)<<5) | t->mday; diff --git a/src/cmd/hget.c b/src/cmd/hget.c index c30bb0b3..f99b9647 100644 --- a/src/cmd/hget.c +++ b/src/cmd/hget.c @@ -146,7 +146,7 @@ threadmain(int argc, char **argv) else p = seprint(p, e, "%s", t); u.postbody = postbody; - + break; default: usage(); @@ -162,7 +162,7 @@ threadmain(int argc, char **argv) if(argc != 1) usage(); - + out.fd = 1; out.written = 0; out.offset = 0; @@ -278,7 +278,7 @@ crackurl(URL *u, char *s) if(p = strchr(u->host, ':')) { *p++ = 0; u->port = p; - } else + } else u->port = method[u->method].name; if(*(u->host) == 0){ @@ -429,7 +429,7 @@ dohttp(URL *u, URL *px, Range *r, Out *out, long mtime) cfd = -1; } } - + dfprint(fd, "\r\n", u->host); auth = 0; @@ -498,7 +498,7 @@ dohttp(URL *u, URL *px, Range *r, Out *out, long mtime) case 503: /* Service unavailable */ sysfatal("Service unavailable"); - + default: sysfatal("Unknown response code %d", code); } @@ -681,7 +681,7 @@ void hhetag(char *p, URL *u, Range *r) { USED(r); - + if(u->etag != nil){ if(strcmp(u->etag, p) != 0) sysfatal("file changed underfoot"); @@ -700,7 +700,7 @@ hhmtime(char *p, URL *u, Range *r) int i; USED(r); - + i = getfields(p, fields, 6, 1, " \t"); if(i < 5) return; @@ -764,7 +764,7 @@ void hhclen(char *p, URL *u, Range *r) { USED(u); - + r->end = atoi(p); } @@ -791,7 +791,7 @@ void hhuri(char *p, URL *u, Range *r) { USED(r); - + if(*p != '<') return; u->redirect = strdup(p+1); @@ -804,7 +804,7 @@ void hhlocation(char *p, URL *u, Range *r) { USED(r); - + u->redirect = strdup(p); } @@ -814,7 +814,7 @@ hhauth(char *p, URL *u, Range *r) char *f[4]; UserPasswd *up; char *s, cred[64]; - + USED(r); if (cistrncmp(p, "basic ", 6) != 0) @@ -898,7 +898,7 @@ doftp(URL *u, URL *px, Range *r, Out *out, long mtime) close(ctl); return Eof; } - + /* first try passive mode, then active */ data = passive(ctl, u); if(data < 0){ @@ -1215,7 +1215,7 @@ active(int ctl, URL *u) } close(afd); close(lcfd); - + return dfd; } @@ -1420,7 +1420,7 @@ DigestState* md5dup(DigestState *state) { DigestState *s2; - + s2 = malloc(sizeof(DigestState)); if(s2 == nil) sysfatal("malloc: %r"); @@ -1486,4 +1486,3 @@ output(Out *out, char *buf, int nb) } return n + d; } - diff --git a/src/cmd/hist.c b/src/cmd/hist.c index 46fd3f8a..f6b81ed8 100644 --- a/src/cmd/hist.c +++ b/src/cmd/hist.c @@ -23,7 +23,7 @@ int main(int argc, char *argv[]) { int i; - + sys = sysname(); if(strncmp(sys, "amsterdam", 9) == 0) /* BUG */ sys = "am"; diff --git a/src/cmd/hoc/code.c b/src/cmd/hoc/code.c index e2d4c5ea..af60c194 100644 --- a/src/cmd/hoc/code.c +++ b/src/cmd/hoc/code.c @@ -125,7 +125,7 @@ forcode(void) } void -ifcode(void) +ifcode(void) { Datum d; Inst *savepc = pc; /* then part */ @@ -133,7 +133,7 @@ ifcode(void) execute(savepc+3); /* condition */ d = pop(); if (d.val) - execute(*((Inst **)(savepc))); + execute(*((Inst **)(savepc))); else if (*((Inst **)(savepc+1))) /* else part? */ execute(*((Inst **)(savepc+1))); if (!returning) @@ -255,7 +255,7 @@ procret(void) /* return from a procedure */ } void -bltin(void) +bltin(void) { Datum d; @@ -611,7 +611,7 @@ prexpr(void) /* print numeric value */ } void -prstr(void) /* print string value */ +prstr(void) /* print string value */ { print("%s", (char *) *pc++); } diff --git a/src/cmd/hoc/symbol.c b/src/cmd/hoc/symbol.c index 0a777b0d..d0e01ab1 100644 --- a/src/cmd/hoc/symbol.c +++ b/src/cmd/hoc/symbol.c @@ -13,7 +13,7 @@ lookup(char* s) /* find s in symbol table */ for (sp = symlist; sp != (Symbol *) 0; sp = sp->next) if (strcmp(sp->name, s) == 0) return sp; - return 0; /* 0 ==> not found */ + return 0; /* 0 ==> not found */ } Symbol* diff --git a/src/cmd/htmlroff/a.h b/src/cmd/htmlroff/a.h index 173fdc96..a4209178 100644 --- a/src/cmd/htmlroff/a.h +++ b/src/cmd/htmlroff/a.h @@ -23,13 +23,13 @@ enum UPI = 720, /* units per inch */ UPX = 10, /* units per pixel */ - + /* special input modes */ CopyMode = 1<<1, ExpandMode = 1<<2, ArgMode = 1<<3, HtmlMode = 1<<4, - + MaxLine = 1024 }; diff --git a/src/cmd/htmlroff/char.c b/src/cmd/htmlroff/char.c index 151c9339..9e213e13 100644 --- a/src/cmd/htmlroff/char.c +++ b/src/cmd/htmlroff/char.c @@ -12,7 +12,7 @@ rune2html(Rune r) static Rune **tcscache[256]; int p[2]; char *q; - + if(r == '\n') return L("\n"); @@ -79,7 +79,7 @@ troff2rune(Rune *rs) char *file, *f[10], *p, s[3]; int i, nf; Biobuf *b; - + if(rs[0] >= Runeself || rs[1] >= Runeself) return Runeerror; s[0] = rs[0]; @@ -103,14 +103,13 @@ troff2rune(Rune *rs) } } Bterm(b); - + if(ntrtab >= nelem(trtab)) fprint(2, "%s: trtab too small\n", argv0); } - + for(i=0; i<ntrtab; i++) if(strcmp(s, trtab[i].t) == 0) return trtab[i].r; return Runeerror; } - diff --git a/src/cmd/htmlroff/html.c b/src/cmd/htmlroff/html.c index 81095995..98b123f8 100644 --- a/src/cmd/htmlroff/html.c +++ b/src/cmd/htmlroff/html.c @@ -22,7 +22,7 @@ closingtag(Rune *s) { Rune *t; Rune *p0, *p; - + t = runemalloc(sizeof(Rune)); if(s == nil) return t; @@ -44,7 +44,7 @@ closingtag(Rune *s) runemove(t+2, p0, p-p0); t[2+(p-p0)] = Ugt; } - + if(*p == Ugt && p>s && *(p-1) == '/'){ close: for(p0=t+1; *p0 && *p0 != Ult; p0++) @@ -52,7 +52,7 @@ closingtag(Rune *s) runemove(t, p0, runestrlen(p0)+1); } } - return t; + return t; } void @@ -108,7 +108,7 @@ void closehtml(void) { Tag *t, *next; - + br(); hideihtml(); for(t=tagstack; t; t=next){ @@ -230,7 +230,7 @@ void r_html(Rune *name) { Rune *id, *line, *p; - + id = copyarg(); line = readline(HtmlMode); for(p=line; *p; p++){ @@ -281,7 +281,6 @@ htmlinit(void) addesc('`', e_btick, CopyMode); addesc('-', e_minus, CopyMode); addesc('@', e_at, CopyMode); - + ds(L("font"), L(defaultfont)); } - diff --git a/src/cmd/htmlroff/input.c b/src/cmd/htmlroff/input.c index 99e0d56e..a4c4bc3a 100644 --- a/src/cmd/htmlroff/input.c +++ b/src/cmd/htmlroff/input.c @@ -65,7 +65,7 @@ _inputfile(Rune *s, void (*push)(Istack*)) Istack *is; Biobuf *b; char *t; - + t = esmprint("%S", s); if((b = Bopen(t, OREAD)) == nil){ free(t); @@ -95,7 +95,7 @@ queueinputfile(Rune *s) int _inputstdin(void (*push)(Istack*)) -{ +{ Biobuf *b; Istack *is; @@ -128,7 +128,7 @@ void _inputstring(Rune *s, void (*push)(Istack*)) { Istack *is; - + is = emalloc(sizeof *is); is->s = erunestrdup(s); is->p = is->s; @@ -176,7 +176,7 @@ getrune(void) { Rune r; int c; - + top: if(istack == nil) return -1; @@ -199,7 +199,7 @@ top: sysfatal("getrune - can't happen"); } if(r == '\n') - istack->lineno++; + istack->lineno++; return r; } @@ -215,7 +215,7 @@ int linefmt(Fmt *f) { Istack *is; - + for(is=istack; is && !is->b; is=is->next) ; if(is) @@ -228,7 +228,7 @@ void setlinenumber(Rune *s, int n) { Istack *is; - + for(is=istack; is && !is->name; is=is->next) ; if(is){ diff --git a/src/cmd/htmlroff/main.c b/src/cmd/htmlroff/main.c index b6af1e7b..bd77a225 100644 --- a/src/cmd/htmlroff/main.c +++ b/src/cmd/htmlroff/main.c @@ -23,11 +23,11 @@ main(int argc, char **argv) char *p; Rune *r; Rune buf[2]; - + Binit(&bout, 1, OWRITE); fmtinstall('L', linefmt); quotefmtinstall(); - + tmacdir = unsharp("#9/tmac"); dostdin = 0; ARGBEGIN{ @@ -63,10 +63,9 @@ main(int argc, char **argv) } if(argc == 0 || dostdin) queuestdin(); - + run(); Bprint(&bout, "\n"); Bterm(&bout); exits(nil); } - diff --git a/src/cmd/htmlroff/roff.c b/src/cmd/htmlroff/roff.c index bdc51a3e..34b794be 100644 --- a/src/cmd/htmlroff/roff.c +++ b/src/cmd/htmlroff/roff.c @@ -59,7 +59,7 @@ void addraw(Rune *name, void (*f)(Rune*)) { Raw *r; - + if(nraw >= nelem(raw)){ fprint(2, "too many raw requets\n"); return; @@ -73,7 +73,7 @@ void delraw(Rune *name) { int i; - + for(i=0; i<nraw; i++){ if(runestrcmp(raw[i].name, name) == 0){ if(i != --nraw){ @@ -89,7 +89,7 @@ void renraw(Rune *from, Rune *to) { int i; - + delraw(to); for(i=0; i<nraw; i++) if(runestrcmp(raw[i].name, from) == 0){ @@ -135,7 +135,7 @@ void renreq(Rune *from, Rune *to) { int i; - + delreq(to); for(i=0; i<nreq; i++) if(runestrcmp(req[i].name, from) == 0){ @@ -149,7 +149,7 @@ void addesc(Rune r, int (*f)(void), int mode) { Esc *e; - + if(nesc >= nelem(esc)){ fprint(2, "too many escapes\n"); return; @@ -256,7 +256,7 @@ copyarg(void) static Rune buf[MaxLine]; int c; Rune *r; - + if(_readx(buf, sizeof buf, ArgMode, 0) < 0) return nil; r = runestrstr(buf, L("\\\"")); @@ -266,7 +266,7 @@ copyarg(void) ; ungetrune('\n'); } - r = erunestrdup(buf); + r = erunestrdup(buf); return r; } @@ -322,7 +322,7 @@ parseargs(Rune *p, Rune **argv) *w++ = *p; } *w = 0; - } + } }else{ /* unquoted argument - need to watch out for \" comment */ for(; *p; p++){ @@ -369,7 +369,7 @@ dotline(int dot) raw[i].f(raw[i].name); free(a); return; - } + } } /* @@ -515,7 +515,7 @@ void runinput(void) { int c; - + bol = 1; for(;;){ c = getnext(); @@ -573,7 +573,7 @@ run(void) t20init(); htmlinit(); hideihtml(); - + addreq(L("margin"), r_margin, 1); nr(L(".margin"), 1); nr(L(".paragraph"), 1); @@ -603,7 +603,7 @@ void inroman(Rune r) { int f; - + f = getnr(L(".f")); nr(L(".f"), 1); runmacro1(L("font")); @@ -631,7 +631,7 @@ void outhtml(Rune *s) { Rune r; - + for(; *s; s++){ switch(r = *s){ case '<': diff --git a/src/cmd/htmlroff/t1.c b/src/cmd/htmlroff/t1.c index 8236694d..c68ada77 100644 --- a/src/cmd/htmlroff/t1.c +++ b/src/cmd/htmlroff/t1.c @@ -1,5 +1,5 @@ #include "a.h" - + /* * Section 1 - General Explanation. */ @@ -10,7 +10,7 @@ int scale2units(char c) { int x; - + switch(c){ case 'i': /* inch */ return UPI; @@ -49,7 +49,7 @@ long runestrtol(Rune *a, Rune **p) { long n; - + n = 0; while('0' <= *a && *a <= '9'){ n = n*10 + *a-'0'; @@ -111,7 +111,7 @@ eval0(Rune **pline, int scale, int recur) *pline = p; return x; } - + while(*p){ switch(*p++) { case '+': @@ -176,11 +176,10 @@ void t1init(void) { Tm tm; - + tm = *localtime(time(0)); nr(L("dw"), tm.wday+1); nr(L("dy"), tm.mday); nr(L("mo"), tm.mon); nr(L("yr"), tm.year%100); } - diff --git a/src/cmd/htmlroff/t10.c b/src/cmd/htmlroff/t10.c index 4aa74532..64d63f41 100644 --- a/src/cmd/htmlroff/t10.c +++ b/src/cmd/htmlroff/t10.c @@ -58,7 +58,7 @@ int e_bang(void) { Rune *line; - + line = readline(CopyMode); out(line); outrune('\n'); @@ -70,7 +70,7 @@ int e_X(void) { int c, c1; - + c1 = getrune(); if(c1 < 0 || c1 == '\n') { c = c1; @@ -119,7 +119,7 @@ void r_comment(Rune *name) { int c; - + USED(name); while((c = getrune()) >= 0 && c != '\n') ; @@ -136,11 +136,10 @@ t10init(void) addreq(L("tr"), r_warn, -1); addreq(L("ul"), r_nop, -1); addraw(L("\\\""), r_comment); - + addesc('!', e_bang, 0); addesc('X', e_X, 0); addesc('\"', e_quote, CopyMode|ArgMode); addesc('\n', e_newline, CopyMode|ArgMode|HtmlMode); addesc('e', e_e, 0); } - diff --git a/src/cmd/htmlroff/t11.c b/src/cmd/htmlroff/t11.c index dd1dd75b..2e273ac4 100644 --- a/src/cmd/htmlroff/t11.c +++ b/src/cmd/htmlroff/t11.c @@ -109,4 +109,3 @@ t11init(void) addesc('r', e_r, 0); addesc('k', e_k, 0); } - diff --git a/src/cmd/htmlroff/t13.c b/src/cmd/htmlroff/t13.c index 0fadab3a..b2922f6a 100644 --- a/src/cmd/htmlroff/t13.c +++ b/src/cmd/htmlroff/t13.c @@ -11,7 +11,6 @@ t13init(void) addreq(L("hy"), r_nop, -1); addreq(L("hc"), r_nop, -1); addreq(L("hw"), r_nop, -1); - + addesc('%', e_nop, 0); } - diff --git a/src/cmd/htmlroff/t14.c b/src/cmd/htmlroff/t14.c index 1dab3516..4242dd70 100644 --- a/src/cmd/htmlroff/t14.c +++ b/src/cmd/htmlroff/t14.c @@ -7,7 +7,7 @@ void r_lt(int argc, Rune **argv) { Rune *p; - + if(argc < 2) nr(L(".lt"), evalscale(L("6.5i"), 'm')); else{ @@ -30,4 +30,3 @@ t14init(void) addreq(L("pc"), r_nop, -1); /* page number char */ addreq(L("lt"), r_lt, -1); } - diff --git a/src/cmd/htmlroff/t15.c b/src/cmd/htmlroff/t15.c index fbfd5128..221f642e 100644 --- a/src/cmd/htmlroff/t15.c +++ b/src/cmd/htmlroff/t15.c @@ -10,4 +10,3 @@ t15init(void) addreq(L("nm"), r_warn, -1); addreq(L("nn"), r_warn, -1); } - diff --git a/src/cmd/htmlroff/t16.c b/src/cmd/htmlroff/t16.c index 3a9c427e..9389a59a 100644 --- a/src/cmd/htmlroff/t16.c +++ b/src/cmd/htmlroff/t16.c @@ -24,7 +24,7 @@ void startbody(void) { int c; - + while((c = getrune()) == ' ' || c == '\t') ; ungetrune(c); @@ -52,7 +52,7 @@ ifeval(void) int c, cc, neg, nc; Rune line[MaxLine], *p, *e, *q; Rune *a; - + while((c = getnext()) == ' ' || c == '\t') ; neg = 0; @@ -68,7 +68,7 @@ ifeval(void) free(a); return c; } - + switch(c){ case ' ': case '\n': @@ -111,12 +111,12 @@ ifeval(void) return (q-line == p-(q+1) && memcmp(line, q+1, (q-line)*sizeof(Rune))==0) ^ neg; } - + void r_if(Rune *name) { int n; - + n = ifeval(); if(runestrcmp(name, L("ie")) == 0){ if(niftrue >= nelem(iftrue)) @@ -133,7 +133,7 @@ void r_el(Rune *name) { USED(name); - + if(niftrue <= 0){ warn("%Cel underflow", dot); return; @@ -150,7 +150,7 @@ t16init(void) addraw(L("if"), r_if); addraw(L("ie"), r_if); addraw(L("el"), r_el); - + addesc('{', e_nop, HtmlMode|ArgMode); addesc('}', e_nop, HtmlMode|ArgMode); } diff --git a/src/cmd/htmlroff/t17.c b/src/cmd/htmlroff/t17.c index bbd095d5..74096c5c 100644 --- a/src/cmd/htmlroff/t17.c +++ b/src/cmd/htmlroff/t17.c @@ -97,7 +97,7 @@ r_ev(int argc, Rune **argv) { int i; Env *e; - + if(argc == 1){ if(nevstack <= 0){ if(verbose) warn(".ev stack underflow"); @@ -123,7 +123,7 @@ void t17init(void) { int i; - + for(i=0; i<nelem(env); i++) env[i] = defenv; diff --git a/src/cmd/htmlroff/t18.c b/src/cmd/htmlroff/t18.c index f5c74a1f..51f08219 100644 --- a/src/cmd/htmlroff/t18.c +++ b/src/cmd/htmlroff/t18.c @@ -11,7 +11,7 @@ r_rd(int argc, Rune **argv) Fmt fmt; static int didstdin; static Biobuf bstdin; - + /* * print prompt, then read until double newline, * then run the text just read as though it were @@ -23,7 +23,7 @@ r_rd(int argc, Rune **argv) else fprint(2, "%c", 7/*BEL*/); } - + if(!didstdin){ Binit(&bstdin, 0, OREAD); didstdin = 1; @@ -54,7 +54,7 @@ r_ex(int argc, Rune **argv) { USED(argc); USED(argv); - + while(popinput()) ; } diff --git a/src/cmd/htmlroff/t19.c b/src/cmd/htmlroff/t19.c index a4cc18f4..bd633834 100644 --- a/src/cmd/htmlroff/t19.c +++ b/src/cmd/htmlroff/t19.c @@ -17,7 +17,7 @@ void r_nx(int argc, Rune **argv) { int n; - + if(argc == 1){ while(popinput()) ; @@ -74,7 +74,7 @@ r_inputpipe(Rune *name) Rune *cmd, *stop, *line; int n, pid, p[2], len; Waitmsg *w; - + USED(name); if(pipe(p) < 0){ warn("pipe: %r"); @@ -104,7 +104,7 @@ r_inputpipe(Rune *name) fprint(p[1], ".ll 8i\n"); fprint(p[1], ".pl 30i\n"); while((line = readline(~0)) != nil){ - if(runestrncmp(line, stop, len) == 0 + if(runestrncmp(line, stop, len) == 0 && (line[len]==' ' || line[len]==0 || line[len]=='\t' || (line[len]=='\\' && line[len+1]=='}'))) break; @@ -125,7 +125,7 @@ r_inputpipe(Rune *name) free(cmd); free(w); } -} +} void t19init(void) @@ -136,7 +136,6 @@ t19init(void) addraw(L("inputpipe"), r_inputpipe); addraw(L("pi"), r_pi); addreq(L("cf"), r_cf, 1); - + nr(L("$$"), getpid()); } - diff --git a/src/cmd/htmlroff/t2.c b/src/cmd/htmlroff/t2.c index daac3ea1..1831660e 100644 --- a/src/cmd/htmlroff/t2.c +++ b/src/cmd/htmlroff/t2.c @@ -3,14 +3,14 @@ /* * Section 2 - Font and character size control. */ - + /* 2.1 - Character set */ /* XXX * * \C'name' - character named name * \N'n' - character number * \(xx - two-letter character - * \- + * \- * \` * \' * ` @@ -24,10 +24,10 @@ getqarg(void) static Rune buf[MaxLine]; int c; Rune *p, *e; - + p = buf; e = p + nelem(buf) - 1; - + if(getrune() != '\'') return nil; while(p < e){ @@ -60,7 +60,7 @@ e_paren(void) { int c, cc; Rune buf[2], r; - + if((c = getrune()) < 0 || c == '\n') goto error; if((cc = getrune()) < 0 || cc == '\n') @@ -71,7 +71,7 @@ e_paren(void) if(r == Runeerror) warn("unknown char %C(%C%C", backslash, c, cc); return r; - + error: warn("malformed %C(xx", backslash); return 0; @@ -92,7 +92,7 @@ ft(Rune *f) { int i; int fn; - + if(f && runestrcmp(f, L("P")) == 0) f = nil; if(f == nil) @@ -131,7 +131,7 @@ fp(int i, Rune *f) } runestrecpy(fonttab[i], fonttab[i]+sizeof fonttab[i], f); } - + int e_f(void) { @@ -177,7 +177,7 @@ void r_ps(int argc, Rune **argv) { Rune *p; - + if(argc == 1 || argv[1][0] == 0) ps(0); else{ @@ -195,7 +195,7 @@ int e_s(void) { int c, cc, ccc, n, twodigit; - + c = getnext(); if(c < 0) return 0; @@ -253,7 +253,7 @@ t2init(void) fp(3, L("B")); fp(4, L("BI")); fp(5, L("CW")); - + nr(L(".s"), 10); nr(L(".s0"), 10); @@ -271,4 +271,3 @@ t2init(void) addesc('N', e_N, 0); /* \- \' \` are handled in html.c */ } - diff --git a/src/cmd/htmlroff/t20.c b/src/cmd/htmlroff/t20.c index 62ea914f..00e31455 100644 --- a/src/cmd/htmlroff/t20.c +++ b/src/cmd/htmlroff/t20.c @@ -13,7 +13,7 @@ void r_pm(int argc, Rune **argv) { int i; - + if(argc == 1){ printds(0); return; @@ -30,9 +30,9 @@ void r_tm(Rune *name) { Rune *line; - + USED(name); - + line = readline(CopyMode); fprint(2, "%S\n", line); free(line); @@ -42,7 +42,7 @@ void r_ab(Rune *name) { USED(name); - + r_tm(L("ab")); exits(".ab"); } @@ -76,4 +76,3 @@ t20init(void) addreq(L("pm"), r_pm, -1); addreq(L("fl"), r_fl, 0); } - diff --git a/src/cmd/htmlroff/t3.c b/src/cmd/htmlroff/t3.c index e54573c1..354ffc2a 100644 --- a/src/cmd/htmlroff/t3.c +++ b/src/cmd/htmlroff/t3.c @@ -37,7 +37,7 @@ t3init(void) nr(L(".o"), eval(L("1i"))); nr(L(".o0"), eval(L("1i"))); nr(L(".p"), eval(L("11i"))); - + addreq(L("pl"), r_warn, -1); addreq(L("bp"), r_nop, -1); addreq(L("pn"), r_warn, -1); @@ -46,4 +46,3 @@ t3init(void) addreq(L("mk"), r_nop, -1); addreq(L("rt"), r_warn, -1); } - diff --git a/src/cmd/htmlroff/t4.c b/src/cmd/htmlroff/t4.c index 157169de..8a301321 100644 --- a/src/cmd/htmlroff/t4.c +++ b/src/cmd/htmlroff/t4.c @@ -1,7 +1,7 @@ #include "a.h" /* - * 4 - Text filling, centering, and adjusting. + * 4 - Text filling, centering, and adjusting. * "\ " - unbreakable space * .n register - length of last line * nl register - text baseline position on this page @@ -66,7 +66,7 @@ void r_ad(int argc, Rune **argv) { int c, n; - + nr(L(".j"), getnr(L(".j"))|1); if(argc < 2) return; @@ -133,10 +133,9 @@ t4init(void) addreq(L("ad"), r_ad, -1); addreq(L("na"), r_na, 0); addreq(L("ce"), r_ce, -1); - + addesc(' ', e_space, 0); addesc('p', e_warn, 0); addesc('&', e_amp, 0); addesc('c', e_c, 0); } - diff --git a/src/cmd/htmlroff/t5.c b/src/cmd/htmlroff/t5.c index cb951951..226da09b 100644 --- a/src/cmd/htmlroff/t5.c +++ b/src/cmd/htmlroff/t5.c @@ -49,7 +49,7 @@ sp(int v) { Rune buf[100]; double fv; - + br(); fv = v * 1.0/UPI; if(fv > 5) @@ -93,7 +93,7 @@ r_rs(int argc, Rune **argv) void t5init(void) -{ +{ addreq(L("vs"), r_vs, -1); addreq(L("ls"), r_ls, -1); addreq(L("sp"), r_sp, -1); @@ -107,4 +107,3 @@ t5init(void) nr(L(".ls"), 1); nr(L(".ls0"), 1); } - diff --git a/src/cmd/htmlroff/t6.c b/src/cmd/htmlroff/t6.c index 130f535f..3090cd26 100644 --- a/src/cmd/htmlroff/t6.c +++ b/src/cmd/htmlroff/t6.c @@ -71,7 +71,6 @@ t6init(void) addreq(L("ll"), r_ll, -1); addreq(L("in"), r_in, -1); addreq(L("ti"), r_ti, 1); - + nr(L(".l"), eval(L("6.5i"))); } - diff --git a/src/cmd/htmlroff/t7.c b/src/cmd/htmlroff/t7.c index 9936a44c..cee43927 100644 --- a/src/cmd/htmlroff/t7.c +++ b/src/cmd/htmlroff/t7.c @@ -36,7 +36,7 @@ runmacro(int dot, int argc, Rune **argv) Rune *p; int i; Mac *m; - + if(verbose && isupperrune(argv[0][0])) fprint(2, "run: %S\n", argv[0]); p = getds(argv[0]); if(p == nil){ @@ -71,7 +71,7 @@ popmacro(void) { int i; Mac *m; - + if(--nmstack < 0){ fprint(2, "%L: macro stack underflow\n"); return; @@ -94,7 +94,7 @@ runmacro1(Rune *name) { Rune *argv[2]; int obol; - + if(verbose) fprint(2, "outcb %p\n", outcb); obol = bol; argv[0] = name; @@ -134,7 +134,7 @@ popmacro1(void) /* * diversions * - * processed output diverted + * processed output diverted * dn dl registers vertical and horizontal size of last diversion * .z - current diversion name */ @@ -195,7 +195,7 @@ void r_ch(int argc, Rune **argv) { int i; - + if(argc == 2){ if(trap0 && runestrcmp(argv[1], trap0) == 0){ free(trap0); @@ -244,7 +244,7 @@ r_de(int argc, Rune **argv) fmtrunestrcpy(&fmt, p); len = runestrlen(end); while((p = readline(CopyMode)) != nil){ - if(runestrncmp(p, end, len) == 0 + if(runestrncmp(p, end, len) == 0 && (p[len]==' ' || p[len]==0 || p[len]=='\t' || (p[len]=='\\' && p[len+1]=='}'))){ free(p); @@ -270,7 +270,7 @@ void r_ds(Rune *cmd) { Rune *name, *line, *p; - + name = copyarg(); line = readline(CopyMode); if(name == nil || line == nil){ @@ -335,7 +335,7 @@ flushdi(void) { int n; Rune *p; - + if(ndi == 0 || difmtinit == 0) return; fmtrune(&difmt, Uunformatted); @@ -448,7 +448,7 @@ void r_em(int argc, Rune **argv) { Rune buf[20]; - + USED(argc); runesnprint(buf, nelem(buf), ".%S\n", argv[1]); as(L("eof"), buf); @@ -458,7 +458,7 @@ int e_star(void) { Rune *p; - + p = getds(getname()); if(p) pushinputstring(p); @@ -514,7 +514,7 @@ e_dollar(void) void t7init(void) -{ +{ addreq(L("de"), r_de, -1); addreq(L("am"), r_de, -1); addreq(L("ig"), r_de, -1); @@ -529,15 +529,14 @@ t7init(void) addreq(L("wh"), r_wh, -1); addreq(L("ch"), r_ch, -1); addreq(L("dt"), r_dt, -1); - + addesc('$', e_dollar, CopyMode|ArgMode|HtmlMode); addesc('*', e_star, CopyMode|ArgMode|HtmlMode); addesc('t', e_t, CopyMode|ArgMode); addesc('a', e_a, CopyMode|ArgMode); addesc('\\', e_backslash, ArgMode|CopyMode); addesc('.', e_dot, CopyMode|ArgMode); - + ds(L("eof"), L(".sp 0.5i\n")); ds(L(".."), L("")); } - diff --git a/src/cmd/htmlroff/t8.c b/src/cmd/htmlroff/t8.c index ead5a020..511737ce 100644 --- a/src/cmd/htmlroff/t8.c +++ b/src/cmd/htmlroff/t8.c @@ -74,7 +74,7 @@ Rune* getdsnr(Rune *name, Reg *list) { Reg *s; - + for(s=list; s; s=s->next) if(runestrcmp(name, s->name) == 0) return s->val; @@ -91,7 +91,7 @@ void as(Rune *name, Rune *val) { Rune *p, *q; - + p = getds(name); if(p == nil) p = L(""); @@ -113,7 +113,7 @@ printds(int t) { int n, total; Reg *s; - + total = 0; for(s=dslist; s; s=s->next){ if(s->val) @@ -131,7 +131,7 @@ void nr(Rune *name, int val) { Rune buf[20]; - + runesnprint(buf, nelem(buf), "%d", val); _nr(name, buf); } @@ -152,7 +152,7 @@ Rune* getaf(Rune *name) { Reg *s; - + for(s=nrlist; s; s=s->next) if(runestrcmp(s->name, name) == 0) return s->fmt; @@ -163,7 +163,7 @@ void printnr(void) { Reg *r; - + for(r=nrlist; r; r=r->next) fprint(2, "%S %S %d\n", r->name, r->val, r->inc); } @@ -225,7 +225,7 @@ void r_af(int argc, Rune **argv) { USED(argc); - + af(argv[1], argv[2]); } @@ -234,7 +234,7 @@ void r_rr(int argc, Rune **argv) { int i; - + for(i=1; i<argc; i++) _nr(argv[i], nil); } @@ -244,7 +244,7 @@ void alpha(Rune *buf, int n, int a) { int i, v; - + i = 1; for(v=n; v>0; v/=26) i++; @@ -284,7 +284,7 @@ roman(Rune *buf, int n, int upper) Rune *p; char *q; struct romanv *r; - + if(upper) upper = 'A' - 'a'; if(n >= 5000 || n <= 0){ @@ -309,7 +309,7 @@ getname(void) { int i, c, cc; static Rune buf[100]; - + /* XXX add [name] syntax as in groff */ c = getnext(); if(c < 0) @@ -359,7 +359,7 @@ e_n(void) int inc, v, l; Rune *name, *fmt, buf[100]; Reg *s; - + inc = getnext(); if(inc < 0) return -1; @@ -442,8 +442,7 @@ t8init(void) addreq(L("af"), r_af, 2); addreq(L("rr"), r_rr, -1); addreq(L("pnr"), r_pnr, 0); - + addesc('n', e_n, CopyMode|ArgMode|HtmlMode); addesc('g', e_g, 0); } - diff --git a/src/cmd/htmlroff/t9.c b/src/cmd/htmlroff/t9.c index c9e04564..6f4c4d6c 100644 --- a/src/cmd/htmlroff/t9.c +++ b/src/cmd/htmlroff/t9.c @@ -3,4 +3,3 @@ */ XXX - diff --git a/src/cmd/htmlroff/util.c b/src/cmd/htmlroff/util.c index 99e99543..15dd4c74 100644 --- a/src/cmd/htmlroff/util.c +++ b/src/cmd/htmlroff/util.c @@ -4,7 +4,7 @@ void* emalloc(uint n) { void *v; - + v = mallocz(n, 1); if(v == nil) sysfatal("out of memory"); @@ -15,7 +15,7 @@ char* estrdup(char *s) { char *t; - + t = strdup(s); if(t == nil) sysfatal("out of memory"); @@ -38,7 +38,7 @@ void* erealloc(void *ov, uint n) { void *v; - + v = realloc(ov, n); if(v == nil) sysfatal("out of memory"); @@ -50,7 +50,7 @@ erunesmprint(char *fmt, ...) { Rune *s; va_list arg; - + va_start(arg, fmt); s = runevsmprint(fmt, arg); va_end(arg); @@ -64,7 +64,7 @@ esmprint(char *fmt, ...) { char *s; va_list arg; - + va_start(arg, fmt); s = vsmprint(fmt, arg); va_end(arg); @@ -77,7 +77,7 @@ void warn(char *fmt, ...) { va_list arg; - + fprint(2, "htmlroff: %L: "); va_start(arg, fmt); vfprint(2, fmt, arg); @@ -120,4 +120,3 @@ L(char *s) hash[h] = l; return l->r; } - diff --git a/src/cmd/import.c b/src/cmd/import.c index 6b7152ba..0be2f5b6 100644 --- a/src/cmd/import.c +++ b/src/cmd/import.c @@ -99,10 +99,10 @@ threadmain(int argc, char *argv[]) fmtinstall('F', fcallfmt); } - + if(rem){ netfd[0] = 0; - netfd[1] = 1; + netfd[1] = 1; write(1, "OK", 2); }else{ if(argc != 1) @@ -115,7 +115,7 @@ threadmain(int argc, char *argv[]) fn = localside; if(rem+export == 1) fn = remoteside; - + if(rem || !dofork) fn(nil); else diff --git a/src/cmd/ip/dhcp.h b/src/cmd/ip/dhcp.h index 0ca5084f..d07a2e8a 100755..100644 --- a/src/cmd/ip/dhcp.h +++ b/src/cmd/ip/dhcp.h @@ -74,7 +74,7 @@ enum OBtcpka= 38, OBtcpkag= 39, OBnisdomain= 40, - OBniserver= 41, + OBniserver= 41, OBntpserver= 42, OBvendorinfo= 43, /* 0x2b */ OBnetbiosns= 44, @@ -127,7 +127,7 @@ enum { Sbound, Srenewing, Srebinding -}; +}; typedef struct Bootp Bootp; struct Bootp diff --git a/src/cmd/ip/dhcpd/dat.h b/src/cmd/ip/dhcpd/dat.h index aa64deeb..c69f9f38 100755..100644 --- a/src/cmd/ip/dhcpd/dat.h +++ b/src/cmd/ip/dhcpd/dat.h @@ -82,4 +82,3 @@ extern char *blog; extern Ipifc *ipifcs; extern long now; extern char *ndbfile; - diff --git a/src/cmd/ip/dhcpd/db.c b/src/cmd/ip/dhcpd/db.c index f4b48552..cf245efe 100755..100644 --- a/src/cmd/ip/dhcpd/db.c +++ b/src/cmd/ip/dhcpd/db.c @@ -405,7 +405,7 @@ commitbinding(Binding *b) } setbinding(b, b->offeredto, now + b->offer); b->lasttouched = now; - + if(writebinding(fd, b) < 0){ close(fd); return -1; @@ -434,7 +434,7 @@ releasebinding(Binding *b, char *id) } b->lease = 0; b->expoffer = 0; - + if(writebinding(fd, b) < 0){ close(fd); return -1; diff --git a/src/cmd/ip/dhcpd/dhcpd.c b/src/cmd/ip/dhcpd/dhcpd.c index e28bf3cb..c5fb06bf 100755..100644 --- a/src/cmd/ip/dhcpd/dhcpd.c +++ b/src/cmd/ip/dhcpd/dhcpd.c @@ -67,7 +67,7 @@ int pptponly; /* only answer request that came from the pptp server */ int mute; int minlease = MinLease; -ulong start; +ulong start; /* option magic */ char plan9opt[4] = { 'p', '9', ' ', ' ' }; @@ -502,7 +502,7 @@ rcvrequest(Req *rp) sendnak(rp, "no offer for you"); return; } - + /* if not for me, retract offer */ if(!forme(rp->server)){ b->expoffer = 0; @@ -1040,7 +1040,7 @@ parseoptions(Req *rp) p += n; if(p > rp->e) return; - + switch(code){ case ODipaddr: /* requested ip address */ if(n == IPv4addrlen) @@ -1506,7 +1506,7 @@ arpenter(uchar *ip, uchar *ether) { int pid; char xip[100], xether[100]; - + switch(pid=fork()){ case -1: break; diff --git a/src/cmd/ip/dhcpd/dhcpleases.c b/src/cmd/ip/dhcpd/dhcpleases.c index 71719649..a99b9218 100755..100644 --- a/src/cmd/ip/dhcpd/dhcpleases.c +++ b/src/cmd/ip/dhcpd/dhcpleases.c @@ -39,5 +39,5 @@ main(void) continue; if(b.lease > now) print("%I leased by %s until %s", b.ip, b.boundto, ctime(b.lease)); - } + } } diff --git a/src/cmd/ip/dhcpd/ndb.c b/src/cmd/ip/dhcpd/ndb.c index 53ffb58f..97b2284f 100755..100644 --- a/src/cmd/ip/dhcpd/ndb.c +++ b/src/cmd/ip/dhcpd/ndb.c @@ -108,7 +108,7 @@ lookupip(uchar *ipaddr, Info *iip, int gate) t = ndbipinfo(db, "ip", ip, attrs, p - attrs); if(t == nil) return -1; - + for(nt = t; nt != nil; nt = nt->entry){ if(strcmp(nt->attr, "ip") == 0) setipaddr(iip->ipaddr, nt->val); diff --git a/src/cmd/ip/dhcpd/ping.c b/src/cmd/ip/dhcpd/ping.c index 666bcc41..666bcc41 100755..100644 --- a/src/cmd/ip/dhcpd/ping.c +++ b/src/cmd/ip/dhcpd/ping.c diff --git a/src/cmd/ip/dhcpd/testlook.c b/src/cmd/ip/dhcpd/testlook.c index 4937e55b..ac3f44f8 100755..100644 --- a/src/cmd/ip/dhcpd/testlook.c +++ b/src/cmd/ip/dhcpd/testlook.c @@ -188,7 +188,7 @@ ipinfo(Ndb *db, char *etherin, char *ipin, char *name, Ipinfo *iip) recursesubnet(db, classmask[CLASS(iip->ipaddr)], iip, fsname, gwname, auname); /* lookup fs's and gw's ip addresses */ - + if(fsname[0]) lookupip(db, fsname, iip->fsip, iip); if(gwname[0]) diff --git a/src/cmd/ip/dhcpd/testlookup.c b/src/cmd/ip/dhcpd/testlookup.c index c69624c5..c69624c5 100755..100644 --- a/src/cmd/ip/dhcpd/testlookup.c +++ b/src/cmd/ip/dhcpd/testlookup.c diff --git a/src/cmd/ip/dhcpd/testping.c b/src/cmd/ip/dhcpd/testping.c index b5ca90c5..b5ca90c5 100755..100644 --- a/src/cmd/ip/dhcpd/testping.c +++ b/src/cmd/ip/dhcpd/testping.c diff --git a/src/cmd/ip/snoopy/arp.c b/src/cmd/ip/snoopy/arp.c index d317c1bb..7b7fa318 100755..100644 --- a/src/cmd/ip/snoopy/arp.c +++ b/src/cmd/ip/snoopy/arp.c @@ -34,7 +34,7 @@ enum Opa }; -static Field p_fields[] = +static Field p_fields[] = { {"spa", Fv4ip, Ospa, "protocol source", } , {"tpa", Fv4ip, Otpa, "protocol target", } , diff --git a/src/cmd/ip/snoopy/bootp.c b/src/cmd/ip/snoopy/bootp.c index e7ead863..18350081 100755..100644 --- a/src/cmd/ip/snoopy/bootp.c +++ b/src/cmd/ip/snoopy/bootp.c @@ -55,7 +55,7 @@ enum Ot }; -static Field p_fields[] = +static Field p_fields[] = { {"ca", Fv4ip, Oca, "client IP addr", } , {"sa", Fv4ip, Osa, "server IP addr", } , diff --git a/src/cmd/ip/snoopy/dat.h b/src/cmd/ip/snoopy/dat.h index ba3e446d..0ac054c7 100755..100644 --- a/src/cmd/ip/snoopy/dat.h +++ b/src/cmd/ip/snoopy/dat.h @@ -60,7 +60,7 @@ struct Msg char *e; /* buffer end */ int needroot; /* pr is root, need to see in expression */ - Proto *pr; /* current/next protocol */ + Proto *pr; /* current/next protocol */ }; enum diff --git a/src/cmd/ip/snoopy/dhcp.c b/src/cmd/ip/snoopy/dhcp.c index cd976ec0..bab0cf82 100755..100644 --- a/src/cmd/ip/snoopy/dhcp.c +++ b/src/cmd/ip/snoopy/dhcp.c @@ -61,7 +61,7 @@ enum OBtcpka= 38, OBtcpkag= 39, OBnisdomain= 40, - OBniserver= 41, + OBniserver= 41, OBntpserver= 42, OBvendorinfo= 43, /* 0x2b */ OBnetbiosns= 44, @@ -232,7 +232,7 @@ p_seprint(Msg *m) ps += n; if(ps > m->pe) break; - + switch(code){ case ODipaddr: /* requested ip address */ p = pserver(p, e, "ipaddr", o, n); @@ -473,4 +473,3 @@ Proto dhcp = nil, defaultframer }; - diff --git a/src/cmd/ip/snoopy/dns.c b/src/cmd/ip/snoopy/dns.c index 144a4949..c115df17 100644 --- a/src/cmd/ip/snoopy/dns.c +++ b/src/cmd/ip/snoopy/dns.c @@ -32,7 +32,7 @@ enum /* query types (all RR types are also queries) */ Tixfr= 251, /* incremental zone transfer */ Taxfr= 252, /* zone transfer */ - Tmailb= 253, /* { Tmb, Tmg, Tmr } */ + Tmailb= 253, /* { Tmb, Tmg, Tmr } */ Tall= 255, /* all records */ /* classes */ @@ -87,7 +87,7 @@ getstr(uchar **pp, int *len, uchar *ep) { uchar *p; int n; - + p = *pp; n = *p++; if(p+n > ep) @@ -215,7 +215,7 @@ cname(int class) if(class == Cin) return ""; - + snprint(buf, sizeof buf, "class=%d", class); return buf; } @@ -236,7 +236,7 @@ p_seprint(Msg *m) char *sym1, *sym2, *sep; int type; static int first = 1; - + if(first){ first = 0; quotefmtinstall(); @@ -388,7 +388,7 @@ p_seprint(Msg *m) NetS(p), p[3], p[4], rlen-4, p+4); p += rlen; break; - + case Tsig: if(rlen < 18) goto error; @@ -408,7 +408,7 @@ p_seprint(Msg *m) } if(p != ep) goto error; - } + } return 0; error: diff --git a/src/cmd/ip/snoopy/dump.c b/src/cmd/ip/snoopy/dump.c index ec2a3ce7..3d9451da 100755..100644 --- a/src/cmd/ip/snoopy/dump.c +++ b/src/cmd/ip/snoopy/dump.c @@ -55,7 +55,7 @@ p_seprint(Msg *m) for(i = 0; i < n && p+1<e; i++){ c = ps[i]; *p++ = tohex[c>>4]; - *p++ = tohex[c&0xf]; + *p++ = tohex[c&0xf]; } } diff --git a/src/cmd/ip/snoopy/ether.c b/src/cmd/ip/snoopy/ether.c index 9e16579a..2b33106e 100755..100644 --- a/src/cmd/ip/snoopy/ether.c +++ b/src/cmd/ip/snoopy/ether.c @@ -35,7 +35,7 @@ enum Ot, /* type */ }; -static Field p_fields[] = +static Field p_fields[] = { {"s", Fether, Os, "source address", } , {"d", Fether, Od, "destination address", } , diff --git a/src/cmd/ip/snoopy/gre.c b/src/cmd/ip/snoopy/gre.c index 6808293b..2e744940 100755..100644 --- a/src/cmd/ip/snoopy/gre.c +++ b/src/cmd/ip/snoopy/gre.c @@ -36,7 +36,7 @@ sprintgre(void *a, char *buf, int len) uchar *p = a; chksum = offset = key = seq = ack = 0; - + flag = NetS(p); prot = NetS(p+2); p += 4; len -= 4; @@ -78,6 +78,6 @@ sprintgre(void *a, char *buf, int len) n += sprintppp(p, buf+n, len); else n += sprintx(p, buf+n, len); - + return n; } diff --git a/src/cmd/ip/snoopy/hdlc.c b/src/cmd/ip/snoopy/hdlc.c index e7bf3739..e7bf3739 100755..100644 --- a/src/cmd/ip/snoopy/hdlc.c +++ b/src/cmd/ip/snoopy/hdlc.c diff --git a/src/cmd/ip/snoopy/icmp.c b/src/cmd/ip/snoopy/icmp.c index 8e528dc9..f798e42a 100755..100644 --- a/src/cmd/ip/snoopy/icmp.c +++ b/src/cmd/ip/snoopy/icmp.c @@ -23,7 +23,7 @@ enum Op, /* next protocol */ }; -static Field p_fields[] = +static Field p_fields[] = { {"t", Fnum, Ot, "type", } , {0} diff --git a/src/cmd/ip/snoopy/icmp6.c b/src/cmd/ip/snoopy/icmp6.c index 9ba74939..9ede92a5 100755..100644 --- a/src/cmd/ip/snoopy/icmp6.c +++ b/src/cmd/ip/snoopy/icmp6.c @@ -22,14 +22,14 @@ enum Ot, /* type */ Op, /* next protocol */}; -static Field p_fields[] = +static Field p_fields[] = { {"t", Fnum, Ot, "type", } , {0} }; enum -{ +{ /* ICMPv6 types */ EchoReply = 0, UnreachableV6 = 1, @@ -114,7 +114,7 @@ static char *parpcode[] = [2] "unrecognized IPv6 option encountered", [3] "icmp par prob: unknown code" }; -enum +enum { sll = 1, tll = 2, @@ -123,7 +123,7 @@ enum mtu = 5 }; -static char *icmp6opts[256] = +static char *icmp6opts[256] = { [0] "unknown opt", [1] "sll_addr", @@ -206,7 +206,7 @@ opt_seprint(Msg *m) case sll: case tll: - if ((pktsz < osz) || (osz != 8)) { + if ((pktsz < osz) || (osz != 8)) { p = seprint(p, e, "\n option=%s bad size=%d", opt, osz); m->pr = &dump; return p; @@ -217,7 +217,7 @@ opt_seprint(Msg *m) break; case pref: - if ((pktsz < osz) || (osz != 32)) { + if ((pktsz < osz) || (osz != 32)) { p = seprint(p, e, "\n option=%s: bad size=%d", opt, osz); m->pr = &dump; return p; @@ -235,11 +235,11 @@ opt_seprint(Msg *m) NetL(a+12)!=0); pktsz -= osz; - a += osz; + a += osz; break; case redir: - if (pktsz < osz) { + if (pktsz < osz) { p = seprint(p, e, "\n option=%s: bad size=%d", opt, osz); m->pr = &dump; return p; @@ -248,11 +248,11 @@ opt_seprint(Msg *m) p = seprint(p, e, "\n option=%s len %d", opt, osz); a += osz; m->ps = a; - return p; + return p; break; case mtu: - if ((pktsz < osz) || (osz != 8)) { + if ((pktsz < osz) || (osz != 8)) { p = seprint(p, e, "\n option=%s: bad size=%d", opt, osz); m->pr = &dump; return p; diff --git a/src/cmd/ip/snoopy/il.c b/src/cmd/ip/snoopy/il.c index a4ff60eb..35c43a24 100755..100644 --- a/src/cmd/ip/snoopy/il.c +++ b/src/cmd/ip/snoopy/il.c @@ -29,7 +29,7 @@ enum Osd }; -static Field p_fields[] = +static Field p_fields[] = { {"s", Fnum, Os, "source port", } , {"d", Fnum, Od, "dest port", } , @@ -88,9 +88,9 @@ p_filter(Filter *f, Msg *m) return 0; } -char *pktnames[] = +char *pktnames[] = { - "Sync", + "Sync", "Data", "Dataquery", "Ack", @@ -103,7 +103,7 @@ static char* pkttype(int t) { static char b[10]; - + if(t > 6){ sprint(b, "%d", t); return b; diff --git a/src/cmd/ip/snoopy/ip.c b/src/cmd/ip/snoopy/ip.c index 234ca85f..04589778 100755..100644 --- a/src/cmd/ip/snoopy/ip.c +++ b/src/cmd/ip/snoopy/ip.c @@ -135,7 +135,7 @@ enum Ot, /* type */ }; -static Field p_fields[] = +static Field p_fields[] = { {"s", Fv4ip, Os, "source address", } , {"d", Fv4ip, Od, "destination address", } , diff --git a/src/cmd/ip/snoopy/ip6.c b/src/cmd/ip/snoopy/ip6.c index 7187cda7..ba9be993 100755..100644 --- a/src/cmd/ip/snoopy/ip6.c +++ b/src/cmd/ip/snoopy/ip6.c @@ -132,7 +132,7 @@ enum Ot, /* type */ }; -static Field p_fields[] = +static Field p_fields[] = { {"s", Fv6ip, Os, "source address", } , {"d", Fv6ip, Od, "destination address", } , @@ -167,7 +167,7 @@ v6hdrlen(Hdr *h) int pktlen = IP6HDR + NetS(h->length); uchar nexthdr = h->proto; uchar *pkt = (uchar*) h; - + pkt += len; plen = len; @@ -176,7 +176,7 @@ v6hdrlen(Hdr *h) if (nexthdr == FRAG_HDR) len = FRAG_HSZ; - else + else len = ( ((int) *(pkt+1)) + 1) * 8; if (plen + len > pktlen) @@ -226,7 +226,7 @@ v6hdr_seprint(Msg *m) int pktlen = IP6HDR + NetS(h->length); uchar nexthdr = h->proto; int plen; - + pkt += len; plen = len; diff --git a/src/cmd/ip/snoopy/llc.c b/src/cmd/ip/snoopy/llc.c index bbc21986..09cf022d 100644 --- a/src/cmd/ip/snoopy/llc.c +++ b/src/cmd/ip/snoopy/llc.c @@ -1,4 +1,4 @@ -/* +/* * LLC. Only enough to dispatch to SNAP and IP. */ @@ -17,7 +17,7 @@ enum UPoll = 0x10, IsPoll = 0x100, XidFi = 0x81, - + SapNull = 0, SapGlobal = 0xff, Sap8021BI = 0x02, @@ -40,7 +40,7 @@ static Mux p_mux[] = // Linux gives llc -> snap not llc -> ip. // If we don't tell snoopy about llc -> ip, then the default patterns // like snoopy -h radiotap -f dns work better. -// { "ip", SapIP }, +// { "ip", SapIP }, { "snap", SapSnap }, { 0 } }; @@ -138,7 +138,7 @@ static int p_seprint(Msg *m) { Hdr h; - + memset(&h, 0, sizeof h); if(unpackhdr(m->ps, m->pe, &h) < 0) return -1; @@ -156,7 +156,7 @@ p_seprint(Msg *m) m->pr = &snap; break; } - } + } return 0; } diff --git a/src/cmd/ip/snoopy/main.c b/src/cmd/ip/snoopy/main.c index 9c2dad2e..6902797e 100755..100644 --- a/src/cmd/ip/snoopy/main.c +++ b/src/cmd/ip/snoopy/main.c @@ -290,14 +290,14 @@ struct pcap_file_header { }; /* - * pcap trace header + * pcap trace header */ void pcaphdr(int fd) { if(tiflag){ struct pcap_file_header hdr; - + if(readn(fd, &hdr, sizeof hdr) != sizeof hdr) sysfatal("short header"); if(hdr.magic != TCPDUMP_MAGIC) @@ -309,16 +309,16 @@ pcaphdr(int fd) } if(toflag){ struct pcap_file_header hdr; - + hdr.magic = TCPDUMP_MAGIC; hdr.version_major = PCAP_VERSION_MAJOR; hdr.version_minor = PCAP_VERSION_MINOR; - + hdr.thiszone = 0; hdr.snaplen = 1500; hdr.sigfigs = 0; hdr.linktype = 1; - + write(1, &hdr, sizeof(hdr)); } } @@ -682,7 +682,7 @@ _compile(Filter *f, Proto *last) case '=': if(last == nil) sysfatal("internal error: compilewalk: badly formed tree"); - + if(last->compile == nil) sysfatal("unknown %s field: %s", f->pr->name, f->s); (*last->compile)(f); @@ -840,7 +840,7 @@ cat(void) { char buf[1024]; int n; - + while((n = read(0, buf, sizeof buf)) > 0) write(1, buf, n); } @@ -850,10 +850,10 @@ void startmc(void) { int p[2]; - + if(fd1 == -1) fd1 = dup(1, -1); - + if(pipe(p) < 0) return; switch(fork()){ @@ -892,7 +892,7 @@ printhelp(char *name) Mux *m; Field *f; char fmt[40]; - + if(name == nil){ print("protocols:\n"); startmc(); @@ -901,13 +901,13 @@ printhelp(char *name) stopmc(); return; } - + pr = findproto(name); if(pr == nil){ print("unknown protocol %s\n", name); return; } - + if(pr->field){ print("%s's filter attributes:\n", pr->name); len = 0; diff --git a/src/cmd/ip/snoopy/ninep.c b/src/cmd/ip/snoopy/ninep.c index eb3eab39..eb3eab39 100755..100644 --- a/src/cmd/ip/snoopy/ninep.c +++ b/src/cmd/ip/snoopy/ninep.c diff --git a/src/cmd/ip/snoopy/ospf.c b/src/cmd/ip/snoopy/ospf.c index bb4cd893..d5871dd9 100755..100644 --- a/src/cmd/ip/snoopy/ospf.c +++ b/src/cmd/ip/snoopy/ospf.c @@ -22,7 +22,7 @@ struct Ospfpkt uchar auth[8]; uchar data[1]; }; -#define OSPF_HDRSIZE 24 +#define OSPF_HDRSIZE 24 enum { @@ -62,15 +62,15 @@ ospfauth(Ospfpkt *ospf) case 0: return "no authentication"; case 1: - sprint(auth, "password(%8.8ux %8.8ux)", NetL(ospf->auth), + sprint(auth, "password(%8.8ux %8.8ux)", NetL(ospf->auth), NetL(ospf->auth+4)); break; case 2: - sprint(auth, "crypto(plen %d id %d dlen %d)", NetS(ospf->auth), + sprint(auth, "crypto(plen %d id %d dlen %d)", NetS(ospf->auth), ospf->auth[2], ospf->auth[3]); break; default: - sprint(auth, "auth%d(%8.8ux %8.8ux)", NetS(ospf->autype), NetL(ospf->auth), + sprint(auth, "auth%d(%8.8ux %8.8ux)", NetS(ospf->autype), NetL(ospf->auth), NetL(ospf->auth+4)); } return auth; @@ -156,7 +156,7 @@ struct Ospfrt { uchar typ; uchar numtos; uchar metric[2]; - + }; struct OspfrtLSA { @@ -348,7 +348,7 @@ p_seprint(Msg *m) x -= OSPF_HDRSIZE; p = seprint(p, e, "ver=%d type=%d len=%d r=%V a=%V c=%4.4ux %s ", - ospf->version, ospf->type, x, + ospf->version, ospf->type, x, ospf->router, ospf->area, NetS(ospf->sum), ospfauth(ospf)); diff --git a/src/cmd/ip/snoopy/p80211.c b/src/cmd/ip/snoopy/p80211.c index 92ed8aba..49fe0245 100644 --- a/src/cmd/ip/snoopy/p80211.c +++ b/src/cmd/ip/snoopy/p80211.c @@ -1,4 +1,4 @@ -/* +/* * IEEE 802.11. */ @@ -29,7 +29,7 @@ enum NodataCfAck, NodataCfPoll, NodataCfAckPoll, - + FlagTods = 0x1, FlagFromds = 0x2, FlagMoreflag = 0x4, @@ -38,7 +38,7 @@ enum FlagMoreData = 0x20, FlagWep = 0x40, FlagOrder = 0x80, - + ProtoNone = 0, ProtoLlc, }; @@ -85,7 +85,7 @@ unpackhdr(uchar *p, uchar *ep, Hdr *h) if(h->vers != 0) return 0; - + switch(h->type){ case Tmgmt: // fc dur da sa bssid seq @@ -98,7 +98,7 @@ unpackhdr(uchar *p, uchar *ep, Hdr *h) memmove(h->bssid, p+16, 6); h->seq = LittleS(p+22); break; - + case Tctl: switch(h->subtype){ case CtlPoll: @@ -110,7 +110,7 @@ unpackhdr(uchar *p, uchar *ep, Hdr *h) memmove(h->bssid, p+4, 6); memmove(h->ta, p+10, 6); break; - + case CtlRts: // fc dur ra ta if(p+2+2+6+6 > ep) @@ -120,7 +120,7 @@ unpackhdr(uchar *p, uchar *ep, Hdr *h) memmove(h->ra, p+4, 6); memmove(h->ta, p+10, 6); break; - + case CtlCts: case CtlAck: // fc dur ra @@ -130,7 +130,7 @@ unpackhdr(uchar *p, uchar *ep, Hdr *h) h->dur = LittleS(p+2); memmove(h->ra, p+4, 6); break; - + case CtlCfEnd: case CtlCfEndAck: // fc dur ra bssid @@ -143,7 +143,7 @@ unpackhdr(uchar *p, uchar *ep, Hdr *h) break; } break; - + case Tdata: if(p+24 > ep) return -1; @@ -183,7 +183,7 @@ unpackhdr(uchar *p, uchar *ep, Hdr *h) h->proto = ProtoLlc; break; } - return 0; + return 0; } enum @@ -284,7 +284,7 @@ static int p_seprint(Msg *m) { Hdr h; - + memset(&h, 0, sizeof h); if(unpackhdr(m->ps, m->pe, &h) < 0) return -1; diff --git a/src/cmd/ip/snoopy/ppp.c b/src/cmd/ip/snoopy/ppp.c index 9319cdae..453f711d 100755..100644 --- a/src/cmd/ip/snoopy/ppp.c +++ b/src/cmd/ip/snoopy/ppp.c @@ -192,7 +192,7 @@ p_seprint(Msg *m) proto = *m->ps++; if((proto&1) == 0) proto = (proto<<8) | *m->ps++; - + m->p = seprint(m->p, m->e, "pr=%ud len=%d", proto, len); demux(p_mux, proto, proto, m, &dump); @@ -384,25 +384,25 @@ seprintipcpopt(char *p, char *e, void *a, int len) default: p = seprint(p, e, " (type=%d len=%d)", o->type, o->len); break; - case Oipaddrs: + case Oipaddrs: p = seprint(p, e, " ipaddrs(deprecated)"); break; case Oipcompress: p = seprint(p, e, " ipcompress"); break; - case Oipaddr: + case Oipaddr: p = seprint(p, e, " ipaddr=%V", o->data); break; - case Oipdns: + case Oipdns: p = seprint(p, e, " dnsaddr=%V", o->data); break; - case Oipwins: + case Oipwins: p = seprint(p, e, " winsaddr=%V", o->data); break; - case Oipdns2: + case Oipdns2: p = seprint(p, e, " dns2addr=%V", o->data); break; - case Oipwins2: + case Oipwins2: p = seprint(p, e, " wins2addr=%V", o->data); break; } @@ -430,7 +430,7 @@ p_seprintipcp(Msg *m) m->pe = m->ps+len; else if(m->ps+len > m->pe) return -1; - + p = seprint(p, e, "id=%d code=%d", lcp->id, lcp->code); switch(lcp->code) { default: @@ -467,13 +467,13 @@ seprintccpopt(char *p, char *e, void *a, int len) p = seprint(p, e, " bad opt len %ux", o->type); return p; } - + switch(o->type){ default: p = seprint(p, e, " type=%d ", o->type); break; case 0: - p = seprint(p, e, " OUI=(%d %.2ux%.2ux%.2ux) ", o->type, + p = seprint(p, e, " OUI=(%d %.2ux%.2ux%.2ux) ", o->type, o->data[0], o->data[1], o->data[2]); break; case 17: @@ -507,7 +507,7 @@ p_seprintccp(Msg *m) m->pe = m->ps+len; else if(m->ps+len > m->pe) return -1; - + p = seprint(p, e, "id=%d code=%d", lcp->id, lcp->code); switch(lcp->code) { default: @@ -528,7 +528,7 @@ p_seprintccp(Msg *m) break; } m->p = seprint(p, e, " len=%d", len); - + return 0; } diff --git a/src/cmd/ip/snoopy/ppp_ccp.c b/src/cmd/ip/snoopy/ppp_ccp.c index dab65f8f..dab65f8f 100755..100644 --- a/src/cmd/ip/snoopy/ppp_ccp.c +++ b/src/cmd/ip/snoopy/ppp_ccp.c diff --git a/src/cmd/ip/snoopy/ppp_chap.c b/src/cmd/ip/snoopy/ppp_chap.c index dab65f8f..dab65f8f 100755..100644 --- a/src/cmd/ip/snoopy/ppp_chap.c +++ b/src/cmd/ip/snoopy/ppp_chap.c diff --git a/src/cmd/ip/snoopy/ppp_comp.c b/src/cmd/ip/snoopy/ppp_comp.c index dab65f8f..dab65f8f 100755..100644 --- a/src/cmd/ip/snoopy/ppp_comp.c +++ b/src/cmd/ip/snoopy/ppp_comp.c diff --git a/src/cmd/ip/snoopy/ppp_ipcp.c b/src/cmd/ip/snoopy/ppp_ipcp.c index dab65f8f..dab65f8f 100755..100644 --- a/src/cmd/ip/snoopy/ppp_ipcp.c +++ b/src/cmd/ip/snoopy/ppp_ipcp.c diff --git a/src/cmd/ip/snoopy/ppp_lcp.c b/src/cmd/ip/snoopy/ppp_lcp.c index dab65f8f..dab65f8f 100755..100644 --- a/src/cmd/ip/snoopy/ppp_lcp.c +++ b/src/cmd/ip/snoopy/ppp_lcp.c diff --git a/src/cmd/ip/snoopy/pppoe_disc.c b/src/cmd/ip/snoopy/pppoe_disc.c index 058f059d..ceb84d57 100755..100644 --- a/src/cmd/ip/snoopy/pppoe_disc.c +++ b/src/cmd/ip/snoopy/pppoe_disc.c @@ -30,7 +30,7 @@ enum Osess }; -static Field p_fields[] = +static Field p_fields[] = { {"v", Fnum, Overs, "version", } , {"t", Fnum, Otype, "type", } , @@ -171,4 +171,3 @@ Proto pppoe_sess = p_fields, defaultframer }; - diff --git a/src/cmd/ip/snoopy/pppoe_sess.c b/src/cmd/ip/snoopy/pppoe_sess.c index 0472a907..0472a907 100755..100644 --- a/src/cmd/ip/snoopy/pppoe_sess.c +++ b/src/cmd/ip/snoopy/pppoe_sess.c diff --git a/src/cmd/ip/snoopy/radiotap.c b/src/cmd/ip/snoopy/radiotap.c index 889dc8ab..7fa7cc41 100644 --- a/src/cmd/ip/snoopy/radiotap.c +++ b/src/cmd/ip/snoopy/radiotap.c @@ -93,7 +93,7 @@ static int p_seprint(Msg *m) { Hdr h; - + memset(&h, 0, sizeof h); if(unpackhdr(m->ps, m->pe, &h) < 0) return -1; diff --git a/src/cmd/ip/snoopy/rarp.c b/src/cmd/ip/snoopy/rarp.c index 149c8207..149c8207 100755..100644 --- a/src/cmd/ip/snoopy/rarp.c +++ b/src/cmd/ip/snoopy/rarp.c diff --git a/src/cmd/ip/snoopy/rtcp.c b/src/cmd/ip/snoopy/rtcp.c index 29745d65..e764063d 100755..100644 --- a/src/cmd/ip/snoopy/rtcp.c +++ b/src/cmd/ip/snoopy/rtcp.c @@ -55,7 +55,7 @@ p_seprint(Msg *m) (NetS(h->len) + 1) * 4); for(i = 0; i < rc; i++){ - r = (Report*)m->ps; + r = (Report*)m->ps; m->ps += REPORTLEN; frac = (int)(((float)r->lost[0] * 100.) / 256.); @@ -64,7 +64,7 @@ p_seprint(Msg *m) m->p = seprint(m->p, m->e, "\n\trr(csrc=%8ux frac=%3d%% cumu=%10d seqhi=%10ud jitter=%10d lsr=%8ux dlsr=%f)", NetL(r->ssrc), frac, NetL(r->lost), NetL(r->seqhi), - NetL(r->jitter), NetL(r->lsr), + NetL(r->jitter), NetL(r->lsr), dlsr); } m->pr = nil; diff --git a/src/cmd/ip/snoopy/rtp.c b/src/cmd/ip/snoopy/rtp.c index 1aef15fa..1aef15fa 100755..100644 --- a/src/cmd/ip/snoopy/rtp.c +++ b/src/cmd/ip/snoopy/rtp.c diff --git a/src/cmd/ip/snoopy/snap.c b/src/cmd/ip/snoopy/snap.c index 1854d1d6..78a3be09 100644 --- a/src/cmd/ip/snoopy/snap.c +++ b/src/cmd/ip/snoopy/snap.c @@ -1,4 +1,4 @@ -/* +/* * SNAP. */ @@ -12,7 +12,7 @@ enum { Oorg, Oet, - + OuiEther = 0, OuiCisco = 0xc, OuiCisco90 = 0xf8, diff --git a/src/cmd/ip/snoopy/tcp.c b/src/cmd/ip/snoopy/tcp.c index b8ea7e40..0afbd545 100755..100644 --- a/src/cmd/ip/snoopy/tcp.c +++ b/src/cmd/ip/snoopy/tcp.c @@ -39,7 +39,7 @@ enum Osd }; -static Field p_fields[] = +static Field p_fields[] = { {"s", Fnum, Os, "source port", } , {"d", Fnum, Od, "dest port", } , diff --git a/src/cmd/ip/snoopy/udp.c b/src/cmd/ip/snoopy/udp.c index 3d81f33d..da9510f6 100755..100644 --- a/src/cmd/ip/snoopy/udp.c +++ b/src/cmd/ip/snoopy/udp.c @@ -26,7 +26,7 @@ enum Osetport }; -static Field p_fields[] = +static Field p_fields[] = { {"s", Fnum, Os, "source port", } , {"d", Fnum, Od, "dest port", } , diff --git a/src/cmd/jpg/jpegdump.c b/src/cmd/jpg/jpegdump.c index 6a0a7a00..5ecfc20a 100644 --- a/src/cmd/jpg/jpegdump.c +++ b/src/cmd/jpg/jpegdump.c @@ -134,7 +134,7 @@ void get_sof (int kind) { tab = get1(); printf ("\tcomponent %d: %d hsample, %d vsample, quantization table %d\n", id, sf >> 4, sf & 0xf, tab); - } + } } void get_com (int kind) { @@ -301,10 +301,10 @@ marker: case 0xd8: printf ("SOI\n"); break; - case 0xe0: case 0xe1: case 0xe2: case 0xe3: - case 0xe4: case 0xe5: case 0xe6: case 0xe7: - case 0xe8: case 0xe9: case 0xea: case 0xeb: - case 0xec: case 0xed: case 0xee: case 0xef: + case 0xe0: case 0xe1: case 0xe2: case 0xe3: + case 0xe4: case 0xe5: case 0xe6: case 0xe7: + case 0xe8: case 0xe9: case 0xea: case 0xeb: + case 0xec: case 0xed: case 0xee: case 0xef: get_app(c); break; case 0xda: diff --git a/src/cmd/jpg/jpg.c b/src/cmd/jpg/jpg.c index f74da4c5..7618c605 100644 --- a/src/cmd/jpg/jpg.c +++ b/src/cmd/jpg/jpg.c @@ -225,7 +225,7 @@ vidmerge(Rawimage **aa1, Rawimage **aa2) free(a2->cmap); free(a1); free(a2); - } + } if (aa2[i] != nil) fprint(2, "jpg: vidmerge: unequal lengths\n"); free(aa1); diff --git a/src/cmd/jpg/onechan.c b/src/cmd/jpg/onechan.c index ea1c489b..9baf366c 100644 --- a/src/cmd/jpg/onechan.c +++ b/src/cmd/jpg/onechan.c @@ -63,7 +63,7 @@ load(Image *image, Memimage *memimage) dx = Dx(r); dy = Dy(r); - /* + /* * Read image data into memory * potentially one extra byte on each end of each scan line. */ diff --git a/src/cmd/jpg/readbmp.c b/src/cmd/jpg/readbmp.c index 154cb48d..586f63cd 100644 --- a/src/cmd/jpg/readbmp.c +++ b/src/cmd/jpg/readbmp.c @@ -185,7 +185,7 @@ load_4C(Biobuf *b, long width, long height, Rgb* buf, Rgb* clut) p = &buf[ix + iy * width]; if((1 == (val & 3)) || (2 == (val & 3))) skip = 1; - else + else skip = 0; while(val--) { @@ -273,7 +273,7 @@ load_8C(Biobuf *b, long width, long height, Rgb* buf, Rgb* clut) p = &buf[ix + iy * width]; if(val & 1) skip = 1; - else + else skip = 0; while(val--) { @@ -488,7 +488,7 @@ ReadBMP(Biobuf *b, int *width, int *height) num_coltab = 3; if(num_coltab) { - int i; + int i; Bseek(b, bmih.size + sizeof(Infohdr), 0); for(i = 0; i < num_coltab; i++) { @@ -622,5 +622,3 @@ readbmp(int fd, int colorspace) Bterm(&b); return a; } - - diff --git a/src/cmd/jpg/readgif.c b/src/cmd/jpg/readgif.c index 22365669..092faf07 100644 --- a/src/cmd/jpg/readgif.c +++ b/src/cmd/jpg/readgif.c @@ -166,7 +166,7 @@ readarray(Header *h) nimages = 0; array[0] = nil; h->array = array; - + for(;;){ switch(c = Bgetc(h->fd)){ case Beof: diff --git a/src/cmd/jpg/readjpg.c b/src/cmd/jpg/readjpg.c index f3ad802e..c69d0438 100644 --- a/src/cmd/jpg/readjpg.c +++ b/src/cmd/jpg/readjpg.c @@ -78,7 +78,7 @@ struct Header Huffman acht[4]; int **data[3]; int ndata[3]; - + uchar *sf; /* start of frame; do better later */ uchar *ss; /* start of scan; do better later */ int ri; /* restart interval */ @@ -1484,7 +1484,7 @@ receiveEOB(Header *h, int s) return v; } -/* +/* * return next bit of input */ static diff --git a/src/cmd/jpg/readpng.c b/src/cmd/jpg/readpng.c index 5fdbc1db..e327a572 100644 --- a/src/cmd/jpg/readpng.c +++ b/src/cmd/jpg/readpng.c @@ -11,9 +11,9 @@ int debug; enum{ IDATSIZE=1000000, /* filtering algorithms, supposedly increase compression */ FilterNone = 0, /* new[x][y] = buf[x][y] */ - FilterSub = 1, /* new[x][y] = buf[x][y] + new[x-1][y] */ - FilterUp = 2, /* new[x][y] = buf[x][y] + new[x][y-1] */ - FilterAvg = 3, /* new[x][y] = buf[x][y] + (new[x-1][y]+new[x][y-1])/2 */ + FilterSub = 1, /* new[x][y] = buf[x][y] + new[x-1][y] */ + FilterUp = 2, /* new[x][y] = buf[x][y] + new[x][y-1] */ + FilterAvg = 3, /* new[x][y] = buf[x][y] + (new[x-1][y]+new[x][y-1])/2 */ FilterPaeth= 4, /* new[x][y] = buf[x][y] + paeth(new[x-1][y],new[x][y-1],new[x-1][y-1]) */ FilterLast = 5, PropertyBit = 1<<5 @@ -141,11 +141,11 @@ refill_buffer: return *z->b++; } -static uchar +static uchar paeth(uchar a, uchar b, uchar c) { int p, pa, pb, pc; - + p = (int)a + (int)b - (int)c; pa = abs(p - (int)a); pb = abs(p - (int)b); @@ -218,7 +218,7 @@ convertpix(ZlibW *z, uchar *pixel, uchar *r, uchar *g, uchar *b) break; default: sysfatal("bad number of channels: %d", z->nchan); - } + } } static void @@ -234,7 +234,7 @@ scan(ZlibW *z) unfilter(p[0], p+1, z->pscan+1, z->scanl-1, (nch*z->bpp+7)/8); /* - * Adam7 interlace order. + * Adam7 interlace order. * 1 6 4 6 2 6 4 6 * 7 7 7 7 7 7 7 7 * 5 6 5 6 5 6 5 6 diff --git a/src/cmd/jpg/readppm.c b/src/cmd/jpg/readppm.c index 073f4436..7067fc15 100644 --- a/src/cmd/jpg/readppm.c +++ b/src/cmd/jpg/readppm.c @@ -21,7 +21,7 @@ Bgetch(Biobuf *b) while((c = Bgetc(b)) != Beof && c != '\n') ; } - return c; + return c; } /* @@ -40,7 +40,7 @@ Bgetint(Biobuf *b) return -1; i = 0; - do { + do { i = i*10 + (c-'0'); } while((c = Bgetch(b)) != Beof && isdigit(c)); diff --git a/src/cmd/jpg/readyuv.c b/src/cmd/jpg/readyuv.c index f90bc237..5194d544 100644 --- a/src/cmd/jpg/readyuv.c +++ b/src/cmd/jpg/readyuv.c @@ -29,7 +29,7 @@ enum { static int lsbtab[] = { 6, 4, 2, 0}; -static int +static int clip(int x) { x >>= 18; @@ -186,5 +186,3 @@ readyuv(int fd, int colorspace) Bterm(&b); return a; } - - diff --git a/src/cmd/jpg/writegif.c b/src/cmd/jpg/writegif.c index 08fc4801..780bf7a5 100644 --- a/src/cmd/jpg/writegif.c +++ b/src/cmd/jpg/writegif.c @@ -281,7 +281,7 @@ writegraphiccontrol(Biobuf *fd, int dt, int trans) Bputc(fd, 0x01); else Bputc(fd, 0x00); - + /* Delay time, in centisec (argument is millisec for sanity) */ if(dt < 0) dt = 0; @@ -345,7 +345,7 @@ writedata(Biobuf *fd, Image *image, Memimage *memimage) else Bputc(fd, depth); - /* + /* * Read image data into memory * potentially one extra byte on each end of each scan line */ diff --git a/src/cmd/jpg/writepng.c b/src/cmd/jpg/writepng.c index 24a61a36..d0baf122 100644 --- a/src/cmd/jpg/writepng.c +++ b/src/cmd/jpg/writepng.c @@ -70,7 +70,7 @@ zread(void *va, void *buf, int n) uchar *b = buf, *e = b+n, *img; int pixels; /* number of pixels in row that can be sent now */ int i, a, pixwid; - + pixwid = z->pixwid; while(b+pixwid <= e){ /* loop over image rows */ if(z->row >= nrow) @@ -103,7 +103,7 @@ zread(void *va, void *buf, int n) b[2] = (b[2]*255)/a; } } - }else + }else b += pixwid*pixels; z->col += pixels; @@ -148,7 +148,7 @@ memRGBA(Memimage *i) Memimage *ni; char buf[32]; ulong dst; - + /* * [A]BGR because we want R,G,B,[A] in big-endian order. Sigh. */ @@ -157,7 +157,7 @@ memRGBA(Memimage *i) dst = ABGR32; else dst = BGR24; - + if(i->chan == dst) return i; @@ -211,7 +211,7 @@ memwritepng(Biobuf *bo, Memimage *r, ImageInfo *II) *h++ = tm->min; *h++ = tm->sec; chunk(bo, "tIME", buf, h-buf); - + if(II->fields_set & II_GAMMA){ vgamma = II->gamma*100000; put4(buf, vgamma); diff --git a/src/cmd/jpg/writeppm.c b/src/cmd/jpg/writeppm.c index c8378652..da528a44 100644 --- a/src/cmd/jpg/writeppm.c +++ b/src/cmd/jpg/writeppm.c @@ -30,7 +30,7 @@ writedata(Biobuf *fd, Image *image, Memimage *memimage) chan = image->chan; } - /* + /* * Read image data into memory * potentially one extra byte on each end of each scan line */ diff --git a/src/cmd/lex/sub1.c b/src/cmd/lex/sub1.c index dcbbb581..b2e6d359 100644 --- a/src/cmd/lex/sub1.c +++ b/src/cmd/lex/sub1.c @@ -488,7 +488,7 @@ allprint(int c) if(!isprint(c)){ print("\\%-3o",c); charc += 3; - } else + } else print("%c", c); break; } @@ -588,7 +588,7 @@ treedump(void) print("final %d",left[t]); break; case S1FINAL: - print("s1final %d",left[t]); + print("s1final %d",left[t]); break; case S2FINAL: print("s2final %d",left[t]); diff --git a/src/cmd/lex/sub2.c b/src/cmd/lex/sub2.c index 9221aea7..d619abad 100644 --- a/src/cmd/lex/sub2.c +++ b/src/cmd/lex/sub2.c @@ -51,7 +51,7 @@ cfoll(int v) case CARAT: cfoll(left[v]); break; - case STAR: case PLUS: case QUEST: case RSCON: + case STAR: case PLUS: case QUEST: case RSCON: cfoll(left[v]); break; case BAR: case RCAT: case DIV: case RNEWE: @@ -131,7 +131,7 @@ follow(int v) case BAR: case QUEST: case RNEWE: follow(p); break; - case RCAT: case DIV: + case RCAT: case DIV: if(v == left[p]){ if(nullstr[right[p]]) follow(p); @@ -139,7 +139,7 @@ follow(int v) } else follow(p); break; - case RSCON: case CARAT: + case RSCON: case CARAT: follow(p); break; # ifdef DEBUG @@ -803,7 +803,7 @@ layout(void) Bprint(&fout,"0,\t0,\t0};\n"); /* put out yymatch */ - + Bprint(&fout,"struct yywork *yytop = yycrank+%d;\n",yytop); Bprint(&fout,"struct yysvf *yybgin = yysvec+1;\n"); Bprint(&fout,"Uchar yymatch[] = {\n"); diff --git a/src/cmd/look.c b/src/cmd/look.c index 369afe1b..af40cfcc 100644 --- a/src/cmd/look.c +++ b/src/cmd/look.c @@ -90,7 +90,7 @@ main(int argc, char *argv[]) case 'f': fold++; break; - case 'i': + case 'i': iflag++; break; case 'n': @@ -118,7 +118,7 @@ main(int argc, char *argv[]) if(argc < 1) { direc++; fold++; - } else + } else filename = argv[0]; if (!iflag) rcanon(orig, key); diff --git a/src/cmd/lp/ipcopen.c b/src/cmd/lp/ipcopen.c index 666f64c4..a07858a8 100644 --- a/src/cmd/lp/ipcopen.c +++ b/src/cmd/lp/ipcopen.c @@ -78,7 +78,7 @@ pass(int from, int to) { char buf[1024]; int ppid, cpid; - int n, tot = 0; + int n, tot = 0; while ((n=read(from, buf, sizeof(buf))) > 0) { if (n==1 && tot==0 && *buf=='\0') diff --git a/src/cmd/lp/lpdsend.c b/src/cmd/lp/lpdsend.c index 0dc70259..363d9501 100644 --- a/src/cmd/lp/lpdsend.c +++ b/src/cmd/lp/lpdsend.c @@ -289,7 +289,7 @@ main(int argc, char *argv[]) { if (statflag) { fprintf(stderr, "cannot have both -k and -q flags\n"); exit(1); - } + } killflag = 1; killarg = optarg; break; @@ -297,7 +297,7 @@ main(int argc, char *argv[]) { if (killflag) { fprintf(stderr, "cannot have both -q and -k flags\n"); exit(1); - } + } statflag = 1; break; case 's': diff --git a/src/cmd/lp/lpsend.c b/src/cmd/lp/lpsend.c index 4893f452..bcdcfdbb 100644 --- a/src/cmd/lp/lpsend.c +++ b/src/cmd/lp/lpsend.c @@ -154,7 +154,7 @@ pass(int inpfd, int outfd, int bsize) alarm(0); return(bcnt); } - + /* get whatever stdin has and put it into the temporary file. * return the file size. */ diff --git a/src/cmd/ls.c b/src/cmd/ls.c index fca3ee95..845532be 100644 --- a/src/cmd/ls.c +++ b/src/cmd/ls.c @@ -249,7 +249,7 @@ growto(long n) if(dirbuf == 0){ fprint(2, "ls: malloc fail\n"); exits("malloc fail"); - } + } } int @@ -305,4 +305,3 @@ asciitime(long l) buf[12] = 0; return buf; } - diff --git a/src/cmd/map/libmap/bonne.c b/src/cmd/map/libmap/bonne.c index 858f0d69..1c9db868 100644 --- a/src/cmd/map/libmap/bonne.c +++ b/src/cmd/map/libmap/bonne.c @@ -15,7 +15,7 @@ Xbonne(struct place *place, double *x, double *y) alpha = place->wlon.l; else if(fabs(place->nlat.c)==0) alpha = 0; - else + else alpha = place->wlon.l/(1+ stdpar.c*stdpar.c*stdpar.c/place->nlat.c/3); else diff --git a/src/cmd/map/libmap/cubrt.c b/src/cmd/map/libmap/cubrt.c index fd508d2b..abfd6ea0 100644 --- a/src/cmd/map/libmap/cubrt.c +++ b/src/cmd/map/libmap/cubrt.c @@ -6,7 +6,7 @@ double cubrt(double a) { double x,y,x1; - if(a==0) + if(a==0) return(0.); y = 1; if(a<0) { diff --git a/src/cmd/map/libmap/elco2.c b/src/cmd/map/libmap/elco2.c index b4c9bbf6..6f7d5604 100644 --- a/src/cmd/map/libmap/elco2.c +++ b/src/cmd/map/libmap/elco2.c @@ -76,7 +76,7 @@ elco2(double x, double y, double kc, double a, double b, double *u, double *v) cmul(c,dn2,1+e1*m2,e2*m2,&f1,&f2); cdiv(d*x,d*y,f1,f2,&d1[i],&d2[i]); - if(k<=CC) + if(k<=CC) break; kc = sqrt(m*kc); f = m2; diff --git a/src/cmd/map/libmap/gilbert.c b/src/cmd/map/libmap/gilbert.c index 173ffcd3..f7ee7b6f 100644 --- a/src/cmd/map/libmap/gilbert.c +++ b/src/cmd/map/libmap/gilbert.c @@ -47,5 +47,3 @@ gilbert(void) use standard formula: tan x/2 = (1-cos x)/sin x = sin x/(1+cos x) to show that the right side of the last equation is tan(n/2) */ - - diff --git a/src/cmd/map/libmap/homing.c b/src/cmd/map/libmap/homing.c index 366f69fe..9678c681 100644 --- a/src/cmd/map/libmap/homing.c +++ b/src/cmd/map/libmap/homing.c @@ -94,7 +94,7 @@ hlimb(double *lat, double *lon, double res) return 0; } *lat += res; - if(*lat <= 90) + if(*lat <= 90) return 1; if(*lon == 90) return -1; diff --git a/src/cmd/map/libmap/lambert.c b/src/cmd/map/libmap/lambert.c index 6b688aa3..e8037a6c 100644 --- a/src/cmd/map/libmap/lambert.c +++ b/src/cmd/map/libmap/lambert.c @@ -34,7 +34,7 @@ lambert(double par0, double par1) } deg2rad(par0, &stdp0); deg2rad(par1, &stdp1); - if(fabs(par1+par0)<.1) + if(fabs(par1+par0)<.1) return(mercator()); if(fabs(par1-par0)<.1) return(perspective(-1.)); diff --git a/src/cmd/map/libmap/lune.c b/src/cmd/map/libmap/lune.c index dc58c6f0..a3d06d81 100644 --- a/src/cmd/map/libmap/lune.c +++ b/src/cmd/map/libmap/lune.c @@ -42,7 +42,7 @@ static int Xlune(struct place *place, double *x, double *y) deny = w1y + w2y; cdiv(numx, numy, denx, deny, x, y); return 1; -} +} proj lune(double lat, double theta) diff --git a/src/cmd/map/libmap/tetra.c b/src/cmd/map/libmap/tetra.c index 6bdef49b..31837de2 100644 --- a/src/cmd/map/libmap/tetra.c +++ b/src/cmd/map/libmap/tetra.c @@ -66,7 +66,7 @@ static struct tproj { {/*30*/ {0., -45., 45., -150.}, /*31*/ {0., -135., 135., -30.}, /*32*/ {-90., 0., 0., 90.}, - /*33*/ {0.} + /*33*/ {0.} }}; static double tx[4] = { /*where to move facet after final rotation*/ 0., 0., -1., 1. /*-1,1 to be sqrt(3)*/ @@ -136,7 +136,7 @@ Xtetra(struct place *place, double *x, double *y) return 0; vr = fpir - vr; vi = fpii - vi; - } else + } else if(!elco2(br,bi,tk,1.,1.,&vr,&vi)) return 0; if(si>=0) { @@ -158,7 +158,7 @@ int tetracut(struct place *g, struct place *og, double *cutlon) { int i,j,k; - if((g->nlat.s<=-rt3inv&&og->nlat.s<=-rt3inv) && + if((g->nlat.s<=-rt3inv&&og->nlat.s<=-rt3inv) && (ckcut(g,og,*cutlon=0.)==2||ckcut(g,og,*cutlon=PI)==2)) return(2); twhichp(g,&i,&k); @@ -203,4 +203,3 @@ tetra(void) } return(Xtetra); } - diff --git a/src/cmd/map/libmap/twocirc.c b/src/cmd/map/libmap/twocirc.c index 0d0e48a4..9c7b7ec4 100644 --- a/src/cmd/map/libmap/twocirc.c +++ b/src/cmd/map/libmap/twocirc.c @@ -44,7 +44,7 @@ twocircles(double m, double p, double p1, double p2, double *x, double *y) *y = (*x*a+t/2)/b; } return 1; -} +} static int Xglobular(struct place *place, double *x, double *y) @@ -52,7 +52,7 @@ Xglobular(struct place *place, double *x, double *y) twocircles(-2*place->wlon.l/PI, 2*place->nlat.l/PI, place->nlat.c, place->nlat.s, x, y); return 1; -} +} proj globular(void) @@ -68,7 +68,7 @@ Xvandergrinten(struct place *place, double *x, double *y) double pval = abst>=1? 1: abst/(1+sqrt(1-t*t)); double p2 = 2*pval/(1+pval); twocircles(-place->wlon.l/PI, pval, sqrt(1-p2*p2), p2, x, y); - if(t < 0) + if(t < 0) *y = -*y; return 1; } diff --git a/src/cmd/map/map.c b/src/cmd/map/map.c index 74ae79ac..5ca1a65c 100644 --- a/src/cmd/map/map.c +++ b/src/cmd/map/map.c @@ -123,7 +123,7 @@ void windlim(void); void realcut(void); int -option(char *s) +option(char *s) { if(s[0]=='-' && (s[1]<'0'||s[1]>'9')) @@ -157,7 +157,7 @@ main(int argc, char *argv[]) s = getenv("MAPDIR"); if(s) mapdir = s; - if(argc<=1) + if(argc<=1) error("usage: map projection params options"); for(k=0;index[k].name;k++) { s = index[k].name; @@ -305,7 +305,7 @@ found: argc -= i; break; case 'c': - for(i=0;i<3&&argc>i&&!option(argv[i]);i++) + for(i=0;i<3&&argc>i&&!option(argv[i]);i++) center[i] = atof(argv[i]); argc -= i; argv += i; @@ -315,7 +315,7 @@ found: position[i] = atof(argv[i]); argc -= i; argv += i; - if(i!=3||position[2]<=0) + if(i!=3||position[2]<=0) error("incomplete positioning"); break; case 'y': @@ -445,7 +445,7 @@ found: crot.l = center[2]*RAD; sincos(&crot); scaling *= HALFWIDTH*0.9; - if(symbolfile) + if(symbolfile) getsyms(symbolfile); if(!s2flag) { openpl(); @@ -457,11 +457,11 @@ found: pen(DOTTED); if(grid[0]>0.) for(lat=ceil(lolat/grid[0])*grid[0]; - lat<=hilat;lat+=grid[0]) + lat<=hilat;lat+=grid[0]) dogrid(lat,lat,lolon,hilon); if(grid[1]>0.) for(lon=ceil(lolon/grid[1])*grid[1]; - lon<=hilon;lon+=grid[1]) + lon<=hilon;lon+=grid[1]) dogrid(lolat,hilat,lon,lon); comment("border",""); colorx(bordcolor); @@ -520,7 +520,7 @@ normproj(double lat, double lon, double *x, double *y) if(!inwindow(&geog)) return(-1); i = fixproj(&geog,x,y); - if(rflag) + if(rflag) *x = -*x; /* printp(&geog); @@ -537,7 +537,7 @@ posproj(double lat, double lon, double *x, double *y) latlon(lat,lon,&geog); normalize(&geog); i = fixproj(&geog,x,y); - if(rflag) + if(rflag) *x = -*x; return(i); } @@ -1167,7 +1167,7 @@ clipinit(void) nvert = 4; v[2] = v[1]; v[1].x=v[0].x, v[1].y=v[2].y, v[3].x=v[2].x, v[3].y=v[0].y; - } + } v[nvert] = v[0]; v[nvert+1] = v[1]; s = 0; @@ -1208,7 +1208,7 @@ realcut(void) { struct place g; double lat; - + if(cut != picut) /* punt on unusual cuts */ return; for(lat=window[0]; lat<=window[1]; lat+=grid[2]) { diff --git a/src/cmd/map/route.c b/src/cmd/map/route.c index c4c67134..8a6cfccc 100644 --- a/src/cmd/map/route.c +++ b/src/cmd/map/route.c @@ -117,7 +117,7 @@ doroute(double dir, double an, double aw, double bn, double bw) dlat = fabs(an-bn); printf("-o %.4f %.4f %.4f -w %.2f %.2f %.2f %.2f \n", pn,pw,theta, -0.3*cw1, .3*cw1, -.6*cw1, .6*cw1); - + } else { cn1 = 0; n = 1 + fabs(bw1-aw1)/.2; diff --git a/src/cmd/mk/env.c b/src/cmd/mk/env.c index 11df34e3..d7c6481d 100644 --- a/src/cmd/mk/env.c +++ b/src/cmd/mk/env.c @@ -142,7 +142,7 @@ buildenv(Job *j, int slot) for(i = 0; *p; i++, p++){ if((j->r->attr®EXP) && j->match[i]) envupd(*p, newword(j->match[i])); - else + else envupd(*p, newword("")); } return envy; diff --git a/src/cmd/mk/rule.c b/src/cmd/mk/rule.c index 30728197..537d2d75 100644 --- a/src/cmd/mk/rule.c +++ b/src/cmd/mk/rule.c @@ -76,7 +76,7 @@ dumpr(char *s, Rule *r) { if(r == nil) return; - Bprint(&bout, "%s: start=%ld shelltype=%s shellcmd=%s\n", + Bprint(&bout, "%s: start=%ld shelltype=%s shellcmd=%s\n", s, r, r->shellt->name, wtos(r->shellcmd, ' ')); for(; r; r = r->next){ Bprint(&bout, "\tRule %ld: %s[%d] attr=%x next=%ld chain=%ld alltarget='%s'", diff --git a/src/cmd/mk/run.c b/src/cmd/mk/run.c index dd225c0d..6f60cede 100644 --- a/src/cmd/mk/run.c +++ b/src/cmd/mk/run.c @@ -29,7 +29,7 @@ run(Job *j) for(jj = jobs; jj->next; jj = jj->next) ; jj->next = j; - } else + } else jobs = j; j->next = 0; /* this code also in waitup after parse redirect */ diff --git a/src/cmd/mk/sh.c b/src/cmd/mk/sh.c index e2566514..d8f205c8 100644 --- a/src/cmd/mk/sh.c +++ b/src/cmd/mk/sh.c @@ -203,4 +203,3 @@ Shell shshell = { shcopyq, shmatchname }; - diff --git a/src/cmd/mk/sys.h b/src/cmd/mk/sys.h index 03a9d058..f520b066 100644 --- a/src/cmd/mk/sys.h +++ b/src/cmd/mk/sys.h @@ -2,4 +2,3 @@ #include <libc.h> #include <bio.h> #include <regexp.h> - diff --git a/src/cmd/mk/unix.c b/src/cmd/mk/unix.c index c63d3cef..37f05b71 100644 --- a/src/cmd/mk/unix.c +++ b/src/cmd/mk/unix.c @@ -23,7 +23,7 @@ readenv(void) Word *w; for(p = environ; *p; p++){ -/* rsc 5/5/2004 -- This misparses fn#cd={whatever} +/* rsc 5/5/2004 -- This misparses fn#cd={whatever} s = shname(*p); if(*s == '=') { *s = 0; @@ -111,7 +111,7 @@ shargv(Word *cmd, int extra, char ***pargv) n = 0; for(w=cmd; w; w=w->next) n++; - + argv = Malloc((n+extra+1)*sizeof(argv[0])); i = 0; for(w=cmd; w; w=w->next) @@ -119,7 +119,7 @@ shargv(Word *cmd, int extra, char ***pargv) argv[n] = 0; *pargv = argv; return n; -} +} int execsh(char *args, char *cmd, Bufblock *buf, Envy *e, Shell *sh, Word *shellcmd) diff --git a/src/cmd/mk/varsub.c b/src/cmd/mk/varsub.c index f858a92a..b6c0ab0f 100644 --- a/src/cmd/mk/varsub.c +++ b/src/cmd/mk/varsub.c @@ -61,7 +61,7 @@ varmatch(char *name) { Word *w; Symtab *sym; - + sym = symlook(name, S_VAR, 0); if(sym){ /* check for at least one non-NULL value */ @@ -107,7 +107,7 @@ expandvar(char **s) } *end = 0; *s = end+1; - + sym = symlook(buf->start, S_VAR, 0); if(sym == 0 || sym->u.ptr == 0) w = newword(buf->start); @@ -173,7 +173,7 @@ subsub(Word *v, char *s, char *end) while(w->next) w = w->next; } - if(PERCENT(*cp) && nmid > 0){ + if(PERCENT(*cp) && nmid > 0){ if(w){ bufcpy(buf, w->s, strlen(w->s)); bufcpy(buf, enda, nmid); @@ -205,7 +205,7 @@ subsub(Word *v, char *s, char *end) } if(w == 0) h = w = newword(v->s); - + if(head == 0) head = h; else diff --git a/src/cmd/mk/word.c b/src/cmd/mk/word.c index f94c4fd7..e1e52a1c 100644 --- a/src/cmd/mk/word.c +++ b/src/cmd/mk/word.c @@ -29,7 +29,7 @@ stow(char *s) head = w = new; while(w->next) w = w->next; - + } if (!head) head = newword(""); diff --git a/src/cmd/mpm/range.h b/src/cmd/mpm/range.h index 54994cdd..a1d00dfb 100644 --- a/src/cmd/mpm/range.h +++ b/src/cmd/mpm/range.h @@ -67,7 +67,7 @@ class range { class vboxrange : public range { int dv; // inherited from slug int base; // inherited from slug - int brk; // 0 => ok to break after, 1 => no break + int brk; // 0 => ok to break after, 1 => no break public: vboxrange(slug *p) : range(p) { dv = p->dv; base = p->base; brk = p->parm; } void dump() { diff --git a/src/cmd/mpm/slug.h b/src/cmd/mpm/slug.h index 9dfd3b2a..0f72b931 100644 --- a/src/cmd/mpm/slug.h +++ b/src/cmd/mpm/slug.h @@ -32,7 +32,7 @@ enum parmtypes { PL, // distance of physical page bottom from page top (Page Length) MF, // minimum fullness required for padding CT, // tolerance for division into two columns - WARN, // warnings to stderr? + WARN, // warnings to stderr? DBG // debugging flag }; diff --git a/src/cmd/namespace.c b/src/cmd/namespace.c index 823e204a..ff01450c 100644 --- a/src/cmd/namespace.c +++ b/src/cmd/namespace.c @@ -30,4 +30,3 @@ main(int argc, char **argv) print("%s\n", ns); exits(0); } - diff --git a/src/cmd/ndb/convDNS2M.c b/src/cmd/ndb/convDNS2M.c index 60fd9402..60fd9402 100755..100644 --- a/src/cmd/ndb/convDNS2M.c +++ b/src/cmd/ndb/convDNS2M.c diff --git a/src/cmd/ndb/convM2DNS.c b/src/cmd/ndb/convM2DNS.c index 8e1fd0ce..8e1fd0ce 100755..100644 --- a/src/cmd/ndb/convM2DNS.c +++ b/src/cmd/ndb/convM2DNS.c diff --git a/src/cmd/ndb/dblookup.c b/src/cmd/ndb/dblookup.c index ca73184a..067ba444 100755..100644 --- a/src/cmd/ndb/dblookup.c +++ b/src/cmd/ndb/dblookup.c @@ -463,13 +463,13 @@ soarr(Ndbtuple *entry, Ndbtuple *pair) rp->rmb = dnlookup(mailbox, Cin, 1); } - /* hang dns slaves off of the soa. this is + /* hang dns slaves off of the soa. this is * for managing the area. */ for(t = entry; t != nil; t = t->entry) if(strcmp(t->attr, "dnsslave") == 0) addserver(&rp->soa->slaves, t->val); - + return rp; } @@ -647,11 +647,11 @@ db2cache(int doit) unlock(&dblock); return; } - + /* forget our area definition */ freearea(&owned); freearea(&delegated); - + /* reopen all the files (to get oldest for time stamp) */ for(ndb = db; ndb; ndb = ndb->next) ndbreopen(ndb); @@ -659,14 +659,14 @@ db2cache(int doit) if(cachedb){ /* mark all db records as timed out */ dnagedb(); - + /* read in new entries */ for(ndb = db; ndb; ndb = ndb->next) dbfile2cache(ndb); - + /* mark as authentic anything in our domain */ dnauthdb(); - + /* remove old entries */ dnageall(1); } else { @@ -697,7 +697,7 @@ lookupinfo(char *attr) snprint(buf, sizeof buf, "%I", ipaddr); a[0] = attr; - + lock(&dblock); if(opendatabase() < 0){ unlock(&dblock); diff --git a/src/cmd/ndb/dn.c b/src/cmd/ndb/dn.c index 8b874030..5a37eefa 100755..100644 --- a/src/cmd/ndb/dn.c +++ b/src/cmd/ndb/dn.c @@ -67,7 +67,7 @@ char *rrtname[Tall+2] = "cert", nil, nil, - + /* 40 */ nil, nil, nil, nil, nil, nil, nil, nil, /* 48 */ nil, nil, nil, nil, nil, nil, nil, nil, /* 56 */ nil, nil, nil, nil, nil, nil, nil, nil, @@ -94,7 +94,7 @@ char *rrtname[Tall+2] = /* 224 */ nil, nil, nil, nil, nil, nil, nil, nil, /* 232 */ nil, nil, nil, nil, nil, nil, nil, nil, /* 240 */ nil, nil, nil, nil, nil, nil, nil, nil, -/* 248 */ nil, nil, nil, +/* 248 */ nil, nil, nil, "ixfr", "axfr", @@ -1318,7 +1318,7 @@ randomize(RR *rp) if(x->type != Ta && x->type != Tmx && x->type != Tns) return rp; - base = rp; + base = rp; n = rand(); last = first = nil; @@ -1564,7 +1564,7 @@ copyserverlist(Server *s) { Server *ns; - + for(ns = nil; s != nil; s = s->next) addserver(&ns, s->name); return ns; diff --git a/src/cmd/ndb/dnarea.c b/src/cmd/ndb/dnarea.c index 05c9d004..bb4d050c 100755..100644 --- a/src/cmd/ndb/dnarea.c +++ b/src/cmd/ndb/dnarea.c @@ -96,7 +96,7 @@ refresh_areas(Area *s) { Waitmsg *w; char *argv[3]; - + argv[0] = zonerefreshprogram; argv[1] = "XXX"; argv[2] = nil; @@ -115,4 +115,3 @@ refresh_areas(Area *s) free(w); } } - diff --git a/src/cmd/ndb/dnnotify.c b/src/cmd/ndb/dnnotify.c index 8e4b3075..8e4b3075 100755..100644 --- a/src/cmd/ndb/dnnotify.c +++ b/src/cmd/ndb/dnnotify.c diff --git a/src/cmd/ndb/dnresolve.c b/src/cmd/ndb/dnresolve.c index 979abe4e..366521b6 100755..100644 --- a/src/cmd/ndb/dnresolve.c +++ b/src/cmd/ndb/dnresolve.c @@ -71,13 +71,13 @@ dnresolve(char *name, int class, int type, Request *req, RR **cn, int depth, int rp = nil; break; } - + name = rp->host->name; if(cn) rrcat(cn, rp); else rrfreelist(rp); - + rp = dnresolve1(name, class, type, req, depth, recurse); } } @@ -126,7 +126,7 @@ dnresolve1(char *name, int class, int type, Request *req, int depth, int recurse rrfreelist(rp); /* - * try the cache for a canonical name. if found punt + * try the cache for a canonical name. if found punt * since we'll find it during the canonical name search * in dnresolve(). */ @@ -242,7 +242,7 @@ walkup(char *name) } /* - * Get a udpport for requests and replies. + * Get a udpport for requests and replies. */ int udpport(void) @@ -310,7 +310,7 @@ readreply(int fd, DN *dp, int type, ushort req, len = udpreadtimeout(fd, (Udphdr*)ibuf, ibuf+Udphdrsize, Maxudpin, (endtime-now)*1000); if(len < 0) return -1; /* timed out */ - + /* convert into internal format */ memset(mp, 0, sizeof(*mp)); err = convM2DNS(&ibuf[Udphdrsize], len, mp); @@ -357,13 +357,13 @@ udpreadtimeout(int fd, Udphdr *h, void *data, int n, int ms) { fd_set rd; struct timeval tv; - + FD_ZERO(&rd); FD_SET(fd, &rd); - + tv.tv_sec = ms/1000; tv.tv_usec = (ms%1000)*1000; - + if(select(fd+1, &rd, 0, 0, &tv) != 1) return -1; return udpread(fd, h, data, n); @@ -512,7 +512,7 @@ cacheneg(DN *dp, int type, int rcode, RR *soarr) soarr->next = nil; } soaowner = soarr->owner; - } else + } else soaowner = nil; /* the attach can cause soarr to be freed so mine it now */ diff --git a/src/cmd/ndb/dns.c b/src/cmd/ndb/dns.c index 05a5dd45..cb317052 100755..100644 --- a/src/cmd/ndb/dns.c +++ b/src/cmd/ndb/dns.c @@ -170,7 +170,7 @@ threadmain(int argc, char *argv[]) default: usage(); }ARGEND - + if(argc) usage(); if(serveudp && servetcp) diff --git a/src/cmd/ndb/dns.h b/src/cmd/ndb/dns.h index 9825f0bd..fbd114f3 100755..100644 --- a/src/cmd/ndb/dns.h +++ b/src/cmd/ndb/dns.h @@ -26,7 +26,7 @@ enum /* query types (all RR types are also queries) */ Tixfr= 251, /* incremental zone transfer */ Taxfr= 252, /* zone transfer */ - Tmailb= 253, /* { Tmb, Tmg, Tmr } */ + Tmailb= 253, /* { Tmb, Tmg, Tmr } */ Tall= 255, /* all records */ /* classes */ diff --git a/src/cmd/ndb/dnsdebug.c b/src/cmd/ndb/dnsdebug.c index 0818b85f..c3ad3e13 100755..100644 --- a/src/cmd/ndb/dnsdebug.c +++ b/src/cmd/ndb/dnsdebug.c @@ -331,7 +331,7 @@ void preloadserveraddrs(void) { RR *rp, **l, *first; - + l = &first; for(rp = serveraddrs; rp != nil; rp = rp->next){ rrcopy(rp, l); diff --git a/src/cmd/ndb/dnserver.c b/src/cmd/ndb/dnserver.c index 509734b0..660006bd 100755..100644 --- a/src/cmd/ndb/dnserver.c +++ b/src/cmd/ndb/dnserver.c @@ -81,7 +81,7 @@ dnserver(DNSmsg *reqp, DNSmsg *repp, Request *req) nsdp = dnlookup(cp, repp->qd->owner->class, 0); if(nsdp == 0) continue; - + repp->ns = rrlookup(nsdp, Tns, OKneg); if(repp->ns){ /* don't pass on anything we know is wrong */ @@ -91,7 +91,7 @@ dnserver(DNSmsg *reqp, DNSmsg *repp, Request *req) } break; } - + repp->ns = dblookup(cp, repp->qd->owner->class, Tns, 0, 0); if(repp->ns) break; diff --git a/src/cmd/ndb/dnsquery.c b/src/cmd/ndb/dnsquery.c index dc7ae06b..dc7ae06b 100755..100644 --- a/src/cmd/ndb/dnsquery.c +++ b/src/cmd/ndb/dnsquery.c diff --git a/src/cmd/ndb/dnstcp.c b/src/cmd/ndb/dnstcp.c index 3d4d1e90..3d4d1e90 100755..100644 --- a/src/cmd/ndb/dnstcp.c +++ b/src/cmd/ndb/dnstcp.c diff --git a/src/cmd/ndb/dntcpserver.c b/src/cmd/ndb/dntcpserver.c index 13161548..713331f4 100644 --- a/src/cmd/ndb/dntcpserver.c +++ b/src/cmd/ndb/dntcpserver.c @@ -269,7 +269,7 @@ static int tcpannounce(char *mntpt) { int fd; - + USED(mntpt); if((fd=announce(tcpaddr, adir)) < 0) warning("announce %s: %r", tcpaddr); diff --git a/src/cmd/ndb/dnudpserver.c b/src/cmd/ndb/dnudpserver.c index 9f84125c..a84cd050 100755..100644 --- a/src/cmd/ndb/dnudpserver.c +++ b/src/cmd/ndb/dnudpserver.c @@ -206,4 +206,3 @@ dnudpserver(void *v) for(i=0; i<Maxactive; i++) proccreate(udpproc, (void*)(uintptr)fd, STACK); } - diff --git a/src/cmd/ndb/ndbmkhash.c b/src/cmd/ndb/ndbmkhash.c index 507bd7c7..ea334bf7 100644 --- a/src/cmd/ndb/ndbmkhash.c +++ b/src/cmd/ndb/ndbmkhash.c @@ -68,7 +68,7 @@ main(int argc, char **argv) { Ndbtuple *t, *nt; int n; - Dir *d; + Dir *d; uchar buf[8]; char file[128]; int fd; diff --git a/src/cmd/ndb/ndbquery.c b/src/cmd/ndb/ndbquery.c index 65bc0472..85b72b1e 100644 --- a/src/cmd/ndb/ndbquery.c +++ b/src/cmd/ndb/ndbquery.c @@ -67,7 +67,7 @@ main(int argc, char **argv) default: usage(); } - + db = ndbopen(dbfile); if(db == 0){ fprint(2, "no db files\n"); diff --git a/src/cmd/ndb/runproc.c b/src/cmd/ndb/runproc.c index db344f97..5d1274af 100644 --- a/src/cmd/ndb/runproc.c +++ b/src/cmd/ndb/runproc.c @@ -34,4 +34,3 @@ runproc(char *file, char **v, int devnull) } return runprocfd(file, v, fd); } - diff --git a/src/cmd/netfiles/acme.c b/src/cmd/netfiles/acme.c index ddd39284..0a6b2da8 100644 --- a/src/cmd/netfiles/acme.c +++ b/src/cmd/netfiles/acme.c @@ -153,7 +153,7 @@ int winopenfd(Win *w, char *name, int mode) { char buf[100]; - + snprint(buf, sizeof buf, "%d/%s", w->id, name); return fsopenfd(acmefs, buf, mode); } @@ -230,7 +230,7 @@ winreadaddr(Win *w, uint *q1) char buf[40], *p; uint q0; int n; - + n = fspread(wfid(w, "addr"), buf, sizeof buf-1, 0); if(n <= 0) return -1; @@ -258,7 +258,7 @@ fsreadm(CFid *fid) { char *buf; int n, tot, m; - + m = 128; buf = emalloc(m+1); tot = 0; @@ -288,7 +288,7 @@ winindex(void) { CFid *fid; char *s; - + mountacme(); if((fid = fsopen(acmefs, "index", OREAD)) == nil) return nil; @@ -595,7 +595,7 @@ eventreader(void *v) Event e[2]; Win *w; int i; - + w = v; i = 0; for(;;){ @@ -623,7 +623,7 @@ wingetname(Win *w) { int n; char *p; - + n = winread(w, "tag", w->name, sizeof w->name-1); if(n <= 0) return nil; @@ -633,4 +633,3 @@ wingetname(Win *w) *p = 0; return w->name; } - diff --git a/src/cmd/netfiles/acme.h b/src/cmd/netfiles/acme.h index 50997e97..c792a9c1 100644 --- a/src/cmd/netfiles/acme.h +++ b/src/cmd/netfiles/acme.h @@ -31,7 +31,7 @@ struct Win Channel *c; /* chan(Event) */ Win *next; Win *prev; - + /* events */ int nbuf; char name[1024]; diff --git a/src/cmd/netfiles/main.c b/src/cmd/netfiles/main.c index 45e19416..baacb984 100644 --- a/src/cmd/netfiles/main.c +++ b/src/cmd/netfiles/main.c @@ -1,7 +1,7 @@ /* * Remote file system editing client. * Only talks to acme - external programs do all the hard work. - * + * * If you add a plumbing rule: # /n/ paths go to simulator in acme @@ -80,7 +80,7 @@ Arg* arg(char *file, char *addr, Channel *c) { Arg *a; - + a = emalloc(sizeof *a); a->file = estrdup(file); a->addr = estrdup(addr); @@ -92,7 +92,7 @@ Win* winbyid(int id) { Win *w; - + for(w=windows; w; w=w->next) if(w->id == id) return w; @@ -139,7 +139,7 @@ int lookup(char *s, char **list) { int i; - + for(i=0; list[i]; i++) if(strcmp(list[i], s) == 0) return i; @@ -174,7 +174,7 @@ char* expandarg(Win *w, Event *e) { uint q0, q1; - + if(e->c2 == 'l') /* in tag - no choice but to accept acme's expansion */ return estrdup(e->text); winaddr(w, ","); @@ -187,7 +187,7 @@ expandarg(Win *w, Event *e) if(e->oq0 == e->oq1 && e->q0 != e->q1 && !isdot(w, e->q0, e->q1)){ winaddr(w, "#%ud+#1-/[^ \t\\n]*/,#%ud-#1+/[^ \t\\n]*/", e->q0, e->q1); q0 = winreadaddr(w, &q1); - cprint("\tre-expand to %d-%d\n", q0, q1); + cprint("\tre-expand to %d-%d\n", q0, q1); }else winaddr(w, "#%ud,#%ud", e->q0, e->q1); return winmread(w, "xdata"); @@ -202,7 +202,7 @@ doplumb(void *vm) char *addr; Plumbmsg *m; Win *w; - + m = vm; if(m->ndata >= 1024){ fprint(2, "insanely long file name (%d bytes) in plumb message (%.32s...)\n", @@ -210,7 +210,7 @@ doplumb(void *vm) plumbfree(m); return; } - + addr = plumblookup(m->attr, "addr"); w = nametowin(m->data); if(w == nil) @@ -230,7 +230,7 @@ plumbthread(void *v) { CFid *fid; Plumbmsg *m; - + threadsetname("plumbthread"); fid = plumbopenfid("netfileedit", OREAD); if(fid == nil){ @@ -249,7 +249,7 @@ int parsename(char *name, char **server, char **path) { char *p, *nul; - + cleanname(name); if(strncmp(name, "/n/", 3) != 0 && name[3] == 0) return -1; @@ -326,9 +326,9 @@ filethread(void *v) winname(w, a->file); winprint(w, "tag", "Get Put Look "); c = wineventchan(w); - + goto caseGet; - + while((e=recvp(c)) != nil){ if(e->c1!='K') dprint("acme %E\n", e); @@ -352,7 +352,7 @@ filethread(void *v) winaddr(w, ","); winprint(w, "data", "[reading...]"); winaddr(w, ","); - cprint("9 netfileget %s%q %q\n", + cprint("9 netfileget %s%q %q\n", strcmp(type, "file") == 0 ? "" : "-d", server, path); if(strcmp(type, "file")==0) twait(pipetowin(w, "data", 2, "9 netfileget %q %q", server, path)); @@ -508,7 +508,7 @@ mkwin(char *name) Arg *a; Channel *c; Win *w; - + c = chancreate(sizeof(void*), 0); a = arg(name, nil, c); threadcreate(filethread, a, STACK); @@ -521,12 +521,12 @@ void loopthread(void *v) { QLock lk; - + threadsetname("loopthread"); qlock(&lk); qlock(&lk); } - + void threadmain(int argc, char **argv) { @@ -540,7 +540,7 @@ threadmain(int argc, char **argv) default: usage(); }ARGEND - + if(argc) usage(); @@ -551,10 +551,9 @@ threadmain(int argc, char **argv) fmtinstall('E', eventfmt); doquote = needsrcquote; quotefmtinstall(); - + twaitinit(); threadcreate(plumbthread, nil, STACK); threadcreate(loopthread, nil, STACK); threadexits(nil); } - diff --git a/src/cmd/netfiles/wait.c b/src/cmd/netfiles/wait.c index 3434ebc8..0d603297 100644 --- a/src/cmd/netfiles/wait.c +++ b/src/cmd/netfiles/wait.c @@ -61,7 +61,7 @@ waitthread(void *v) wq[nwq++] = w; } break; - + case 1: dprint("wait: req for pid %d chan %p\n", r.pid, r.c); for(i=0; i<nwq; i++){ @@ -89,7 +89,7 @@ twaitfor(int pid) { Waitreq r; Waitmsg *w; - + r.pid = pid; r.c = chancreate(sizeof(Waitmsg*), 1); send(twaitchan, &r); @@ -103,7 +103,7 @@ twait(int pid) { int x; Waitmsg *w; - + w = twaitfor(pid); x = w->msg[0] != 0 ? -1 : 0; free(w); @@ -117,4 +117,3 @@ twaitinit(void) twaitchan = chancreate(sizeof(Waitreq), 10); threadcreate(waitthread, nil, 128*1024); } - diff --git a/src/cmd/page/cache.c b/src/cmd/page/cache.c index 5110840f..a1083fc7 100644 --- a/src/cmd/page/cache.c +++ b/src/cmd/page/cache.c @@ -29,7 +29,7 @@ questionmark(void) static Image *im; if(im) - return im; + return im; im = xallocimage(display, Rect(0,0,50,50), GREY1, 1, DBlack); if(im == nil) return nil; @@ -165,7 +165,7 @@ static void raproc(void *a) { Cached *c; - + c = a; lockdisplay(display); /* @@ -187,7 +187,7 @@ cachedpage(Document *doc, int angle, int page) Cached *c; Image *im; int ra; - + if(doc->npage < 1) return display->white; diff --git a/src/cmd/page/gfx.c b/src/cmd/page/gfx.c index 22e08665..793d75a4 100644 --- a/src/cmd/page/gfx.c +++ b/src/cmd/page/gfx.c @@ -77,7 +77,7 @@ initgfx(Biobuf *b, int argc, char **argv, uchar *buf, int nbuf) doc = emalloc(sizeof(*doc)); gfx = emalloc(sizeof(*gfx)); gfx->g = nil; - + doc->npage = 0; doc->drawpage = gfxdrawpage; doc->pagename = gfxpagename; @@ -141,7 +141,7 @@ genaddpage(Document *doc, char *name, uchar *buf, int nbuf) memset(g, 0, sizeof *g); if(memcmp(buf, "GIF", 3) == 0) g->type = Igif; - else if(memcmp(buf, "\111\111\052\000", 4) == 0) + else if(memcmp(buf, "\111\111\052\000", 4) == 0) g->type = Itiff; else if(memcmp(buf, "\115\115\000\052", 4) == 0) g->type = Itiff; @@ -186,7 +186,7 @@ genaddpage(Document *doc, char *name, uchar *buf, int nbuf) return doc->npage++; } -static int +static int addpage(Document *doc, char *name) { return genaddpage(doc, name, nil, 0); @@ -257,7 +257,7 @@ convert(Graphic *g) if(fd < 0) { fprint(2, "cannot spawn converter: %r\n"); wexits("convert"); - } + } } im = readimage(display, fd, 0); diff --git a/src/cmd/page/gs.c b/src/cmd/page/gs.c index 5c493b35..1d60212a 100644 --- a/src/cmd/page/gs.c +++ b/src/cmd/page/gs.c @@ -1,8 +1,8 @@ /* * gs interface for page. * ps.c and pdf.c both use these routines. - * a caveat: if you run more than one gs, only the last - * one gets killed by killgs + * a caveat: if you run more than one gs, only the last + * one gets killed by killgs */ #include <u.h> #include <libc.h> @@ -88,7 +88,7 @@ spawnmonitor(void *cp) threadexits(0); } -int +int spawngs(GSInfo *g, char *safer) { Channel *cp; diff --git a/src/cmd/page/nrotate.c b/src/cmd/page/nrotate.c index 96563c3d..00d065ad 100644 --- a/src/cmd/page/nrotate.c +++ b/src/cmd/page/nrotate.c @@ -6,7 +6,7 @@ * The basic concept is that you can invert an array by * inverting the top half, inverting the bottom half, and * then swapping them. - * + * * This is usually overkill, but it speeds up slow remote * connections quite a bit. */ @@ -132,7 +132,7 @@ shuffle(Image *img, Image *tmp, int axis, int imgdim, Image *mask, int maskdim) /* * Halve the grating period in the mask. - * The grating currently looks like + * The grating currently looks like * ####____####____####____####____ * where #### is opacity. * @@ -140,7 +140,7 @@ shuffle(Image *img, Image *tmp, int axis, int imgdim, Image *mask, int maskdim) * ##__##__##__##__##__##__##__##__ * which is achieved by shifting the mask * and drawing on itself through itself. - * Draw doesn't actually allow this, so + * Draw doesn't actually allow this, so * we have to copy it first. * * ####____####____####____####____ (dst) @@ -229,7 +229,7 @@ swapadjacent(Image *img, Image *tmp, int axis, int imgdim, Image *mask, int mask /* * r0 is the lower rectangle, while r1 is the upper one. */ - draw(tmp, tmp->r, img, nil, + draw(tmp, tmp->r, img, nil, } void @@ -271,8 +271,7 @@ writefile(char *name, Image *im, int gran) snprint(buf, sizeof buf, "%d%s%d", c++, name, gran); fd = create(buf, OWRITE, 0666); if(fd < 0) - return; + return; writeimage(fd, im, 0); close(fd); } - diff --git a/src/cmd/page/page.c b/src/cmd/page/page.c index 041df26b..01ad17ff 100644 --- a/src/cmd/page/page.c +++ b/src/cmd/page/page.c @@ -41,7 +41,7 @@ watcherproc(void *v) for(;;) sleep(1000); } - + int bell(void *u, char *x) { @@ -81,7 +81,7 @@ afmt(Fmt *fmt) void usage(void) { - fprint(2, "usage: page [-biRrwf] [-p ppi] file...\n"); + fprint(2, "usage: page [-biRrwf] [-p ppi] file...\n"); wexits("usage"); } @@ -145,7 +145,7 @@ threadmain(int argc, char **argv) break; case 'f': fitwin = 1; - break; + break; default: usage(); }ARGEND; @@ -184,13 +184,13 @@ threadmain(int argc, char **argv) fprint(2, "page: short read reading %s\n", argv[0]); wexits("read"); } - + atexit(cleanup); }else if(argc != 0){ if(!(b = Bopen(argv[0], OREAD))) { fprint(2, "page: cannot open \"%s\"\n", argv[0]); wexits("open"); - } + } if(Bread(b, buf, Ninput) != Ninput) { fprint(2, "page: short read reading %s\n", argv[0]); @@ -242,7 +242,7 @@ threadmain(int argc, char **argv) wexits("initdraw"); } display->locking = 1; - + truecolor = screen->depth > 8; viewer(doc); wexits(0); diff --git a/src/cmd/page/pdf.c b/src/cmd/page/pdf.c index 2de67bc7..89df6c5e 100644 --- a/src/cmd/page/pdf.c +++ b/src/cmd/page/pdf.c @@ -1,6 +1,6 @@ /* * pdf.c - * + * * pdf file support for page */ @@ -15,7 +15,7 @@ static Image* pdfdrawpage(Document *d, int page); static char* pdfpagename(Document*, int); -char *pdfprolog = +char *pdfprolog = #include "pdfprolog.c" ; @@ -25,7 +25,7 @@ pdfbbox(GSInfo *gs) char *p; char *f[4]; Rectangle r; - + r = Rect(0,0,0,0); waitgs(gs); gscmd(gs, "/CropBox knownoget {} {[0 0 0 0]} ifelse PAGE==\n"); @@ -152,7 +152,7 @@ static char* pdfpagename(Document *d, int page) { static char str[15]; - + USED(d); sprint(str, "p %d", page+1); return str; diff --git a/src/cmd/page/ps.c b/src/cmd/page/ps.c index 84689571..eb09cc8f 100644 --- a/src/cmd/page/ps.c +++ b/src/cmd/page/ps.c @@ -1,6 +1,6 @@ /* * ps.c - * + * * provide postscript file reading support for page */ @@ -245,10 +245,10 @@ Keepreading: if(!prefix(p, "%%Page:")) continue; - /* + /* * figure out of the %%Page: line contains a page number * or some other page description to use in the menu bar. - * + * * lines look like %%Page: x y or %%Page: x * we prefer just x, and will generate our * own if necessary. diff --git a/src/cmd/page/rotate.c b/src/cmd/page/rotate.c index 3ac83a1f..2c6ea520 100644 --- a/src/cmd/page/rotate.c +++ b/src/cmd/page/rotate.c @@ -1,12 +1,12 @@ /* * rotate an image 180° in O(log Dx + log Dy) /dev/draw writes, * using an extra buffer same size as the image. - * + * * the basic concept is that you can invert an array by inverting * the top half, inverting the bottom half, and then swapping them. * the code does this slightly backwards to ensure O(log n) runtime. * (If you do it wrong, you can get O(log² n) runtime.) - * + * * This is usually overkill, but it speeds up slow remote * connections quite a bit. */ @@ -37,7 +37,7 @@ writefile(char *name, Image *im, int gran) snprint(buf, sizeof buf, "%d%s%d", c++, name, gran); fd = create(buf, OWRITE, 0666); if(fd < 0) - return; + return; writeimage(fd, im, 0); close(fd); } @@ -109,7 +109,7 @@ interlace(Image *im, Image *tmp, int axis, int n, Image *mask, int gran) /* * Halve the grating period in the mask. - * The grating currently looks like + * The grating currently looks like * ####____####____####____####____ * where #### is opacity. * @@ -117,7 +117,7 @@ interlace(Image *im, Image *tmp, int axis, int n, Image *mask, int gran) * ##__##__##__##__##__##__##__##__ * which is achieved by shifting the mask * and drawing on itself through itself. - * Draw doesn't actually allow this, so + * Draw doesn't actually allow this, so * we have to copy it first. * * ####____####____####____####____ (dst) @@ -151,7 +151,7 @@ shuffle(Image *im, Image *tmp, int axis, int n, Image *mask, int gran, interlace(im, tmp, axis, nn, mask, gran); // writefile("interlace", im, gran); - + gran = nextmask(mask, axis, gran); shuffle(im, tmp, axis, n, mask, gran, nn); // writefile("shuffle", im, gran); @@ -288,7 +288,7 @@ fac(int L) return f; } -/* +/* * i0(x) is the modified Bessel function, Σ (x/2)^2L / (L!)² * There are faster ways to calculate this, but we precompute * into a table so let's keep it simple. diff --git a/src/cmd/page/util.c b/src/cmd/page/util.c index f10ef6db..3b4655d1 100644 --- a/src/cmd/page/util.c +++ b/src/cmd/page/util.c @@ -50,7 +50,7 @@ spooltodisk(uchar *ibuf, int in, char **name) { uchar buf[8192]; int fd, n; - + strcpy(tempfile, "/tmp/pagespoolXXXXXXXXX"); fd = opentemp(tempfile, ORDWR); if(name) @@ -94,7 +94,7 @@ _stdinpipe(void *a) arg = a; if(pipe(p) < 0){ - fprint(2, "pipe fails: %r\n"); + fprint(2, "pipe fails: %r\n"); wexits("pipe"); } @@ -103,7 +103,7 @@ _stdinpipe(void *a) write(p[1], arg->ibuf, arg->in); while((n = read(stdinfd, buf, sizeof buf)) > 0) write(p[1], buf, n); - + close(p[1]); threadexits(0); } diff --git a/src/cmd/page/view.c b/src/cmd/page/view.c index 315a22a8..2696f01f 100644 --- a/src/cmd/page/view.c +++ b/src/cmd/page/view.c @@ -33,25 +33,25 @@ void plumbproc(void*); Cursor reading={ {-1, -1}, - {0xff, 0x80, 0xff, 0x80, 0xff, 0x00, 0xfe, 0x00, - 0xff, 0x00, 0xff, 0x80, 0xff, 0xc0, 0xef, 0xe0, - 0xc7, 0xf0, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0xc0, + {0xff, 0x80, 0xff, 0x80, 0xff, 0x00, 0xfe, 0x00, + 0xff, 0x00, 0xff, 0x80, 0xff, 0xc0, 0xef, 0xe0, + 0xc7, 0xf0, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0xc0, 0x03, 0xff, 0x03, 0xff, 0x03, 0xff, 0x03, 0xff, }, - {0x00, 0x00, 0x7f, 0x00, 0x7e, 0x00, 0x7c, 0x00, - 0x7e, 0x00, 0x7f, 0x00, 0x6f, 0x80, 0x47, 0xc0, - 0x03, 0xe0, 0x01, 0xf0, 0x00, 0xe0, 0x00, 0x40, + {0x00, 0x00, 0x7f, 0x00, 0x7e, 0x00, 0x7c, 0x00, + 0x7e, 0x00, 0x7f, 0x00, 0x6f, 0x80, 0x47, 0xc0, + 0x03, 0xe0, 0x01, 0xf0, 0x00, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x01, 0xb6, 0x01, 0xb6, 0x00, 0x00, } }; Cursor query = { {-7,-7}, - {0x0f, 0xf0, 0x1f, 0xf8, 0x3f, 0xfc, 0x7f, 0xfe, - 0x7c, 0x7e, 0x78, 0x7e, 0x00, 0xfc, 0x01, 0xf8, - 0x03, 0xf0, 0x07, 0xe0, 0x07, 0xc0, 0x07, 0xc0, + {0x0f, 0xf0, 0x1f, 0xf8, 0x3f, 0xfc, 0x7f, 0xfe, + 0x7c, 0x7e, 0x78, 0x7e, 0x00, 0xfc, 0x01, 0xf8, + 0x03, 0xf0, 0x07, 0xe0, 0x07, 0xc0, 0x07, 0xc0, 0x07, 0xc0, 0x07, 0xc0, 0x07, 0xc0, 0x07, 0xc0, }, - {0x00, 0x00, 0x0f, 0xf0, 0x1f, 0xf8, 0x3c, 0x3c, - 0x38, 0x1c, 0x00, 0x3c, 0x00, 0x78, 0x00, 0xf0, - 0x01, 0xe0, 0x03, 0xc0, 0x03, 0x80, 0x03, 0x80, + {0x00, 0x00, 0x0f, 0xf0, 0x1f, 0xf8, 0x3c, 0x3c, + 0x38, 0x1c, 0x00, 0x3c, 0x00, 0x78, 0x00, 0xf0, + 0x01, 0xe0, 0x03, 0xc0, 0x03, 0x80, 0x03, 0x80, 0x00, 0x00, 0x03, 0x80, 0x03, 0x80, 0x00, 0x00, } }; @@ -79,13 +79,13 @@ unhide(void) USED(nil); } -int +int max(int a, int b) { return a > b ? a : b; } -int +int min(int a, int b) { return a < b ? a : b; @@ -130,7 +130,7 @@ showpage(int page, Menu *m) m->lasthit = 0; /* this page */ else m->lasthit = reverse ? doc->npage-1-page : page; - + setcursor(mc, &reading); delayfreeimage(nil); im = cachedpage(doc, angle, page); @@ -178,7 +178,7 @@ writebitmap(void) q = basename; if(p = strchr(q, '.')) *p = 0; - + memset(name, 0, sizeof name); snprint(name, sizeof(name)-1, "%s.%d.bit", q, page+1); if(access(name, 0) >= 0) { @@ -241,7 +241,7 @@ enum{ Empty3, Exit, }; - + void viewer(Document *dd) { @@ -269,13 +269,13 @@ viewer(Document *dd) "next", "prev", "zerox", - "", + "", "reverse", "discard", "write", - "", - "quit", - 0 + "", + "quit", + 0 }; char *s; enum { @@ -287,7 +287,7 @@ viewer(Document *dd) }; Alt alts[CN+1]; Plumbmsg *pm; - + cp = chancreate(sizeof pm, 0); assert(cp); @@ -483,7 +483,7 @@ viewer(Document *dd) setcursor(mc, &query); sleep(1000); setcursor(mc, nil); - break; + break; } break; @@ -494,7 +494,7 @@ viewer(Document *dd) xy0 = oxy; do { dxy = subpt(m.xy, oxy); - oxy = m.xy; + oxy = m.xy; translate(dxy); recv(mc->c, &m); } while(m.buttons == Left); @@ -503,7 +503,7 @@ viewer(Document *dd) translate(dxy); } break; - + case Middle: if(doc->npage == 0) break; @@ -524,7 +524,7 @@ viewer(Document *dd) if((page >= doc->npage) && !doc->fwdonly) return; - + showpage(page, &menu); nxt = 0; break; @@ -540,7 +540,7 @@ viewer(Document *dd) if((page >= doc->npage) && !doc->fwdonly && !reverse) return; - + showpage(page, &menu); nxt = 0; break; @@ -565,7 +565,7 @@ viewer(Document *dd) showpage(page, &menu); } break; - } + } else{ /* image */ double delta; Rectangle r; @@ -581,8 +581,8 @@ viewer(Document *dd) delta = (double)Dy(im->r)/(double)Dy(r); setcursor(mc, &reading); - tmp = xallocimage(display, - Rect(0, 0, (int)((double)Dx(im->r)*delta), (int)((double)Dy(im->r)*delta)), + tmp = xallocimage(display, + Rect(0, 0, (int)((double)Dx(im->r)*delta), (int)((double)Dy(im->r)*delta)), im->chan, 0, DBlack); if(tmp == nil) { fprint(2, "out of memory during zoom: %r\n"); @@ -639,7 +639,7 @@ viewer(Document *dd) break; reverse = !reverse; menu.lasthit = doc->npage-1-menu.lasthit; - + if(page == 0 || page == doc->npage-1) { page = doc->npage-1-page; showpage(page, &menu); @@ -672,10 +672,10 @@ viewer(Document *dd) case Empty3: break; - }; + }; + + - - case Right: if(doc->npage == 0) break; @@ -684,7 +684,7 @@ viewer(Document *dd) n = menuhit(RMenu, mc, &menu, nil); if(n == -1) break; - + if(doc->fwdonly) { switch(n){ case 0: /* this page */ @@ -697,12 +697,12 @@ viewer(Document *dd) } break; } - + if(n == doc->npage) return; else page = reverse ? doc->npage-1-n : n; - + if(oldpage != page) showpage(page, &menu); nxt = 0; @@ -753,7 +753,7 @@ Image *gray; * mp and sp get aligned with bot.min. */ static void -gendrawdiff(Image *dst, Rectangle bot, Rectangle top, +gendrawdiff(Image *dst, Rectangle bot, Rectangle top, Image *src, Point sp, Image *mask, Point mp, int op) { Rectangle r; @@ -890,7 +890,7 @@ redraw(Image *screen) } } border(screen, r, -4000, gray, ZP); -// flushimage(display, 0); +// flushimage(display, 0); } /* clip p to be in r */ @@ -911,7 +911,7 @@ pclip(Point p, Rectangle r) } /* - * resize is perhaps a misnomer. + * resize is perhaps a misnomer. * this really just grows the window to be at least dx across * and dy high. if the window hits the bottom or right edge, * it is backed up until it hits the top or left edge. diff --git a/src/cmd/paint/eenter.c b/src/cmd/paint/eenter.c index 6645820c..6c84f2fb 100644 --- a/src/cmd/paint/eenter.c +++ b/src/cmd/paint/eenter.c @@ -255,4 +255,3 @@ nodraw: return n; } - diff --git a/src/cmd/paint/paint.c b/src/cmd/paint/paint.c index 7dce3710..e7f502cf 100644 --- a/src/cmd/paint/paint.c +++ b/src/cmd/paint/paint.c @@ -97,7 +97,7 @@ strokedraw(Image *dst, Rectangle r, Image *ink, int brush) * mp and sp get aligned with bot.min. */ static void -gendrawdiff(Image *dst, Rectangle bot, Rectangle top, +gendrawdiff(Image *dst, Rectangle bot, Rectangle top, Image *src, Point sp, Image *mask, Point mp, int op) { Rectangle r; @@ -482,7 +482,7 @@ center(void) { cpos = ZP; if(canvas) - cpos = addpt(canvas->r.min, + cpos = addpt(canvas->r.min, divpt(subpt(canvas->r.max, canvas->r.min), 2)); spos = addpt(screen->r.min, divpt(subpt(screen->r.max, screen->r.min), 2)); @@ -633,7 +633,7 @@ main(int argc, char *argv[]) if(argc == 1) filename = strdup(argv[0]); else if(argc != 0) - usage(); + usage(); if(initdraw(0, 0, "paint") < 0) sysfatal("initdraw: %r"); diff --git a/src/cmd/pbd.c b/src/cmd/pbd.c index 2e859f84..f4105bf3 100644 --- a/src/cmd/pbd.c +++ b/src/cmd/pbd.c @@ -16,4 +16,4 @@ main(void) } write(1, p, strlen(p)); exits(0); -} +} diff --git a/src/cmd/pic/arcgen.c b/src/cmd/pic/arcgen.c index bec41e47..4cb16957 100644 --- a/src/cmd/pic/arcgen.c +++ b/src/cmd/pic/arcgen.c @@ -221,4 +221,3 @@ quadrant(double x, double y) else if( x> 0.0 && y<=0.0) return(4); else return 0; /* shut up lint */ } - diff --git a/src/cmd/pic/linegen.c b/src/cmd/pic/linegen.c index e0db5fc6..bc7e9335 100644 --- a/src/cmd/pic/linegen.c +++ b/src/cmd/pic/linegen.c @@ -225,7 +225,7 @@ obj *linegen(int type) extreme(ex, ey); nx = xi; ny = yi; } - + } p->o_ddval = ddval; if (dbg) { diff --git a/src/cmd/pic/misc.c b/src/cmd/pic/misc.c index e888fafc..1e2db1b5 100644 --- a/src/cmd/pic/misc.c +++ b/src/cmd/pic/misc.c @@ -34,7 +34,7 @@ curdir(void) /* convert current dir (hvmode) to RIGHT, LEFT, etc. */ return 0; } -double +double getcomp(obj *p, int t) /* return component of a position */ { switch (t) { diff --git a/src/cmd/plot/libplot/circ.c b/src/cmd/plot/libplot/circ.c index 53337117..d4b6699f 100644 --- a/src/cmd/plot/libplot/circ.c +++ b/src/cmd/plot/libplot/circ.c @@ -4,7 +4,7 @@ void circ(double xc, double yc, double r){ int rad; p.x=SCX(xc); p.y=SCY(yc); - if (r < 0) + if (r < 0) rad=SCR(-r); else rad=SCR(r); diff --git a/src/cmd/plot/libplot/disk.c b/src/cmd/plot/libplot/disk.c index 47b39012..6255efa5 100644 --- a/src/cmd/plot/libplot/disk.c +++ b/src/cmd/plot/libplot/disk.c @@ -4,7 +4,7 @@ void plotdisc(double xc, double yc, double r){ int rad; p.x=SCX(xc); p.y=SCY(yc); - if (r < 0) + if (r < 0) rad=SCR(-r); else rad=SCR(r); diff --git a/src/cmd/plot/libplot/move.c b/src/cmd/plot/libplot/move.c index 4e60260b..11cdcfcb 100644 --- a/src/cmd/plot/libplot/move.c +++ b/src/cmd/plot/libplot/move.c @@ -1,5 +1,5 @@ #include "mplot.h" void move(double xx, double yy){ - e1->copyx = xx; + e1->copyx = xx; e1->copyy = yy; } diff --git a/src/cmd/plot/libplot/parabola.c b/src/cmd/plot/libplot/parabola.c index 212b9c97..d8b5ffb2 100644 --- a/src/cmd/plot/libplot/parabola.c +++ b/src/cmd/plot/libplot/parabola.c @@ -5,13 +5,13 @@ void parabola(double x0, double y0, double x1, double y1, double xb, double yb){ double dt, d2, d1; d1 = sqrt((xb - x0) * (xb - x0) + (yb - y0) * (yb - y0)); d2 = sqrt((xb - x1) * (xb - x1) + (yb - y1) * (yb - y1)); - if (d1 <= e1->quantum || d2 <= e1->quantum) { - plotline(x0, y0, x1, y1); - return; + if (d1 <= e1->quantum || d2 <= e1->quantum) { + plotline(x0, y0, x1, y1); + return; } - c0x = x0 + x1 - 2. * xb; + c0x = x0 + x1 - 2. * xb; c1x = 2. * (xb - x0); - c0y = y0 + y1 - 2. * yb; + c0y = y0 + y1 - 2. * yb; c1y = 2. * (yb - y0); move(x0, y0); dt = e1->quantum / d1; diff --git a/src/cmd/plot/libplot/ppause.c b/src/cmd/plot/libplot/ppause.c index 9fb8863d..993a7b20 100644 --- a/src/cmd/plot/libplot/ppause.c +++ b/src/cmd/plot/libplot/ppause.c @@ -1,7 +1,7 @@ #include "mplot.h" -void ppause(void){ - char aa[4]; - fflush(stdout); - read(0, aa, 4); - erase(); +void ppause(void){ + char aa[4]; + fflush(stdout); + read(0, aa, 4); + erase(); } diff --git a/src/cmd/plot/libplot/rarc.c b/src/cmd/plot/libplot/rarc.c index 9c8ccf15..c0c8c6b3 100644 --- a/src/cmd/plot/libplot/rarc.c +++ b/src/cmd/plot/libplot/rarc.c @@ -12,31 +12,31 @@ void rarc(double x1, double y1, double x2, double y2, double xc, double yc, doub dx = x1 - xc; dy = y1 - yc; rd = sqrt(dx * dx + dy * dy); - if (rd / e1->quantum < 1.0) { - move(xc, yc); - vec(xc, yc); + if (rd / e1->quantum < 1.0) { + move(xc, yc); + vec(xc, yc); return; } dph = acos(1.0 - (e1->quantum / rd)); - if (dph > PI4) + if (dph > PI4) dph = PI4; ph=atan2((y2-yc),(x2 - xc)) - atan2(dy, dx); - if (ph < 0) - ph += 6.2832; - if (rr < 0) + if (ph < 0) + ph += 6.2832; + if (rr < 0) ph = 6.2832 - ph; - if (ph < dph) + if (ph < dph) plotline(x1, y1, x2, y2); else { - n = ph / dph; - a = cos(dph); - b = sin(dph); - if (rr < 0) + n = ph / dph; + a = cos(dph); + b = sin(dph); + if (rr < 0) b = -b; move(x1, y1); while ((n--) >= 0) { - xnext = dx * a - dy * b; - dy = dx * b + dy * a; + xnext = dx * a - dy * b; + dy = dx * b + dy * a; dx = xnext; vec(dx + xc, dy + yc); } diff --git a/src/cmd/plot/libplot/save.c b/src/cmd/plot/libplot/save.c index e3dc4058..0f12b636 100644 --- a/src/cmd/plot/libplot/save.c +++ b/src/cmd/plot/libplot/save.c @@ -1,5 +1,5 @@ #include "mplot.h" -void save(void){ - sscpy(e1, e1 + 1); - e1++; +void save(void){ + sscpy(e1, e1 + 1); + e1++; } diff --git a/src/cmd/plot/libplot/spline.c b/src/cmd/plot/libplot/spline.c index 8cfa83d7..6001bd72 100644 --- a/src/cmd/plot/libplot/spline.c +++ b/src/cmd/plot/libplot/spline.c @@ -10,25 +10,25 @@ void splin(int mode, int num[], double *ff[]){ np = num; fp = ff; while((n = *np++)){ - xp = *fp++; - yp = xp + 1; - xp0 = xp; + xp = *fp++; + yp = xp + 1; + xp0 = xp; yp0 = yp; - xpe = xp0 + 2 * (n - 1); + xpe = xp0 + 2 * (n - 1); ype = yp0 + 2 * (n - 1); - if (n < 3) { - plotline(*xp, *yp, *(xp + 2), *(yp + 2)); + if (n < 3) { + plotline(*xp, *yp, *(xp + 2), *(yp + 2)); continue; } if (mode == 4) { /*closed curve*/ - xa = 0.5 * (*xpe + *(xpe - 2)); + xa = 0.5 * (*xpe + *(xpe - 2)); xc = 0.5 * (*xpe + *xp0); - ya = 0.5 * (*ype + *(ype - 2)); + ya = 0.5 * (*ype + *(ype - 2)); yc = 0.5 * (*ype + *yp0); parabola(xa, ya, xc, yc, *xpe, *ype); - xa = 0.5 * (*xpe + *xp0); + xa = 0.5 * (*xpe + *xp0); xc = 0.5 * (*(xp0 + 2) + *xp0); - ya = 0.5 * (*ype + *yp0); + ya = 0.5 * (*ype + *yp0); yc = 0.5 * (*(yp0 + 2) + *yp0); parabola(xa, ya, xc, yc, *xp0, *yp0); } @@ -36,12 +36,12 @@ void splin(int mode, int num[], double *ff[]){ if (mode % 2) /*odd mode makes first point double*/ plotline(*xp0,*yp0,0.5*(*xp0+*(xp0+2)),0.5*(*yp0+*(yp0+2))); } - xp += 2; + xp += 2; yp += 2; for (i = 1; i < (n - 1); i++, xp += 2, yp += 2) { - xa = 0.5 * (*(xp - 2) + *xp); + xa = 0.5 * (*(xp - 2) + *xp); xc = 0.5 * ( *xp + *(xp + 2)); - ya = 0.5 * (*(yp - 2) + *yp); + ya = 0.5 * (*(yp - 2) + *yp); yc = 0.5 * ( *yp + *(yp + 2)); parabola(xa, ya, xc, yc, *xp, *yp); } diff --git a/src/cmd/plot/libplot/subr.c b/src/cmd/plot/libplot/subr.c index 2b41990d..62333edf 100644 --- a/src/cmd/plot/libplot/subr.c +++ b/src/cmd/plot/libplot/subr.c @@ -22,28 +22,28 @@ bcolor(char *s){ return(DBlack); case 'r': return(DRed); - case 'g': + case 'g': return(DGreen); - case 'b': + case 'b': return(DBlue); - case 'm': + case 'm': return(DMagenta); - case 'y': + case 'y': return(DYellow); - case 'c': + case 'c': return(DCyan); - case 'w': + case 'w': return(DWhite); - case 'R': + case 'R': return(atoi(s + 1)); - case 'G': - e1->pgap = atof(s + 1); + case 'G': + e1->pgap = atof(s + 1); return(-1); - case 'A': - e1->pslant = (180. - atof(s + 1)) / RADIAN; + case 'A': + e1->pslant = (180. - atof(s + 1)) / RADIAN; return(-1); } - while (*++s != 0) + while (*++s != 0) if (*s == '/') { s++; break; @@ -52,20 +52,20 @@ bcolor(char *s){ return DBlack; } void sscpy(struct penvir *a, struct penvir *b){ /* copy 'a' onto 'b' */ - b->left = a->left; - b->bottom = a->bottom; - b->xmin = a->xmin; + b->left = a->left; + b->bottom = a->bottom; + b->xmin = a->xmin; b->ymin = a->ymin; - b->scalex = a->scalex; + b->scalex = a->scalex; b->scaley = a->scaley; - b->sidex = a->sidex; + b->sidex = a->sidex; b->sidey = a->sidey; - b->copyx = a->copyx; + b->copyx = a->copyx; b->copyy = a->copyy; b->quantum = a->quantum; b->grade = a->grade; - b->pmode = a->pmode; - b->foregr = a->foregr; + b->pmode = a->pmode; + b->foregr = a->foregr; b->backgr = a->backgr; } void idle(void){} diff --git a/src/cmd/plot/plot.c b/src/cmd/plot/plot.c index 8b62387b..f87e228b 100644 --- a/src/cmd/plot/plot.c +++ b/src/cmd/plot/plot.c @@ -559,7 +559,7 @@ void call(char *a){ exits("undefined"); } *ap = sav; - while (isspace((uchar)*ap) || *ap == ',') + while (isspace((uchar)*ap) || *ap == ',') ap++; if (*ap != '\0') SC = atof(ap); diff --git a/src/cmd/plumb/match.c b/src/cmd/plumb/match.c index 5a4cd88c..13ebe768 100644 --- a/src/cmd/plumb/match.c +++ b/src/cmd/plumb/match.c @@ -309,7 +309,7 @@ Exec* newexec(Plumbmsg *m) { Exec *exec; - + exec = emalloc(sizeof(Exec)); exec->msg = m; exec->p0 = -1; @@ -331,7 +331,7 @@ rewrite(Plumbmsg *m, Exec *e) else prev->next = a->next; free(a->name); - free(a->value); + free(a->value); free(a); break; } diff --git a/src/cmd/postscript/common/bbox.c b/src/cmd/postscript/common/bbox.c index b6807a4d..2dc55cbb 100644 --- a/src/cmd/postscript/common/bbox.c +++ b/src/cmd/postscript/common/bbox.c @@ -259,4 +259,3 @@ concat(m1) } /* End of concat */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/common/comments.h b/src/cmd/postscript/common/comments.h index 6b409cad..0bbf5902 100644 --- a/src/cmd/postscript/common/comments.h +++ b/src/cmd/postscript/common/comments.h @@ -124,4 +124,3 @@ #define ENDPAGE "%%EndPage:" #define FORMSPERPAGE "%%FormsPerPage:" #define VERSION "%%Version:" - diff --git a/src/cmd/postscript/common/common.h b/src/cmd/postscript/common/common.h index f49f6f1f..7b267668 100644 --- a/src/cmd/postscript/common/common.h +++ b/src/cmd/postscript/common/common.h @@ -45,4 +45,3 @@ void *galloc(void *, int, char *); void pagelist(char *); int safe_tmpnam(char*); - diff --git a/src/cmd/postscript/common/ext.h b/src/cmd/postscript/common/ext.h index 77635b6b..75bea5b5 100644 --- a/src/cmd/postscript/common/ext.h +++ b/src/cmd/postscript/common/ext.h @@ -33,7 +33,7 @@ extern void interrupt(int); extern int cat(char*); extern void concat(double*); -/* +/* * extern char *tempnam(char*,char*); * extern char *malloc(); * extern char *calloc(); diff --git a/src/cmd/postscript/common/gen.h b/src/cmd/postscript/common/gen.h index dffeb957..1553c2c4 100644 --- a/src/cmd/postscript/common/gen.h +++ b/src/cmd/postscript/common/gen.h @@ -66,4 +66,3 @@ extern char* safe_tempnam(char*, char*); #define ABS(A) ((A) >= 0 ? (A) : -(A)) #define MIN(A, B) ((A) < (B) ? (A) : (B)) #define MAX(A, B) ((A) > (B) ? (A) : (B)) - diff --git a/src/cmd/postscript/common/glob.c b/src/cmd/postscript/common/glob.c index 2826f4e5..31de6b4d 100644 --- a/src/cmd/postscript/common/glob.c +++ b/src/cmd/postscript/common/glob.c @@ -26,4 +26,3 @@ double pagewidth = PAGEWIDTH; int reading = UTFENCODING; /* input */ int writing = WRITING; /* and output encoding */ - diff --git a/src/cmd/postscript/common/misc.c b/src/cmd/postscript/common/misc.c index 28120ea5..81444465 100644 --- a/src/cmd/postscript/common/misc.c +++ b/src/cmd/postscript/common/misc.c @@ -238,4 +238,3 @@ void interrupt(sig) } /* End of interrupt */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/common/path.h b/src/cmd/postscript/common/path.h index f2019c1e..6e456bb2 100644 --- a/src/cmd/postscript/common/path.h +++ b/src/cmd/postscript/common/path.h @@ -29,4 +29,3 @@ #define FONTDIR "#9/troff/font" #define POSTLIBDIR "#9/postscript/prologues" #define TEMPDIR "/var/tmp" - diff --git a/src/cmd/postscript/common/request.c b/src/cmd/postscript/common/request.c index ba956d57..2e96093b 100644 --- a/src/cmd/postscript/common/request.c +++ b/src/cmd/postscript/common/request.c @@ -127,4 +127,3 @@ dumprequest(want, file, fp_out) } /* End of dumprequest */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/common/request.h b/src/cmd/postscript/common/request.h index 25d94d01..6898ffd0 100644 --- a/src/cmd/postscript/common/request.h +++ b/src/cmd/postscript/common/request.h @@ -19,4 +19,3 @@ typedef struct { int page; char *file; } Request; - diff --git a/src/cmd/postscript/download/download.c b/src/cmd/postscript/download/download.c index 31aa1b3b..4c8f6ffb 100644 --- a/src/cmd/postscript/download/download.c +++ b/src/cmd/postscript/download/download.c @@ -565,4 +565,3 @@ Map *allocate(ptr, num) } /* End of allocate */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/download/download.h b/src/cmd/postscript/download/download.h index f88cc57a..3e8ac6ff 100644 --- a/src/cmd/postscript/download/download.h +++ b/src/cmd/postscript/download/download.h @@ -11,4 +11,3 @@ typedef struct map { } Map; Map *allocate(); - diff --git a/src/cmd/postscript/misc/ibmfont.c b/src/cmd/postscript/misc/ibmfont.c index 49736d6f..99d2f64c 100644 --- a/src/cmd/postscript/misc/ibmfont.c +++ b/src/cmd/postscript/misc/ibmfont.c @@ -8,7 +8,7 @@ * * where font.ibm is the font file, exactly as it came over from an IBM PC, * and font.unix is equivalent host resident font file usable on Unix systems. - * + * */ #include <stdio.h> @@ -212,7 +212,7 @@ asciitext(count) ch = '\n'; putc(ch, fp_out); } /* End for */ - + } /* End of asciitext */ /*****************************************************************************/ @@ -238,7 +238,7 @@ hexdata(count) if ( (++n % 40) == 0 ) putc('\n', fp_out); } /* End for */ - + } /* End of hexdata */ /*****************************************************************************/ @@ -263,7 +263,7 @@ getint() return(val); -} /* End of getint */ +} /* End of getint */ /*****************************************************************************/ @@ -293,4 +293,3 @@ error(kind, mesg, a1, a2, a3) } /* End of error */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/misc/laserbar.c b/src/cmd/postscript/misc/laserbar.c index 7b45e667..7818fc1d 100644 --- a/src/cmd/postscript/misc/laserbar.c +++ b/src/cmd/postscript/misc/laserbar.c @@ -13,13 +13,13 @@ static int code39[256] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* sp ! " # $ % & ' */ - 0304, 0, 0, 0, 0250, 0052, 0, 0, + 0304, 0, 0, 0, 0250, 0052, 0, 0, /* ( ) * + , - - / */ 0, 0, 0224, 0212, 0, 0205, 0604, 0242, /* 0 1 2 3 4 5 6 7 */ 0064, 0441, 0141, 0540, 0061, 0460, 0160, 0045, /* 8 9 : ; < = > ? */ - 0444, 0144, 0, 0, 0, 0, 0, 0, + 0444, 0144, 0, 0, 0, 0, 0, 0, /* @ A B C D E F G */ 0, 0411, 0111, 0510, 0031, 0430, 0130, 0015, /* H I J K L M N O */ diff --git a/src/cmd/postscript/misc/macfont.c b/src/cmd/postscript/misc/macfont.c index 59244a19..d0c9cb78 100644 --- a/src/cmd/postscript/misc/macfont.c +++ b/src/cmd/postscript/misc/macfont.c @@ -8,7 +8,7 @@ * * where font.mac is the font file, exactly as it came over from a Macintosh, * and font.unix is equivalent host resident font file usable on Unix systems. - * + * */ #include <stdio.h> @@ -215,7 +215,7 @@ asciitext(count) ch = '\n'; putc(ch, fp_out); } /* End for */ - + } /* End of asciitext */ /*****************************************************************************/ @@ -241,7 +241,7 @@ hexdata(count) if ( (++n % 40) == 0 ) putc('\n', fp_out); } /* End for */ - + } /* End of hexdata */ /*****************************************************************************/ @@ -265,7 +265,7 @@ getint() return(val); -} /* End of getint */ +} /* End of getint */ /*****************************************************************************/ @@ -296,4 +296,3 @@ error(kind, mesg, a1, a2, a3) } /* End of error */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/misc/pscrypt.c b/src/cmd/postscript/misc/pscrypt.c index 1715288b..520daf33 100644 --- a/src/cmd/postscript/misc/pscrypt.c +++ b/src/cmd/postscript/misc/pscrypt.c @@ -332,4 +332,3 @@ Getc(fp) } /* End of Getc */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/postreverse/postreverse.c b/src/cmd/postscript/postreverse/postreverse.c index d99124d5..56310520 100644 --- a/src/cmd/postscript/postreverse/postreverse.c +++ b/src/cmd/postscript/postreverse/postreverse.c @@ -364,7 +364,7 @@ moreprolog(str) * up being copied to the output file and FALSE will be returned to the caller. * The first call (made from reverse()) looks for ENDPROLOG. Any other call comes * from readpages() and will be looking for the ENDSETUP comment. - * + * */ len = strlen(FORMSPERPAGE); @@ -541,4 +541,3 @@ trailer() } /* End of trailer */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/postreverse/postreverse.h b/src/cmd/postscript/postreverse/postreverse.h index edae7a27..a78ff4e8 100644 --- a/src/cmd/postscript/postreverse/postreverse.h +++ b/src/cmd/postscript/postreverse/postreverse.h @@ -18,4 +18,3 @@ typedef struct { */ char *copystdin(); - diff --git a/src/cmd/postscript/tr2post/Bgetfield.c b/src/cmd/postscript/tr2post/Bgetfield.c index 5e49e55e..f9fbfd76 100644 --- a/src/cmd/postscript/tr2post/Bgetfield.c +++ b/src/cmd/postscript/tr2post/Bgetfield.c @@ -22,7 +22,7 @@ Bskipws(Biobuf *bp) { do { r = Bgetrune(bp); if (r == '\n') inputlineno++; - sindex++; + sindex++; } while (r>=0 && isspace(r)); if (r<0) { return(-1); @@ -49,7 +49,7 @@ asc2dig(char c, int base) { } /* get a string of type: "d" for decimal integer, "u" for unsigned, - * "s" for string", "c" for char, + * "s" for string", "c" for char, * return the number of characters gotten for the field. If nothing * was gotten and the end of file was reached, a negative value * from the Bgetrune is returned. @@ -86,7 +86,7 @@ Bgetfield(Biobuf *bp, int type, void *thing, int size) { case '0': base = 8; continue; - default: + default: break; } break; @@ -96,7 +96,7 @@ Bgetfield(Biobuf *bp, int type, void *thing, int size) { continue; } } - if ((dig = asc2dig(r, base)) == -1) bailout = TRUE; + if ((dig = asc2dig(r, base)) == -1) bailout = TRUE; else n = dig + (n * base); } if (r < 0) return(-1); @@ -118,7 +118,7 @@ Bgetfield(Biobuf *bp, int type, void *thing, int size) { continue; } } - if ((dig = asc2dig(r, base)) == -1) bailout = TRUE; + if ((dig = asc2dig(r, base)) == -1) bailout = TRUE; else u = dig + (n * base); } *(int *)thing = u; diff --git a/src/cmd/postscript/tr2post/chartab.c b/src/cmd/postscript/tr2post/chartab.c index 11d1ae85..4b4f4ef0 100644 --- a/src/cmd/postscript/tr2post/chartab.c +++ b/src/cmd/postscript/tr2post/chartab.c @@ -272,7 +272,7 @@ readtroffmetric(char *fontname, int trindex) { if (*cp == 0) *cp = galloc(0, sizeof(struct charent), "readtroffmetric:charent"); (*cp)->postfontid = thisfont; - (*cp)->postcharid = thischar; + (*cp)->postcharid = thischar; (*cp)->troffcharwidth = ntoken; (*cp)->name = galloc(0, 2, "readtroffmetric: char name"); (*cp)->next = 0; @@ -283,7 +283,7 @@ readtroffmetric(char *fontname, int trindex) { line++; break; } - if (!errorflg) { + if (!errorflg) { line++; } } while(!errorflg && rv>=0); @@ -351,7 +351,7 @@ flush: } if (*cp == 0) *cp = galloc(0, sizeof(struct charent), "readtroffmetric:charent"); (*cp)->postfontid = RUNEGETGROUP(charnum); - (*cp)->postcharid = RUNEGETCHAR(charnum); + (*cp)->postcharid = RUNEGETCHAR(charnum); (*cp)->troffcharwidth = width; (*cp)->name = galloc(0, strlen(stoken)+1, "readtroffmetric: char name"); (*cp)->next = 0; diff --git a/src/cmd/postscript/tr2post/devcntl.c b/src/cmd/postscript/tr2post/devcntl.c index f0a9800a..ad3abbaf 100644 --- a/src/cmd/postscript/tr2post/devcntl.c +++ b/src/cmd/postscript/tr2post/devcntl.c @@ -175,4 +175,3 @@ devcntl(Biobuf *inp) { while ((c = Bgetc(inp)) != '\n' && c != Beof); inputlineno++; } - diff --git a/src/cmd/postscript/tr2post/draw.c b/src/cmd/postscript/tr2post/draw.c index a7f6b223..b8bda78d 100644 --- a/src/cmd/postscript/tr2post/draw.c +++ b/src/cmd/postscript/tr2post/draw.c @@ -220,7 +220,7 @@ drawpath(char *buf, int copy) { * was expected to be legitimate PostScript that manipulated the current path. * The old escape sequence will be supported for a while (for Ravi), and always * call this routine with copy set to TRUE. - * + * * */ diff --git a/src/cmd/postscript/tr2post/readDESC.c b/src/cmd/postscript/tr2post/readDESC.c index 366bae70..90b7b882 100644 --- a/src/cmd/postscript/tr2post/readDESC.c +++ b/src/cmd/postscript/tr2post/readDESC.c @@ -71,7 +71,7 @@ readDESC(void) { printdesclang=galloc(printdesclang, strlen(token)+1, "readdesc:"); strcpy(printdesclang, token); if (debug) Bprint(Bstderr, "PDL %s\n", token); - break; + break; case 1: encoding=galloc(encoding, strlen(token)+1, "readdesc:"); strcpy(encoding, token); @@ -85,7 +85,7 @@ readDESC(void) { } fontmnt = atoi(token) + 1; fontmtab = galloc(fontmtab, fontmnt*sizeof(char *), "readdesc:"); - + for (i=0; i<fontmnt; i++) fontmtab[i] = 0; fontindex = 0; diff --git a/src/cmd/postscript/tr2post/tr2post.c b/src/cmd/postscript/tr2post/tr2post.c index 5ca1b328..3f28e8d5 100644 --- a/src/cmd/postscript/tr2post/tr2post.c +++ b/src/cmd/postscript/tr2post/tr2post.c @@ -139,7 +139,7 @@ main(int argc, char *argv[]) { } atexit(cleanup); Bstdout = bstdout; /* &bstdout->Biobufhdr; */ - + ARGBEGIN{ case 'a': /* aspect ratio */ aspectratio = atof(ARGF()); @@ -239,7 +239,7 @@ main(int argc, char *argv[]) { exits("read"); } finish(); - + exits(""); return 0; } diff --git a/src/cmd/postscript/tr2post/utils.c b/src/cmd/postscript/tr2post/utils.c index f914a1c8..7f00dbd4 100644 --- a/src/cmd/postscript/tr2post/utils.c +++ b/src/cmd/postscript/tr2post/utils.c @@ -47,7 +47,7 @@ hmot(int x) { if (delta == troffontab[curtrofffontid].spacewidth*fontsize/10 && isinstring()) { if (pageon()) runeout(' '); } else { - if (pageon()) { + if (pageon()) { endstring(); /* Bprint(Bstdout, " %d 0 rmoveto ", delta); */ /* Bprint(Bstdout, " %d %d m ", hpos+x, vpos); */ @@ -160,7 +160,7 @@ if (debug) fprint(2, " looking through special fonts: trying %s\n", troffontab[f if (*cp != 0) goto foundit; } } - + if (*cp == 0) { error(WARNING, "cannot find glyph, rune=0x%x stoken=<%s> troff font %s\n", rune, stoken, troffontab[curtrofffontid].trfontid); @@ -174,7 +174,7 @@ foundit: Bprint(Bstderr, "runeout(0x%x)<%C> postfontid=0x%x postcharid=0x%x troffcharwidth=%d\n", rune, rune, (*cp)->postfontid, (*cp)->postcharid, (*cp)->troffcharwidth); } - + tfp = &(troffontab[fontid]); for (i=0; i<tfp->psfmapsize; i++) { psfp = &(tfp->psfmap[i]); diff --git a/src/cmd/proof/font.c b/src/cmd/proof/font.c index d930f34c..5cd68623 100644 --- a/src/cmd/proof/font.c +++ b/src/cmd/proof/font.c @@ -108,12 +108,12 @@ dochar(Rune r[]) string(screen, p, display->black, ZP, f, s); } -static int drawlog2[] = { - 0, 0, - 1, 1, - 2, 2, 2, 2, - 3, 3, 3, 3, 3, 3, 3, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, +static int drawlog2[] = { + 0, 0, + 1, 1, + 2, 2, 2, 2, + 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5 }; diff --git a/src/cmd/proof/htroff.c b/src/cmd/proof/htroff.c index d591d384..c12fe91e 100644 --- a/src/cmd/proof/htroff.c +++ b/src/cmd/proof/htroff.c @@ -302,8 +302,8 @@ readpage(void) static void spline(Image *b, int n, Point *pp) { - long w, t1, t2, t3, fac=1000; - int i, j, steps=10; + long w, t1, t2, t3, fac=1000; + int i, j, steps=10; Point p, q; for (i = n; i > 0; i--) @@ -321,9 +321,9 @@ spline(Image *b, int n, Point *pp) t2 = 3*fac/4 - w * w / fac; w = w - fac/2; t3 = w * w / (2*fac); - q.x = (t1*pp[i+2].x + t2*pp[i+1].x + + q.x = (t1*pp[i+2].x + t2*pp[i+1].x + t3*pp[i].x + fac/2) / fac; - q.y = (t1*pp[i+2].y + t2*pp[i+1].y + + q.y = (t1*pp[i+2].y + t2*pp[i+1].y + t3*pp[i].y + fac/2) / fac; line(b, p, q, 0, 0, 0, display->black, ZP); p = q; diff --git a/src/cmd/proof/main.c b/src/cmd/proof/main.c index 5e0c804c..e8c18f87 100644 --- a/src/cmd/proof/main.c +++ b/src/cmd/proof/main.c @@ -43,7 +43,7 @@ main(int argc, char *argv[]) { char c; int dotrack = 0; - + libfont = unsharp(libfont); ARGBEGIN{ case 'm': /* magnification */ @@ -96,7 +96,7 @@ main(int argc, char *argv[]) loadfontname(c, "??"); mapscreen(); clearscreen(); - readpage(); + readpage(); } /* diff --git a/src/cmd/ramfs.c b/src/cmd/ramfs.c index 6e00c894..42a38e81 100644 --- a/src/cmd/ramfs.c +++ b/src/cmd/ramfs.c @@ -900,4 +900,3 @@ usage(void) fprint(2, "usage: %s [-is] [-m mountpoint]\n", argv0); exits("usage"); } - diff --git a/src/cmd/rc/exec.c b/src/cmd/rc/exec.c index 03c96d49..172acfa3 100644 --- a/src/cmd/rc/exec.c +++ b/src/cmd/rc/exec.c @@ -135,7 +135,7 @@ main(int argc, char *argv[]) code bootstrap[32]; char num[12], *rcmain; int i; - + /* needed for rcmain later */ putenv("PLAN9", unsharp("#9")); @@ -690,7 +690,7 @@ word* copynwords(word *a, word *tail, int n) { word *v, **end; - + v = 0; end = &v; while(n-- > 0){ diff --git a/src/cmd/rc/havefork.c b/src/cmd/rc/havefork.c index dc0ca2e8..63f83354 100644 --- a/src/cmd/rc/havefork.c +++ b/src/cmd/rc/havefork.c @@ -37,11 +37,11 @@ Xasync(void) * ssh foo & will reopen /dev/tty, try to read a password, * get a signal, and repeat, in a tight loop, forever. * Arguably this is a bug in ssh (it behaves the same - * way under bash as under rc) but I'm fixing it here + * way under bash as under rc) but I'm fixing it here * anyway. If we dissociate the process from the tty, * then it won't be able to open /dev/tty ever again. * The SIG_IGN on SIGTTOU makes writing the tty - * (via fd 1 or 2, for example) succeed even though + * (via fd 1 or 2, for example) succeed even though * our pgrp is not the terminal's controlling pgrp. */ if((tty = open("/dev/tty", OREAD)) >= 0){ diff --git a/src/cmd/rc/lex.c b/src/cmd/rc/lex.c index d9369e5c..973ddee8 100644 --- a/src/cmd/rc/lex.c +++ b/src/cmd/rc/lex.c @@ -50,7 +50,7 @@ advance(void) } /* * read a character from the input stream - */ + */ int getnext(void) diff --git a/src/cmd/rc/plan9ish.c b/src/cmd/rc/plan9ish.c index da9d8679..d52def7d 100644 --- a/src/cmd/rc/plan9ish.c +++ b/src/cmd/rc/plan9ish.c @@ -343,7 +343,7 @@ char **mkenv(){ } *ep=0; qsort((char *)env, nvar, sizeof ep[0], cmpenv); - return env; + return env; } void Updenv(void){} void Execute(word *args, word *path) @@ -556,7 +556,7 @@ int exitcode(char *msg) { int n; - + n = atoi(msg); if(n == 0) n = 1; @@ -579,7 +579,7 @@ void delwaitpid(int pid) { int r, w; - + for(r=w=0; r<nwaitpids; r++) if(waitpids[r] != pid) waitpids[w++] = waitpids[r]; @@ -596,7 +596,7 @@ int havewaitpid(int pid) { int i; - + for(i=0; i<nwaitpids; i++) if(waitpids[i] == pid) return 1; diff --git a/src/cmd/rc/tree.c b/src/cmd/rc/tree.c index 897597e2..2c3ff6bc 100644 --- a/src/cmd/rc/tree.c +++ b/src/cmd/rc/tree.c @@ -136,7 +136,7 @@ void freetree(tree *p) { if(p==0) - return; + return; freetree(p->child[0]); freetree(p->child[1]); freetree(p->child[2]); diff --git a/src/cmd/readcons.c b/src/cmd/readcons.c index f0f8397f..d9c4a182 100644 --- a/src/cmd/readcons.c +++ b/src/cmd/readcons.c @@ -13,7 +13,7 @@ main(int argc, char **argv) { char *def, *p; int secret; - + def = nil; secret = 0; ARGBEGIN{ @@ -26,7 +26,7 @@ main(int argc, char **argv) default: usage(); }ARGEND - + if(argc != 1) usage(); @@ -36,4 +36,3 @@ main(int argc, char **argv) print("%s\n", p); exits(0); } - diff --git a/src/cmd/resample.c b/src/cmd/resample.c index d3208419..b882b826 100755..100644 --- a/src/cmd/resample.c +++ b/src/cmd/resample.c @@ -18,7 +18,7 @@ fac(int L) return f; } -/* +/* * i0(x) is the modified Bessel function, Σ (x/2)^2L / (L!)² * There are faster ways to calculate this, but we precompute * into a table so let's keep it simple. diff --git a/src/cmd/rio/client.c b/src/cmd/rio/client.c index c3b36df1..256261ca 100644 --- a/src/cmd/rio/client.c +++ b/src/cmd/rio/client.c @@ -19,7 +19,7 @@ setactive(Client *c, int on) if(c->parent == c->screen->root) return; - + if(on){ XUngrabButton(dpy, AnyButton, AnyModifier, c->parent); XSetInputFocus(dpy, c->window, RevertToPointerRoot, timestamp()); @@ -254,7 +254,7 @@ void shuffle(int up) { Client **l, *c; - + if(clients == 0 || clients->next == 0) return; if(!up){ @@ -282,4 +282,3 @@ shuffle(int up) /* top(clients); */ /* active(clients); */ } - diff --git a/src/cmd/rio/color.c b/src/cmd/rio/color.c index f1fff54c..489c68e8 100644 --- a/src/cmd/rio/color.c +++ b/src/cmd/rio/color.c @@ -42,4 +42,3 @@ colorpixel(Display *dpy, ScreenInfo *s, int depth, unsigned long rgb, unsigned l return rgb; } } - diff --git a/src/cmd/rio/cursor.c b/src/cmd/rio/cursor.c index 33f63522..3aff91bb 100644 --- a/src/cmd/rio/cursor.c +++ b/src/cmd/rio/cursor.c @@ -16,15 +16,15 @@ typedef struct { Cursordata bigarrow = { 16, {0, 0}, - { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0x3F, - 0xFF, 0x0F, 0xFF, 0x0F, 0xFF, 0x1F, 0xFF, 0x3F, - 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0x3F, - 0xCF, 0x1F, 0x8F, 0x0F, 0x07, 0x07, 0x03, 0x02, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0x3F, + 0xFF, 0x0F, 0xFF, 0x0F, 0xFF, 0x1F, 0xFF, 0x3F, + 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0x3F, + 0xCF, 0x1F, 0x8F, 0x0F, 0x07, 0x07, 0x03, 0x02, }, - { 0x00, 0x00, 0xFE, 0x7F, 0xFE, 0x3F, 0xFE, 0x0F, - 0xFE, 0x07, 0xFE, 0x07, 0xFE, 0x0F, 0xFE, 0x1F, - 0xFE, 0x3F, 0xFE, 0x7F, 0xFE, 0x3F, 0xCE, 0x1F, - 0x86, 0x0F, 0x06, 0x07, 0x02, 0x02, 0x00, 0x00, + { 0x00, 0x00, 0xFE, 0x7F, 0xFE, 0x3F, 0xFE, 0x0F, + 0xFE, 0x07, 0xFE, 0x07, 0xFE, 0x0F, 0xFE, 0x1F, + 0xFE, 0x3F, 0xFE, 0x7F, 0xFE, 0x3F, 0xCE, 0x1F, + 0x86, 0x0F, 0x06, 0x07, 0x02, 0x02, 0x00, 0x00, } }; @@ -198,7 +198,7 @@ ScreenInfo *s; s->root_pixmap = XCreatePixmapFromBitmapData(dpy, s->root, grey_bits, grey_width, grey_height, s->black, s->white, s->depth); - + s->bordcurs[BorderN] = XCreateFontCursor(dpy, 138); s->bordcurs[BorderNNE] = XCreateFontCursor(dpy, 136); s->bordcurs[BorderENE] = s->bordcurs[BorderNNE] ; @@ -254,121 +254,121 @@ Cursor sightcursor = { Cursor whitearrow = { {0, 0}, - {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFC, - 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF8, 0xFF, 0xFC, - 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFC, + {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFC, + 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF8, 0xFF, 0xFC, + 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFC, 0xF3, 0xF8, 0xF1, 0xF0, 0xE0, 0xE0, 0xC0, 0x40, }, - {0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x06, 0xC0, 0x1C, - 0xC0, 0x30, 0xC0, 0x30, 0xC0, 0x38, 0xC0, 0x1C, - 0xC0, 0x0E, 0xC0, 0x07, 0xCE, 0x0E, 0xDF, 0x1C, + {0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x06, 0xC0, 0x1C, + 0xC0, 0x30, 0xC0, 0x30, 0xC0, 0x38, 0xC0, 0x1C, + 0xC0, 0x0E, 0xC0, 0x07, 0xCE, 0x0E, 0xDF, 0x1C, 0xD3, 0xB8, 0xF1, 0xF0, 0xE0, 0xE0, 0xC0, 0x40, } }; Cursor query = { {-7,-7}, - {0x0f, 0xf0, 0x1f, 0xf8, 0x3f, 0xfc, 0x7f, 0xfe, - 0x7c, 0x7e, 0x78, 0x7e, 0x00, 0xfc, 0x01, 0xf8, - 0x03, 0xf0, 0x07, 0xe0, 0x07, 0xc0, 0x07, 0xc0, + {0x0f, 0xf0, 0x1f, 0xf8, 0x3f, 0xfc, 0x7f, 0xfe, + 0x7c, 0x7e, 0x78, 0x7e, 0x00, 0xfc, 0x01, 0xf8, + 0x03, 0xf0, 0x07, 0xe0, 0x07, 0xc0, 0x07, 0xc0, 0x07, 0xc0, 0x07, 0xc0, 0x07, 0xc0, 0x07, 0xc0, }, - {0x00, 0x00, 0x0f, 0xf0, 0x1f, 0xf8, 0x3c, 0x3c, - 0x38, 0x1c, 0x00, 0x3c, 0x00, 0x78, 0x00, 0xf0, - 0x01, 0xe0, 0x03, 0xc0, 0x03, 0x80, 0x03, 0x80, + {0x00, 0x00, 0x0f, 0xf0, 0x1f, 0xf8, 0x3c, 0x3c, + 0x38, 0x1c, 0x00, 0x3c, 0x00, 0x78, 0x00, 0xf0, + 0x01, 0xe0, 0x03, 0xc0, 0x03, 0x80, 0x03, 0x80, 0x00, 0x00, 0x03, 0x80, 0x03, 0x80, 0x00, 0x00, } }; Cursor tl = { {-4, -4}, - {0xfe, 0x00, 0x82, 0x00, 0x8c, 0x00, 0x87, 0xff, - 0xa0, 0x01, 0xb0, 0x01, 0xd0, 0x01, 0x11, 0xff, - 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, + {0xfe, 0x00, 0x82, 0x00, 0x8c, 0x00, 0x87, 0xff, + 0xa0, 0x01, 0xb0, 0x01, 0xd0, 0x01, 0x11, 0xff, + 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x1f, 0x00, }, - {0x00, 0x00, 0x7c, 0x00, 0x70, 0x00, 0x78, 0x00, - 0x5f, 0xfe, 0x4f, 0xfe, 0x0f, 0xfe, 0x0e, 0x00, - 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, + {0x00, 0x00, 0x7c, 0x00, 0x70, 0x00, 0x78, 0x00, + 0x5f, 0xfe, 0x4f, 0xfe, 0x0f, 0xfe, 0x0e, 0x00, + 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x00, 0x00, } }; Cursor t = { {-7, -8}, - {0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x06, 0xc0, - 0x1c, 0x70, 0x10, 0x10, 0x0c, 0x60, 0xfc, 0x7f, - 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0xff, 0xff, + {0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x06, 0xc0, + 0x1c, 0x70, 0x10, 0x10, 0x0c, 0x60, 0xfc, 0x7f, + 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x03, 0x80, 0x0f, 0xe0, 0x03, 0x80, 0x03, 0x80, - 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x00, 0x00, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x03, 0x80, 0x0f, 0xe0, 0x03, 0x80, 0x03, 0x80, + 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, } }; Cursor tr = { {-11, -4}, - {0x00, 0x7f, 0x00, 0x41, 0x00, 0x31, 0xff, 0xe1, - 0x80, 0x05, 0x80, 0x0d, 0x80, 0x0b, 0xff, 0x88, - 0x00, 0x88, 0x0, 0x88, 0x00, 0x88, 0x00, 0x88, + {0x00, 0x7f, 0x00, 0x41, 0x00, 0x31, 0xff, 0xe1, + 0x80, 0x05, 0x80, 0x0d, 0x80, 0x0b, 0xff, 0x88, + 0x00, 0x88, 0x0, 0x88, 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, 0x00, 0xf8, }, - {0x00, 0x00, 0x00, 0x3e, 0x00, 0x0e, 0x00, 0x1e, - 0x7f, 0xfa, 0x7f, 0xf2, 0x7f, 0xf0, 0x00, 0x70, - 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, + {0x00, 0x00, 0x00, 0x3e, 0x00, 0x0e, 0x00, 0x1e, + 0x7f, 0xfa, 0x7f, 0xf2, 0x7f, 0xf0, 0x00, 0x70, + 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x00, } }; Cursor r = { {-8, -7}, - {0x07, 0xc0, 0x04, 0x40, 0x04, 0x40, 0x04, 0x58, - 0x04, 0x68, 0x04, 0x6c, 0x04, 0x06, 0x04, 0x02, - 0x04, 0x06, 0x04, 0x6c, 0x04, 0x68, 0x04, 0x58, + {0x07, 0xc0, 0x04, 0x40, 0x04, 0x40, 0x04, 0x58, + 0x04, 0x68, 0x04, 0x6c, 0x04, 0x06, 0x04, 0x02, + 0x04, 0x06, 0x04, 0x6c, 0x04, 0x68, 0x04, 0x58, 0x04, 0x40, 0x04, 0x40, 0x04, 0x40, 0x07, 0xc0, }, - {0x00, 0x00, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, - 0x03, 0x90, 0x03, 0x90, 0x03, 0xf8, 0x03, 0xfc, - 0x03, 0xf8, 0x03, 0x90, 0x03, 0x90, 0x03, 0x80, + {0x00, 0x00, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, + 0x03, 0x90, 0x03, 0x90, 0x03, 0xf8, 0x03, 0xfc, + 0x03, 0xf8, 0x03, 0x90, 0x03, 0x90, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x03, 0x80, 0x00, 0x00, } }; Cursor br = { {-11, -11}, - {0x00, 0xf8, 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, - 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, - 0xff, 0x88, 0x80, 0x0b, 0x80, 0x0d, 0x80, 0x05, + {0x00, 0xf8, 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, + 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, 0x00, 0x88, + 0xff, 0x88, 0x80, 0x0b, 0x80, 0x0d, 0x80, 0x05, 0xff, 0xe1, 0x00, 0x31, 0x00, 0x41, 0x00, 0x7f, }, - {0x00, 0x00, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, - 0x0, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, - 0x00, 0x70, 0x7f, 0xf0, 0x7f, 0xf2, 0x7f, 0xfa, + {0x00, 0x00, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, + 0x0, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, + 0x00, 0x70, 0x7f, 0xf0, 0x7f, 0xf2, 0x7f, 0xfa, 0x00, 0x1e, 0x00, 0x0e, 0x00, 0x3e, 0x00, 0x00, } }; Cursor b = { {-7, -7}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, - 0xfc, 0x7f, 0x0c, 0x60, 0x10, 0x10, 0x1c, 0x70, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, + 0xfc, 0x7f, 0x0c, 0x60, 0x10, 0x10, 0x1c, 0x70, 0x06, 0xc0, 0x03, 0x80, 0x00, 0x00, 0x00, 0x00, }, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, - 0x03, 0x80, 0x03, 0x80, 0x0f, 0xe0, 0x03, 0x80, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, + 0x03, 0x80, 0x03, 0x80, 0x0f, 0xe0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, } }; Cursor bl = { {-4, -11}, - {0x1f, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, - 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, - 0x11, 0xff, 0xd0, 0x01, 0xb0, 0x01, 0xa0, 0x01, + {0x1f, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, + 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, 0x11, 0x00, + 0x11, 0xff, 0xd0, 0x01, 0xb0, 0x01, 0xa0, 0x01, 0x87, 0xff, 0x8c, 0x00, 0x82, 0x00, 0xfe, 0x00, }, - {0x00, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, - 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, - 0x0e, 0x00, 0x0f, 0xfe, 0x4f, 0xfe, 0x5f, 0xfe, + {0x00, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, + 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x0e, 0x00, + 0x0e, 0x00, 0x0f, 0xfe, 0x4f, 0xfe, 0x5f, 0xfe, 0x78, 0x00, 0x70, 0x00, 0x7c, 0x00, 0x00, 0x0, } }; Cursor l = { {-7, -7}, - {0x03, 0xe0, 0x02, 0x20, 0x02, 0x20, 0x1a, 0x20, - 0x16, 0x20, 0x36, 0x20, 0x60, 0x20, 0x40, 0x20, - 0x60, 0x20, 0x36, 0x20, 0x16, 0x20, 0x1a, 0x20, + {0x03, 0xe0, 0x02, 0x20, 0x02, 0x20, 0x1a, 0x20, + 0x16, 0x20, 0x36, 0x20, 0x60, 0x20, 0x40, 0x20, + 0x60, 0x20, 0x36, 0x20, 0x16, 0x20, 0x1a, 0x20, 0x02, 0x20, 0x02, 0x20, 0x02, 0x20, 0x03, 0xe0, }, - {0x00, 0x00, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, - 0x09, 0xc0, 0x09, 0xc0, 0x1f, 0xc0, 0x3f, 0xc0, - 0x1f, 0xc0, 0x09, 0xc0, 0x09, 0xc0, 0x01, 0xc0, + {0x00, 0x00, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, + 0x09, 0xc0, 0x09, 0xc0, 0x1f, 0xc0, 0x3f, 0xc0, + 0x1f, 0xc0, 0x09, 0xc0, 0x09, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x00, 0x00, } }; diff --git a/src/cmd/rio/event.c b/src/cmd/rio/event.c index 0420c2bd..0035cf34 100644 --- a/src/cmd/rio/event.c +++ b/src/cmd/rio/event.c @@ -15,7 +15,7 @@ void mainloop(int shape_event) { XEvent ev; - + for(;;){ getevent(&ev); @@ -134,7 +134,7 @@ configurereq(XConfigureRequestEvent *e) c->dy = e->height; if(e->value_mask & CWBorderWidth) c->border = e->border_width; - + if(c->dx >= c->screen->width && c->dy >= c->screen->height) c->border = 0; else diff --git a/src/cmd/rio/grab.c b/src/cmd/rio/grab.c index 5aff69c8..85aa570c 100644 --- a/src/cmd/rio/grab.c +++ b/src/cmd/rio/grab.c @@ -418,7 +418,7 @@ pullcalc(Client *c, int x, int y, BorderOrient bl, int init) c->dy = sy*(dy + 2*BORDER ); c->x = px; c->y = py; - + /* compensate position for size changed due to size hints */ if(spx) c->x -= c->dx - rdx; @@ -444,7 +444,7 @@ drawbound(Client *c, int drawing) ScreenInfo *s; if(debug) fprintf(stderr, "drawbound %d %dx%d+%d+%d\n", drawing, c->dx, c->dy, c->x, c->y); - + s = c->screen; x = c->x; y = c->y; @@ -466,7 +466,7 @@ drawbound(Client *c, int drawing) XUnmapWindow(dpy, s->sweepwin); return; } - + x += BORDER; y += BORDER; dx -= 2*BORDER; diff --git a/src/cmd/rio/key.c b/src/cmd/rio/key.c index 5bac1735..40740b05 100644 --- a/src/cmd/rio/key.c +++ b/src/cmd/rio/key.c @@ -64,4 +64,3 @@ alttab(int shift) shuffle(shift); /* fprintf(stderr, "%sTab\n", shift ? "Back" : ""); */ } - diff --git a/src/cmd/rio/main.c b/src/cmd/rio/main.c index 4bf87852..1e0b3797 100644 --- a/src/cmd/rio/main.c +++ b/src/cmd/rio/main.c @@ -253,7 +253,7 @@ initscreen(ScreenInfo *s, int i, int background) s->min_cmaps = MinCmapsOfScreen(ScreenOfDisplay(dpy, i)); s->depth = DefaultDepth(dpy, i); - /* + /* * Figure out underlying screen format. */ if(XMatchVisualInfo(dpy, i, 16, TrueColor, &xvi) @@ -288,7 +288,7 @@ initscreen(ScreenInfo *s, int i, int background) s->vis = DefaultVisual(dpy, i); } if(DefaultDepth(dpy, i) != s->depth){ - s->def_cmap = XCreateColormap(dpy, s->root, s->vis, AllocNone); + s->def_cmap = XCreateColormap(dpy, s->root, s->vis, AllocNone); } ds = DisplayString(dpy); @@ -344,7 +344,7 @@ initscreen(ScreenInfo *s, int i, int background) attr.cursor = s->arrow; attr.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | ColormapChangeMask - | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask + | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask | KeyPressMask | EnterWindowMask; mask = CWCursor|CWEventMask; XChangeWindowAttributes(dpy, s->root, mask, &attr); diff --git a/src/cmd/rio/menu.c b/src/cmd/rio/menu.c index dc23f1c3..e7a37c68 100644 --- a/src/cmd/rio/menu.c +++ b/src/cmd/rio/menu.c @@ -46,7 +46,7 @@ char *b2items[NUMVIRTUALS+1] = 0 }; -Menu b2menu = +Menu b2menu = { b2items }; @@ -116,7 +116,7 @@ button(XButtonEvent *e) e->x, e->y); XTranslateCoordinates(dpy, e->window, s->root, e->x, e->y, &e->x, &e->y, &dw); - } + } switch (e->button){ case Button1: if(c){ @@ -132,7 +132,7 @@ button(XButtonEvent *e) XAllowEvents (dpy, ReplayPointer, curtime); } else if((e->state&(ShiftMask|ControlMask))==(ShiftMask|ControlMask)){ menuhit(e, &egg); - } else if(numvirtuals > 1 && (n = menuhit(e, &b2menu)) > -1) + } else if(numvirtuals > 1 && (n = menuhit(e, &b2menu)) > -1) button2(n); return; case Button3: @@ -389,7 +389,7 @@ switch_to_c(int n, Client *c) int i; for(i = 0; i < numhidden; i++) - if(c == hiddenc[i]) + if(c == hiddenc[i]) break; if(i == numhidden){ @@ -397,7 +397,7 @@ switch_to_c(int n, Client *c) XMapWindow(dpy, c->parent); setstate(c, NormalState); if(currents[virt] == c) - active(c); + active(c); } } } @@ -421,6 +421,6 @@ switch_to(int n) void initb2menu(int n) -{ +{ b2items[n] = 0; } diff --git a/src/cmd/rio/printevent.c b/src/cmd/rio/printevent.c index 05cc5ad7..927ea85f 100644 --- a/src/cmd/rio/printevent.c +++ b/src/cmd/rio/printevent.c @@ -20,9 +20,9 @@ Archive-name: showevent/part01 There are times during debugging when it would be real useful to be able to -print the fields of an event in a human readable form. Too many times I found -myself scrounging around in section 8 of the Xlib manual looking for the valid -fields for the events I wanted to see, then adding printf's to display the +print the fields of an event in a human readable form. Too many times I found +myself scrounging around in section 8 of the Xlib manual looking for the valid +fields for the events I wanted to see, then adding printf's to display the numeric values of the fields, and then scanning through X.h trying to decode the cryptic detail and state fields. After playing with xev, I decided to write a couple of standard functions that I could keep in a library and call @@ -35,9 +35,9 @@ spend the time writing functions like this, they just want to have them when they need them. A simple, sample program is included which does little else but to demonstrate -the use of these two functions. These functions have saved me many an hour +the use of these two functions. These functions have saved me many an hour during debugging and I hope you find some benefit to these. If you have any -comments, suggestions, improvements, or if you find any blithering errors you +comments, suggestions, improvements, or if you find any blithering errors you can get it touch with me at the following location: ken@richsun.UUCP @@ -129,7 +129,7 @@ ServerTime(Time time) if(0) sprintf(buffer, "%lu day%s %02lu:%02lu:%02lu.%03lu", day, day == 1 ? "" : "(s)", hr, min, sec, msec); - + sprintf(buffer, "%lud%luh%lum%lu.%03lds", day, hr, min, sec, msec); return (buffer); } @@ -770,7 +770,7 @@ VerbVisibility(XVisibilityEvent *ev) char *eventtype(XEvent *ev) { static char buffer[20]; - + switch (ev->type) { case KeyPress: return ("KeyPress"); @@ -983,4 +983,3 @@ void printevent(XEvent *e) break; } } - diff --git a/src/cmd/rio/showevent/sample.c b/src/cmd/rio/showevent/sample.c index 7b22e970..9ad8c639 100644 --- a/src/cmd/rio/showevent/sample.c +++ b/src/cmd/rio/showevent/sample.c @@ -45,4 +45,3 @@ char **argv; printf("\n\n"); } } - diff --git a/src/cmd/rio/xevents.c b/src/cmd/rio/xevents.c index d42ddbab..c4d368d8 100644 --- a/src/cmd/rio/xevents.c +++ b/src/cmd/rio/xevents.c @@ -15,12 +15,12 @@ main(int argc, char **argv) Display *dpy; Window window; XEvent event; - + if (!(dpy = XOpenDisplay(""))) { printf("Failed to open display...\n"); exit(1); } - + screen = DefaultScreen(dpy); window = XCreateSimpleWindow(dpy, RootWindow(dpy, screen), 100, 100, @@ -42,4 +42,3 @@ main(int argc, char **argv) printevent(&event); } } - diff --git a/src/cmd/rio/xshove.c b/src/cmd/rio/xshove.c index 180eada4..e235874e 100644 --- a/src/cmd/rio/xshove.c +++ b/src/cmd/rio/xshove.c @@ -55,7 +55,7 @@ void main(int argc, char **argv) { int screen; - + screen = 0; ARGBEGIN{ case 's': @@ -65,7 +65,7 @@ main(int argc, char **argv) usage(); break; }ARGEND - + dpy = XOpenDisplay(""); if(dpy == nil) sysfatal("open display: %r"); @@ -93,7 +93,7 @@ getproperty(Window w, Atom a) n = 100; p = nil; - XGetWindowProperty(dpy, w, a, 0, 100L, 0, + XGetWindowProperty(dpy, w, a, 0, 100L, 0, AnyPropertyType, &type, &fmt, &n, &dummy, &p); if(p == nil || *p == 0) @@ -132,7 +132,7 @@ getinfo(void) w = mallocz(nxwin*sizeof w[0], 1); if(w == 0) sysfatal("malloc: %r"); - + Win *ww = w; for(i=0; i<nxwin; i++){ memset(&attr, 0, sizeof attr); @@ -157,7 +157,7 @@ getinfo(void) ww++; } nw = ww - w; -} +} void listwindows(void) @@ -169,7 +169,7 @@ listwindows(void) char rect[50]; snprint(rect, sizeof rect, "%d,%d,%d,%d", ww->x, ww->y, ww->x+ww->dx, ww->y+ww->dy); print("%08x %-20s %-10s %s\n", - (uint)ww->xw, + (uint)ww->xw, rect, ww->instance, ww->class); diff --git a/src/cmd/sam/cmd.c b/src/cmd/sam/cmd.c index 12510689..386fe8d4 100644 --- a/src/cmd/sam/cmd.c +++ b/src/cmd/sam/cmd.c @@ -446,7 +446,7 @@ parsecmd(int nest) if(nextc() == 'g') cmd.flag = getch(); } - + } } } @@ -537,7 +537,7 @@ simpleaddr(void) addr.num = getnum(1); break; case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': + case '5': case '6': case '7': case '8': case '9': addr.num = getnum(1); addr.type='l'; break; diff --git a/src/cmd/sam/mesg.c b/src/cmd/sam/mesg.c index d9dd42ac..2899f28e 100644 --- a/src/cmd/sam/mesg.c +++ b/src/cmd/sam/mesg.c @@ -615,7 +615,7 @@ vlong invlong(void) { vlong v; - + v = (inp[7]<<24) | (inp[6]<<16) | (inp[5]<<8) | inp[4]; v = (v<<16) | (inp[3]<<8) | inp[2]; v = (v<<16) | (inp[1]<<8) | inp[0]; @@ -778,7 +778,7 @@ void outshort(int s) { *outp++ = s; - *outp++ = s>>8; + *outp++ = s>>8; } void diff --git a/src/cmd/sam/mesg.h b/src/cmd/sam/mesg.h index 23441499..0acf861c 100644 --- a/src/cmd/sam/mesg.h +++ b/src/cmd/sam/mesg.h @@ -79,27 +79,27 @@ typedef struct Header{ /* * File transfer protocol schematic, a la Holzmann * #define N 6 - * + * * chan h = [4] of { mtype }; * chan t = [4] of { mtype }; - * + * * mtype = { Hgrow, Hdata, * Hcheck, Hcheck0, * Trequest, Tcheck, * }; - * + * * active proctype host() * { byte n; - * + * * do * :: n < N -> n++; t!Hgrow * :: n == N -> n++; t!Hcheck0 - * + * * :: h?Trequest -> t!Hdata * :: h?Tcheck -> t!Hcheck * od * } - * + * * active proctype term() * { * do @@ -118,14 +118,14 @@ typedef struct Header{ * From: gerard@research.bell-labs.com * Date: Tue Jul 17 13:47:23 EDT 2001 * To: rob@research.bell-labs.com - * + * * spin -c (or -a) spec * pcc -DNP -o pan pan.c * pan -l - * + * * proves that there are no non-progress cycles * (infinite executions *not* passing through * the statement marked with a label starting * with the prefix "progress") - * + * */ diff --git a/src/cmd/sam/moveto.c b/src/cmd/sam/moveto.c index 94fad3e7..68207cd6 100644 --- a/src/cmd/sam/moveto.c +++ b/src/cmd/sam/moveto.c @@ -170,4 +170,3 @@ doubleclick(File *f, Posn p1) while(--p >= 0 && alnum(filereadc(f, p))) f->dot.r.p1--; } - diff --git a/src/cmd/sam/plumb.h b/src/cmd/sam/plumb.h index d376acd0..f1158621 100644 --- a/src/cmd/sam/plumb.h +++ b/src/cmd/sam/plumb.h @@ -14,4 +14,3 @@ char *plumbunpackattr(char*); char *plumbpack(Plumbmsg *, int *); int plumbfree(Plumbmsg *); char *cleanname(char*); - diff --git a/src/cmd/sam/rasp.c b/src/cmd/sam/rasp.c index 0bce4141..c96101df 100644 --- a/src/cmd/sam/rasp.c +++ b/src/cmd/sam/rasp.c @@ -337,4 +337,3 @@ rdata(List *r, Posn p1, Posn n) } return rg; } - diff --git a/src/cmd/sam/sam.c b/src/cmd/sam/sam.c index f180290b..84e015f5 100644 --- a/src/cmd/sam/sam.c +++ b/src/cmd/sam/sam.c @@ -44,7 +44,7 @@ main(int _argc, char **_argv) char **volatile argv; String *t; char *termargs[10], **ap; - + argc = _argc; argv = _argv; ap = termargs; diff --git a/src/cmd/sam/unix.c b/src/cmd/sam/unix.c index a745a5bc..97f2fce8 100644 --- a/src/cmd/sam/unix.c +++ b/src/cmd/sam/unix.c @@ -10,7 +10,7 @@ #include "sam.h" Rune samname[] = { '~', '~', 's', 'a', 'm', '~', '~', 0 }; - + static Rune l1[] = { '{', '[', '(', '<', 0253, 0}; static Rune l2[] = { '\n', 0}; static Rune l3[] = { '\'', '"', '`', 0}; @@ -85,15 +85,15 @@ getuser(void) return user; } -int -statfile(char *name, ulong *dev, uvlong *id, long *time, long *length, long *appendonly) +int +statfile(char *name, ulong *dev, uvlong *id, long *time, long *length, long *appendonly) { struct stat dirb; if (stat(name, &dirb) == -1) return -1; if (dev) - *dev = dirb.st_dev; + *dev = dirb.st_dev; if (id) *id = dirb.st_ino; if (time) @@ -110,11 +110,11 @@ statfd(int fd, ulong *dev, uvlong *id, long *time, long *length, long *appendonl { struct stat dirb; - if (fstat(fd, &dirb) == -1) + if (fstat(fd, &dirb) == -1) return -1; if (dev) *dev = dirb.st_dev; - if (id) + if (id) *id = dirb.st_ino; if (time) *time = dirb.st_mtime; @@ -174,11 +174,11 @@ tempdisk(void) int fd = temp_file(buf, sizeof buf); if (fd >= 0) remove(buf); - return fd; + return fd; } #undef waitfor -int +int samwaitfor(int pid) { int r; @@ -218,5 +218,3 @@ erealloc(void *p, ulong n) panic("realloc fails"); return p; } - - diff --git a/src/cmd/samterm/icons.c b/src/cmd/samterm/icons.c index 5ccd999a..0b04d0b0 100644 --- a/src/cmd/samterm/icons.c +++ b/src/cmd/samterm/icons.c @@ -22,13 +22,13 @@ Cursor bullseye={ }; Cursor deadmouse={ {-7, -7}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x8E, 0x1D, 0xC7, - 0xFF, 0xE3, 0xFF, 0xF3, 0xFF, 0xFF, 0x7F, 0xFE, + 0xFF, 0xE3, 0xFF, 0xF3, 0xFF, 0xFF, 0x7F, 0xFE, 0x3F, 0xF8, 0x17, 0xF0, 0x03, 0xE0, 0x00, 0x00,}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x82, - 0x04, 0x41, 0xFF, 0xE1, 0x5F, 0xF1, 0x3F, 0xFE, + 0x04, 0x41, 0xFF, 0xE1, 0x5F, 0xF1, 0x3F, 0xFE, 0x17, 0xF0, 0x03, 0xE0, 0x00, 0x00, 0x00, 0x00,} }; Cursor lockarrow={ diff --git a/src/cmd/samterm/io.c b/src/cmd/samterm/io.c index 7c653aa4..e1dd148a 100644 --- a/src/cmd/samterm/io.c +++ b/src/cmd/samterm/io.c @@ -170,7 +170,7 @@ again: goto again; } got |= 1<<type; - return got; + return got; } int diff --git a/src/cmd/samterm/main.c b/src/cmd/samterm/main.c index 5fc42908..de951845 100644 --- a/src/cmd/samterm/main.c +++ b/src/cmd/samterm/main.c @@ -464,7 +464,7 @@ flushtyping(int clearesc) ulong n; if(clearesc) - typeesc = -1; + typeesc = -1; if(typestart == typeend) { modified = 0; return; @@ -514,7 +514,7 @@ nontypingkey(int c) case SCROLLKEY: case CUT: case COPY: - case PASTE: + case PASTE: return 1; } return 0; diff --git a/src/cmd/samterm/mesg.c b/src/cmd/samterm/mesg.c index 1e9cd561..32478ea2 100644 --- a/src/cmd/samterm/mesg.c +++ b/src/cmd/samterm/mesg.c @@ -472,7 +472,7 @@ void outcopy(int count, uchar *data) { while(count--) - outdata[HSIZE+outcount++] = *data++; + outdata[HSIZE+outcount++] = *data++; } void diff --git a/src/cmd/samterm/samterm.h b/src/cmd/samterm/samterm.h index ac564ecf..2e1a645d 100644 --- a/src/cmd/samterm/samterm.h +++ b/src/cmd/samterm/samterm.h @@ -181,4 +181,3 @@ void outshort(int); void outlong(long); void outvlong(vlong); void outsend(void); - diff --git a/src/cmd/scat/display.c b/src/cmd/scat/display.c index 9af012ea..9219ee51 100644 --- a/src/cmd/scat/display.c +++ b/src/cmd/scat/display.c @@ -10,7 +10,7 @@ displaypic(Picture *pic) int p[2]; int i, n; uchar *a; - + if(pipe(p) < 0){ fprint(2, "pipe failed: %r\n"); @@ -58,7 +58,7 @@ displaypic(Picture *pic) void displayimage(Image *im) { - int p[2]; + int p[2]; if(pipe(p) < 0){ fprint(2, "pipe failed: %r\n"); diff --git a/src/cmd/scat/header.c b/src/cmd/scat/header.c index 519d98f9..4cd03d02 100644 --- a/src/cmd/scat/header.c +++ b/src/cmd/scat/header.c @@ -244,4 +244,3 @@ dssmount(int dskno) Bprint(&bout, "not mounting dss\n"); return "/n/dss"; } - diff --git a/src/cmd/scat/plot.c b/src/cmd/scat/plot.c index ade4ac5b..c8c743a5 100644 --- a/src/cmd/scat/plot.c +++ b/src/cmd/scat/plot.c @@ -407,22 +407,22 @@ drawplanet(Image *scr, Planetrec *p, Point pt) } if(strcmp(p->name, "saturn") == 0){ drawdisc(scr, p->semidiam, 1, saturncolor, pt, "S"); - + return; } if(strcmp(p->name, "uranus") == 0){ drawdisc(scr, p->semidiam, 0, uranuscolor, pt, "U"); - + return; } if(strcmp(p->name, "neptune") == 0){ drawdisc(scr, p->semidiam, 0, neptunecolor, pt, "N"); - + return; } if(strcmp(p->name, "pluto") == 0){ drawdisc(scr, p->semidiam, 0, plutocolor, pt, "P"); - + return; } if(strcmp(p->name, "comet") == 0){ diff --git a/src/cmd/scat/scat.c b/src/cmd/scat/scat.c index 35b7e7aa..dff596b1 100644 --- a/src/cmd/scat/scat.c +++ b/src/cmd/scat/scat.c @@ -531,7 +531,7 @@ alpha(char *s, char *t) if(strncmp(s, t, n)==0 && (s[n]<'a' || 'z'<s[n])) return skipbl(s+n); return 0; - + } char* @@ -543,7 +543,7 @@ text(char *s, char *t) if(strncmp(s, t, n)==0 && (s[n]==0 || s[n]==' ' || s[n]=='\t')) return skipbl(s+n); return 0; - + } int diff --git a/src/cmd/scat/sky.h b/src/cmd/scat/sky.h index 6be98145..bc55fbfc 100644 --- a/src/cmd/scat/sky.h +++ b/src/cmd/scat/sky.h @@ -22,7 +22,7 @@ * The BB field is a dreg, and correct only for SAO and NGC. * IC(n) is just NGC(n+7840) * Others should be self-explanatory. - * + * * Records: * * Star is an SAOrec diff --git a/src/cmd/sed.c b/src/cmd/sed.c index a78c9c66..23615cf2 100644 --- a/src/cmd/sed.c +++ b/src/cmd/sed.c @@ -81,7 +81,7 @@ typedef struct SEDCOM { #define YCOM 026 #define XCOM 033 - + typedef struct label { /* Label symbol table */ Rune asc[9]; /* Label name */ SedCom *chain; @@ -632,7 +632,7 @@ compsub(Rune *rhs, Rune *end) } if (rhs < end) *rhs++ = r; - else + else return 0; } @@ -725,7 +725,7 @@ getrune(void) c = '\n'; /* fake an end-of-line */ prog.pctl.curr = 0; } - } else + } else c = -1; } else if ((c = Bgetrune(prog.pctl.bp)) < 0) Bterm(prog.pctl.bp); @@ -992,7 +992,7 @@ match(Reprog *pattern, Rune *buf) { if (!pattern) return 0; - subexp[0].s.rsp = buf; + subexp[0].s.rsp = buf; subexp[0].e.rep = 0; if (rregexec(pattern, linebuf, subexp, MAXSUB) > 0) { loc1 = subexp[0].s.rsp; diff --git a/src/cmd/sftpcache.c b/src/cmd/sftpcache.c index 3f8ea165..b21e8a7e 100644 --- a/src/cmd/sftpcache.c +++ b/src/cmd/sftpcache.c @@ -5,9 +5,9 @@ * * Stupid sftp bug: sftp invokes ssh, which always set O_NONBLOCK * on 0, 1, and 2. Ssh inherits sftp's 2, so we can't use the output pipe - * on fd 2, since it will get set O_NONBLOCK, sftp won't notice, and + * on fd 2, since it will get set O_NONBLOCK, sftp won't notice, and * writes will be lost. So instead we use a separate pipe for errors - * and consult it after each command. Assume the pipe buffer is + * and consult it after each command. Assume the pipe buffer is * big enough to hold the error output. */ #include <u.h> @@ -35,7 +35,7 @@ Brd(Biobuf *bin) { static char buf[1000]; int c, tot; - + tot = 0; while((c = Bgetc(bin)) >= 0 && tot<sizeof buf){ buf[tot++] = c; @@ -59,7 +59,7 @@ int readstr(int fd, char *a, int n) { int i; - + for(i=0; i<n; i++){ if(read(fd, a+i, 1) != 1) return -1; @@ -76,7 +76,7 @@ doerrors(int fd) { char buf[100]; int n, first; - + first = 1; while((n = read(sftperr, buf, sizeof buf)) > 0){ if(debug){ @@ -106,7 +106,7 @@ main(int argc, char **argv) char buf[200], cmd[1000], *q, *s; char dir[100], ndir[100]; int p[2], px[2], pe[2], pid, ctl, nctl, fd, n; - + notify(bell); fmtinstall('H', encodefmt); @@ -117,10 +117,10 @@ main(int argc, char **argv) default: usage(); }ARGEND - + if(argc != 1) usage(); - + if(pipe(p) < 0 || pipe(px) < 0 || pipe(pe) < 0) sysfatal("pipe: %r"); pid = fork(); @@ -169,7 +169,7 @@ main(int argc, char **argv) sysfatal("fork"); if(pid != 0) exits(nil); - + for(;;){ nctl = listen(dir, ndir); if(nctl < 0) @@ -215,4 +215,3 @@ main(int argc, char **argv) close(fd); } } - diff --git a/src/cmd/smugfs/a.h b/src/cmd/smugfs/a.h index fa65002d..4b42f140 100644 --- a/src/cmd/smugfs/a.h +++ b/src/cmd/smugfs/a.h @@ -187,4 +187,3 @@ enum }; extern int printerrors; - diff --git a/src/cmd/smugfs/cache.c b/src/cmd/smugfs/cache.c index 2adf8b9b..afce6ba7 100644 --- a/src/cmd/smugfs/cache.c +++ b/src/cmd/smugfs/cache.c @@ -78,14 +78,14 @@ static void movetofront(Cache *c, CEntry *e) { popout(c, e); - insertfront(c, e); + insertfront(c, e); } static CEntry* evict(Cache *c) { CEntry *e; - + e = c->tail; popout(c, e); c->cefree(e); @@ -101,7 +101,7 @@ cachelookup(Cache *c, char *name, int create) { int h; CEntry *e; - + h = hash(name) % c->nhash; for(e=c->hash[h]; e; e=e->hash.next){ if(strcmp(name, e->name) == 0){ @@ -109,10 +109,10 @@ cachelookup(Cache *c, char *name, int create) return e; } } - + if(!create) return nil; - + if(c->nentry >= c->maxentry) e = evict(c); else{ @@ -124,7 +124,7 @@ cachelookup(Cache *c, char *name, int create) h = hash(name) % c->nhash; e->hash.next = c->hash[h]; c->hash[h] = e; - return e; + return e; } void @@ -132,7 +132,7 @@ cacheflush(Cache *c, char *substr) { CEntry **l, *e; int i; - + for(i=0; i<c->nhash; i++){ for(l=&c->hash[i]; (e=*l); ){ if(substr == nil || strstr(e->name, substr)){ diff --git a/src/cmd/smugfs/download.c b/src/cmd/smugfs/download.c index e23d49e1..82a2c753 100644 --- a/src/cmd/smugfs/download.c +++ b/src/cmd/smugfs/download.c @@ -13,7 +13,7 @@ static void dfree(CEntry *ce) { DEntry *d; - + d = (DEntry*)ce; if(d->tmpfile){ remove(d->tmpfile); @@ -61,7 +61,7 @@ download(char *url, HTTPHeader *hdr) host = parseurl(url, &path); if(host == nil) return -1; - + d = (DEntry*)cachelookup(downloadcache, url, 1); if(d->tmpfile){ free(host); @@ -81,7 +81,7 @@ download(char *url, HTTPHeader *hdr) fmtprint(&fmt, "User-Agent: " USER_AGENT "\r\n"); fmtprint(&fmt, "\r\n"); req = fmtstrflush(&fmt); - + fprint(2, "Get %s\n", url); if(httptofile(&http, host, req, hdr, fd) < 0){ diff --git a/src/cmd/smugfs/fs.c b/src/cmd/smugfs/fs.c index a57b96d1..47e0a47b 100644 --- a/src/cmd/smugfs/fs.c +++ b/src/cmd/smugfs/fs.c @@ -94,7 +94,7 @@ newupload(SmugFid *sf, char *name) Upload *u; int fd, i; char tmp[] = "/var/tmp/smugfs.XXXXXX"; - + if((fd = opentemp(tmp, ORDWR)) < 0) return nil; qlock(&uploadlock); @@ -192,7 +192,7 @@ getuploadname(SmugFid *sf, char *name) { int i; Upload *u; - + qlock(&uploadlock); for(i=0; i<nup; i++){ u = up[i]; @@ -280,7 +280,7 @@ doupload(Upload *u) } datalen = d->length; free(d); - + memset(&ds, 0, sizeof ds); seek(u->fd, 0, 0); total = 0; @@ -306,7 +306,7 @@ doupload(Upload *u) fmtprint(&fmt, "X-Smug-FileName: %s\r\n", u->name); fmtprint(&fmt, "\r\n"); req = fmtstrflush(&fmt); - + seek(u->fd, 0, 0); jv = jsonupload(&http, UPLOAD_HOST, req, u->fd, datalen); free(req); @@ -330,7 +330,7 @@ nickindex(char *name) { int i; Json *v; - + for(i=0; i<nnick; i++) if(strcmp(nick[i], name) == 0) return i; @@ -354,7 +354,7 @@ void responderrstr(Req *r) { char err[ERRMAX]; - + rerrstr(err, sizeof err); respond(r, err); } @@ -363,7 +363,7 @@ static char* xclone(Fid *oldfid, Fid *newfid) { SmugFid *sf; - + if(oldfid->aux == nil) return nil; @@ -402,7 +402,7 @@ static Json* getcategories(SmugFid *sf) { Json *v, *w; - + v = smug("smugmug.categories.get", "NickName", nickname(sf->nickid), nil); w = jincref(jwalk(v, "Categories")); jclose(v); @@ -413,7 +413,7 @@ static Json* getcategorytree(SmugFid *sf) { Json *v, *w; - + v = smug("smugmug.users.getTree", "NickName", nickname(sf->nickid), nil); w = jincref(jwalk(v, "Categories")); jclose(v); @@ -425,7 +425,7 @@ getcategory(SmugFid *sf, vlong id) { int i; Json *v, *w; - + v = getcategorytree(sf); if(v == nil) return nil; @@ -446,7 +446,7 @@ getcategoryid(SmugFid *sf, char *name) int i; vlong id; Json *v; - + v = getcategories(sf); if(v == nil) return -1; @@ -470,7 +470,7 @@ getcategoryindex(SmugFid *sf, int i) { Json *v; vlong id; - + v = getcategories(sf); if(v == nil) return -1; @@ -510,7 +510,7 @@ getalbums(SmugFid *sf) "NickName", nickname(sf->nickid), nil); w = jincref(jwalk(v, "Albums")); jclose(v); - return w; + return w; } static vlong @@ -520,7 +520,7 @@ getalbumid(SmugFid *sf, char *name, char **keyp) vlong id; Json *v; char *key; - + v = getalbums(sf); if(v == nil) return -1; @@ -548,7 +548,7 @@ getalbumindex(SmugFid *sf, int i, char **keyp) vlong id; Json *v; char *key; - + v = getalbums(sf); if(v == nil) return -1; @@ -591,7 +591,7 @@ getimageid(SmugFid *sf, char *name, char **keyp) Json *v; char *p; char *key; - + id = strtol(name, &p, 10); if(*p != 0 || *name == 0) return -1; @@ -652,7 +652,7 @@ getimageindex(SmugFid *sf, int i, char **keyp) vlong id; Json *v; char *key; - + v = getimages(sf, sf->album, sf->albumkey); if(v == nil) return -1; @@ -677,7 +677,7 @@ categoryname(SmugFid *sf) { Json *v; char *s; - + v = getcategory(sf, sf->category); s = jstring(jwalk(v, "Name")); if(s) @@ -691,7 +691,7 @@ albumname(SmugFid *sf) { Json *v; char *s; - + v = getalbum(sf, sf->album, sf->albumkey); s = jstring(jwalk(v, "Title")); if(s) @@ -705,7 +705,7 @@ imagename(SmugFid *sf) { char *s; Json *v; - + v = getimageinfo(sf, sf->image, sf->imagekey); s = jstring(jwalk(v, "FileName")); if(s && s[0]) @@ -721,7 +721,7 @@ imagelength(SmugFid *sf) { vlong length; Json *v; - + v = getimageinfo(sf, sf->image, sf->imagekey); length = jint(jwalk(v, "Size")); jclose(v); @@ -763,7 +763,7 @@ imageurl(SmugFid *sf) return nil; } -static char* imagestrings[] = +static char* imagestrings[] = { "Caption", "LastUpdated", @@ -786,7 +786,7 @@ static char* imagestrings[] = "Album", }; -static char* albumbools[] = +static char* albumbools[] = { "Public", "Printable", @@ -810,7 +810,7 @@ static char* albumbools[] = "X3Larges", }; -static char* albumstrings[] = +static char* albumstrings[] = { "Description" "Keywords", @@ -866,7 +866,7 @@ readctl(SmugFid *sf) case Qimagectl: v = getimageinfo(sf, sf->image, sf->imagekey); break; - + case Qimageurl: v = getimageinfo(sf, sf->image, sf->imagekey); fmtstrinit(&fmt); @@ -875,11 +875,11 @@ readctl(SmugFid *sf) fmtprint(&fmt, "%s %s\n", urls[i].name, s); jclose(v); return fmtstrflush(&fmt); - + case Qimageexif: v = getimageexif(sf, sf->image, sf->imagekey); break; - + case Qalbumsettings: v = getalbum(sf, sf->album, sf->albumkey); fmtstrinit(&fmt); @@ -946,7 +946,7 @@ dostat(SmugFid *sf, Qid *qid, Dir *dir) char *uid; char *s; vlong length; - + memset(&q, 0, sizeof q); name = nil; freename = 0; @@ -1106,7 +1106,7 @@ xwalk1(Fid *fid, char *name, Qid *qid) SmugFid *sf; char *x; Upload *u; - + dotdot = strcmp(name, "..") == 0; sf = fid->aux; switch(sf->type){ @@ -1157,7 +1157,7 @@ xwalk1(Fid *fid, char *name, Qid *qid) break; } goto NotFound; - + case Qalbums: case Qcategory: if(dotdot){ @@ -1208,7 +1208,7 @@ xwalk1(Fid *fid, char *name, Qid *qid) break; } goto NotFound; - + case Qimage: if(dotdot){ free(sf->imagekey); @@ -1279,7 +1279,7 @@ dodirgen(int i, Dir *d, void *v) xsf.nickid = i; dostat(&xsf, nil, d); return 0; - + case Qnick: if(i-- == 0){ xsf.type = Qalbums; @@ -1292,7 +1292,7 @@ dodirgen(int i, Dir *d, void *v) xsf.category = id; dostat(&xsf, nil, d); return 0; - + case Qalbums: case Qcategory: if((id = getalbumindex(sf, i, &key)) < 0) @@ -1303,7 +1303,7 @@ dodirgen(int i, Dir *d, void *v) dostat(&xsf, nil, d); free(key); return 0; - + case Qalbum: if(i-- == 0){ xsf.type = Qalbumsettings; @@ -1325,7 +1325,7 @@ dodirgen(int i, Dir *d, void *v) dostat(&xsf, nil, d); free(key); return 0; - + case Qimage: if(i-- == 0){ xsf.type = Qimagefile; @@ -1394,13 +1394,13 @@ xwstat(Req *r) } } respond(r, "invalid wstat"); -} +} static void xattach(Req *r) { SmugFid *sf; - + sf = emalloc(sizeof *sf); r->fid->aux = sf; sf->type = Qroot; @@ -1430,7 +1430,7 @@ xopen(Req *r) case Qalbumsettings: case Qimagesettings: break; - + case Quploadfile: if(r->ifcall.mode != OREAD){ lock(&sf->upload->lk); @@ -1444,7 +1444,7 @@ xopen(Req *r) unlock(&sf->upload->lk); } break; - + default: if(r->ifcall.mode != OREAD){ respond(r, "permission denied"); @@ -1492,7 +1492,7 @@ xcreate(Req *r) dostat(sf, &r->ofcall.qid, nil); respond(r, nil); return; - + case Qcategory: // Create new album. if(!(r->ifcall.perm&DMDIR)) @@ -1500,7 +1500,7 @@ xcreate(Req *r) snprint(strid, sizeof strid, "%lld", sf->category); // Start with most restrictive settings. v = ncsmug("smugmug.albums.create", - "Title", r->ifcall.name, + "Title", r->ifcall.name, "CategoryID", strid, "Public", "0", "WorldSearchable", "0", @@ -1526,7 +1526,7 @@ xcreate(Req *r) dostat(sf, &r->ofcall.qid, nil); respond(r, nil); return; - + case Qalbum: // Upload image to album. if(r->ifcall.perm&DMDIR) @@ -1543,14 +1543,14 @@ xcreate(Req *r) respond(r, nil); return; } - respond(r, "permission denied"); + respond(r, "permission denied"); } static int writetofd(Req *r, int fd) { int total, n; - + total = 0; while(total < r->ifcall.count){ n = pwrite(fd, (char*)r->ifcall.data+total, r->ifcall.count-total, r->ifcall.offset+total); @@ -1580,7 +1580,7 @@ xread(Req *r) int fd; HTTPHeader hdr; char *url; - + sf = r->fid->aux; r->ofcall.count = 0; switch(sf->type){ @@ -1640,7 +1640,7 @@ xwrite(Req *r) Json *v; char strid[50]; SmugFid *sf; - + sf = r->fid->aux; r->ofcall.count = r->ifcall.count; sync = (r->ifcall.count==4 && memcmp(r->ifcall.data, "sync", 4) == 0); @@ -1660,7 +1660,7 @@ xwrite(Req *r) respond(r, nil); return; } - break; + break; case Qalbumsctl: case Qcategoryctl: jcacheflush("smugmug.categories.get"); @@ -1740,7 +1740,7 @@ xwrite(Req *r) } respond(r, "invalid control message"); return; -} +} void xremove(Req *r) @@ -1803,7 +1803,7 @@ xremove(Req *r) respond(r, nil); } return; - + case Qimage: snprint(id, sizeof id, "%lld", sf->image); v = ncsmug("smugmug.images.delete", @@ -1832,7 +1832,7 @@ Srv xsrv; void xinit(void) -{ +{ xsrv.attach = xattach; xsrv.open = xopen; xsrv.create = xcreate; diff --git a/src/cmd/smugfs/http.c b/src/cmd/smugfs/http.c index 9cf7f1d0..c6c117fc 100644 --- a/src/cmd/smugfs/http.c +++ b/src/cmd/smugfs/http.c @@ -21,7 +21,7 @@ parseheader(char *buf, int n, HTTPHeader *hdr) { int nline; char *data, *ebuf, *p, *q, *next; - + memset(hdr, 0, sizeof *hdr); ebuf = buf+n; data = haveheader(buf, n); @@ -78,7 +78,7 @@ parseheader(char *buf, int n, HTTPHeader *hdr) q++; strncpy(hdr->codedesc, q, sizeof hdr->codedesc); hdr->codedesc[sizeof hdr->codedesc-1] = 0; - continue; + continue; } q = strchr(p, ':'); if(q == nil) @@ -103,7 +103,7 @@ parseheader(char *buf, int n, HTTPHeader *hdr) memmove(buf, data, ebuf - data); return ebuf - data; -} +} static char* genhttp(Protocol *proto, char *host, char *req, HTTPHeader *hdr, int wfd, int rfd, vlong rtotal) @@ -131,7 +131,7 @@ genhttp(Protocol *proto, char *host, char *req, HTTPHeader *hdr, int wfd, int rf proto->close(fd); return nil; } - + if(rfd >= 0){ while(rtotal > 0){ m = sizeof buf; diff --git a/src/cmd/smugfs/icache.c b/src/cmd/smugfs/icache.c index 750f232c..026aa59e 100644 --- a/src/cmd/smugfs/icache.c +++ b/src/cmd/smugfs/icache.c @@ -30,7 +30,7 @@ icachefind(char *url) { int h; Icache *ic; - + h = hash(url) % NHASH; for(ic=icache.hash[h]; ic; ic=ic->hash){ if(strcmp(ic->url, url) == 0){ @@ -82,7 +82,7 @@ icacheinsert(char *url, HTTPHeader *hdr, char *file, int fd) ic = emalloc(sizeof *ic); icache.n++; } - + ic->url = estrdup(url); ic->fd = dup(fd, -1); ic->file = estrdup(file); @@ -103,7 +103,7 @@ void icacheflush(char *substr) { Icache **l, *ic; - + for(l=&icache.head; (ic=*l); ) { if(substr == nil || strstr(ic->url, substr)) { icache.n--; @@ -116,7 +116,7 @@ icacheflush(char *substr) }else l = &ic->next; } - + if(icache.head) { icache.head->prev = nil; for(ic=icache.head; ic; ic=ic->next){ @@ -168,4 +168,3 @@ urlfetch(char *url, HTTPHeader hdr) icacheinsert(url, &hdr, buf, fd); return fd; } - diff --git a/src/cmd/smugfs/json.c b/src/cmd/smugfs/json.c index d6472b4d..c79c189c 100644 --- a/src/cmd/smugfs/json.c +++ b/src/cmd/smugfs/json.c @@ -22,7 +22,7 @@ static Json* newjval(int type) { Json *v; - + v = emalloc(sizeof *v); v->ref = 1; v->type = type; @@ -142,7 +142,7 @@ parsenumber(char **pp) double d; Json *v; - /* -?(0|[1-9][0-9]*)(\.(0|[1-9][0-9]*))?([Ee][-+]?[0-9]+) */ + /* -?(0|[1-9][0-9]*)(\.(0|[1-9][0-9]*))?([Ee][-+]?[0-9]+) */ p = wskip(*pp); q = p; if(*q == '-') @@ -171,7 +171,7 @@ parsenumber(char **pp) while('0' <= *q && *q <= '9') q++; } - + t = emalloc(q-p+1); memmove(t, p, q-p); t[q-p] = 0; @@ -185,7 +185,7 @@ parsenumber(char **pp) v = newjval(Jnumber); v->number = d; *pp = q; - return v; + return v; } static Json* @@ -335,7 +335,7 @@ Json* parsejson(char *text) { Json *v; - + v = parsevalue(&text); if(v && text && *wskip(text) != 0){ jclose(v); @@ -417,7 +417,7 @@ printjval(Json *v) { Fmt fmt; char buf[256]; - + fmtfdinit(&fmt, 1, buf, sizeof buf); _printjval(&fmt, v, 0); fmtprint(&fmt, "\n"); @@ -429,7 +429,7 @@ int jsonfmt(Fmt *fmt) { Json *v; - + v = va_arg(fmt->args, Json*); if(fmt->flags&FmtSharp) _printjval(fmt, v, 0); @@ -484,7 +484,7 @@ Json* jlookup(Json *v, char *name) { int i; - + if(v->type != Jobject) return nil; for(i=0; i<v->len; i++) @@ -498,7 +498,7 @@ jwalk(Json *v, char *path) { char elem[128], *p, *next; int n; - + for(p=path; *p && v; p=next){ next = strchr(p, '/'); if(next == nil) @@ -547,7 +547,7 @@ int jstrcmp(Json *jv, char *s) { char *t; - + t = jstring(jv); if(t == nil) return -2; diff --git a/src/cmd/smugfs/jsonrpc.c b/src/cmd/smugfs/jsonrpc.c index 92490e77..f0043bb3 100644 --- a/src/cmd/smugfs/jsonrpc.c +++ b/src/cmd/smugfs/jsonrpc.c @@ -17,7 +17,7 @@ static void jfree(CEntry *ce) { JEntry *j; - + j = (JEntry*)ce; jclose(j->reply); } @@ -45,7 +45,7 @@ static char* makehttprequest(char *host, char *path, char *postdata) { Fmt fmt; - + fmtstrinit(&fmt); fmtprint(&fmt, "POST %s HTTP/1.0\r\n", path); fmtprint(&fmt, "Host: %s\r\n", host); @@ -87,7 +87,7 @@ dojsonhttp(Protocol *proto, char *host, char *request, int rfd, vlong rlength) { char *data; HTTPHeader hdr; - + data = httpreq(proto, host, request, &hdr, rfd, rlength); if(data == nil){ fprint(2, "httpreq: %r\n"); @@ -184,7 +184,7 @@ ncsmug(char *method, char *name1, ...) { Json *jv; va_list arg; - + va_start(arg, name1); // TODO: Could use https only for login. jv = jsonrpc(&https, HOST, PATH, method, name1, arg, 0); @@ -198,7 +198,7 @@ smug(char *method, char *name1, ...) { Json *jv; va_list arg; - + va_start(arg, name1); jv = jsonrpc(&http, HOST, PATH, method, name1, arg, 1); va_end(arg); @@ -241,4 +241,3 @@ jsonupload(Protocol *proto, char *host, char *req, int rfd, vlong rlength) jclose(jv); return nil; } - diff --git a/src/cmd/smugfs/log.c b/src/cmd/smugfs/log.c index 5603211e..5e2f015a 100644 --- a/src/cmd/smugfs/log.c +++ b/src/cmd/smugfs/log.c @@ -117,4 +117,3 @@ rpclog(char *fmt, ...) lbvappend(&rpclogbuf, fmt, arg); va_end(arg); } - diff --git a/src/cmd/smugfs/main.c b/src/cmd/smugfs/main.c index 6be0ca42..e1c2745f 100644 --- a/src/cmd/smugfs/main.c +++ b/src/cmd/smugfs/main.c @@ -32,7 +32,7 @@ smuglogin(void) nil); if(v == nil) sysfatal("login failed: %r"); - + memset(up->user, 'X', strlen(up->user)); memset(up->passwd, 'X', strlen(up->passwd)); free(up); @@ -80,13 +80,13 @@ threadmain(int argc, char **argv) default: usage(); }ARGEND - + if(argc != 0) usage(); if(name == nil && mtpt == nil) mtpt = "/n/smug"; - + /* * Check twice -- if there is an exited smugfs instance * mounted there, the first access will fail but unmount it. diff --git a/src/cmd/smugfs/openssl.c b/src/cmd/smugfs/openssl.c index baccd3ac..01b169c8 100644 --- a/src/cmd/smugfs/openssl.c +++ b/src/cmd/smugfs/openssl.c @@ -39,10 +39,10 @@ opensslconnect(char *host) sbio = BIO_new_ssl_connect(ctx); BIO_get_ssl(sbio, &ssl); SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY); - + snprint(buf, sizeof buf, "%s:https", host); BIO_set_conn_hostname(sbio, buf); - + if(BIO_do_connect(sbio) <= 0 || BIO_do_handshake(sbio) <= 0){ ERR_error_string_n(ERR_get_error(), buf, sizeof buf); BIO_free_all(sbio); @@ -69,7 +69,7 @@ opensslwrite(Pfd *pfd, void *v, int n) { int m, total; char *p; - + p = v; total = 0; while(total < n){ @@ -80,7 +80,7 @@ opensslwrite(Pfd *pfd, void *v, int n) } total += m; } - return total; + return total; } static int diff --git a/src/cmd/smugfs/tcp.c b/src/cmd/smugfs/tcp.c index a203ece9..b8b95112 100644 --- a/src/cmd/smugfs/tcp.c +++ b/src/cmd/smugfs/tcp.c @@ -47,4 +47,3 @@ Protocol http = { httpwrite, httpclose, }; - diff --git a/src/cmd/smugfs/util.c b/src/cmd/smugfs/util.c index b4a649d8..90a12cb9 100644 --- a/src/cmd/smugfs/util.c +++ b/src/cmd/smugfs/util.c @@ -4,7 +4,7 @@ void* emalloc(int n) { void *v; - + v = mallocz(n, 1); if(v == nil) sysfatal("out of memory"); @@ -34,9 +34,9 @@ timefmt(Fmt *f) { Tm tm; vlong ms; - + ms = nsec()/1000000; - + tm = *localtime(ms/1000); fmtprint(f, "%02d:%02d:%02d.%03d", tm.hour, tm.min, tm.sec, @@ -64,7 +64,7 @@ urlencodefmt(Fmt *fmt) { int x; char *s; - + s = va_arg(fmt->args, char*); for(; *s; s++){ x = (uchar)*s; @@ -78,4 +78,3 @@ urlencodefmt(Fmt *fmt) } return 0; } - diff --git a/src/cmd/snarfer/osx-cocoa-snarfer.c b/src/cmd/snarfer/osx-cocoa-snarfer.c index 20f5b6ad..613a8cc5 100644 --- a/src/cmd/snarfer/osx-cocoa-snarfer.c +++ b/src/cmd/snarfer/osx-cocoa-snarfer.c @@ -1,2 +1 @@ #include "snarfer.c" - diff --git a/src/cmd/snarfer/osx-snarfer.c b/src/cmd/snarfer/osx-snarfer.c index 20f5b6ad..613a8cc5 100644 --- a/src/cmd/snarfer/osx-snarfer.c +++ b/src/cmd/snarfer/osx-snarfer.c @@ -1,2 +1 @@ #include "snarfer.c" - diff --git a/src/cmd/snarfer/snarfer.c b/src/cmd/snarfer/snarfer.c index 9477f042..d09b2f44 100644 --- a/src/cmd/snarfer/snarfer.c +++ b/src/cmd/snarfer/snarfer.c @@ -89,7 +89,7 @@ void main(int argc, char **argv) { XEvent xevent; - + ARGBEGIN{ default: usage(); @@ -100,14 +100,14 @@ main(int argc, char **argv) if((xdisplay = XOpenDisplay(nil)) == nil) sysfatal("XOpenDisplay: %r"); - drawable = XCreateWindow(xdisplay, DefaultRootWindow(xdisplay), - 0, 0, 1, 1, 0, 0, - InputOutput, DefaultVisual(xdisplay, DefaultScreen(xdisplay)), + drawable = XCreateWindow(xdisplay, DefaultRootWindow(xdisplay), + 0, 0, 1, 1, 0, 0, + InputOutput, DefaultVisual(xdisplay, DefaultScreen(xdisplay)), 0, 0); if(drawable == None) sysfatal("XCreateWindow: %r"); XFlush(xdisplay); - + xclipboard = XInternAtom(xdisplay, "CLIPBOARD", False); xutf8string = XInternAtom(xdisplay, "UTF8_STRING", False); xtargets = XInternAtom(xdisplay, "TARGETS", False); @@ -122,7 +122,7 @@ main(int argc, char **argv) xgetsnarf(); appleputsnarf(); xputsnarf(); - + for(;;){ XNextEvent(xdisplay, &xevent); switch(xevent.type){ @@ -150,9 +150,9 @@ xselectionrequest(XEvent *e) XEvent r; XSelectionRequestEvent *xe; XDisplay *xd; - + xd = xdisplay; - + memset(&r, 0, sizeof r); xe = (XSelectionRequestEvent*)e; if(0) fprint(2, "xselect target=%d requestor=%d property=%d selection=%d\n", @@ -198,7 +198,7 @@ xgetsnarf(void) int fmt, i; XWindow w; XDisplay *xd; - + xd = xdisplay; w = None; @@ -229,7 +229,7 @@ xgetsnarf(void) */ if(w == None) return nil; - + /* * We should be waiting for SelectionNotify here, but it might never * come, and we have no way to time out. Instead, we will clear @@ -256,7 +256,7 @@ xgetsnarf(void) return nil; /* get the property */ data = nil; - XGetWindowProperty(xd, drawable, prop, 0, SnarfSize/sizeof(ulong), 0, + XGetWindowProperty(xd, drawable, prop, 0, SnarfSize/sizeof(ulong), 0, AnyPropertyType, &type, &fmt, &len, &dummy, &xdata); if(xdata == nil || (type != XA_STRING && type != xutf8string) || len == 0){ if(xdata) @@ -297,7 +297,7 @@ appleputsnarf(void) fprint(2, "apple pasteboard cannot assert ownership\n"); return; } - cfdata = CFDataCreate(kCFAllocatorDefault, + cfdata = CFDataCreate(kCFAllocatorDefault, (uchar*)rsnarf, runestrlen(rsnarf)*2); if(cfdata == nil){ fprint(2, "apple pasteboard cfdatacreate failed\n"); @@ -312,5 +312,3 @@ appleputsnarf(void) CFRelease(cfdata); #endif } - - diff --git a/src/cmd/spell/code.h b/src/cmd/spell/code.h index 73fff2e2..35b59804 100644 --- a/src/cmd/spell/code.h +++ b/src/cmd/spell/code.h @@ -4,7 +4,7 @@ */ #define ED (1<<0) /* +ed, +ing */ -#define ADJ (1<<1) /* (nce)-t_ce, +ize,+al, +ness, -t+cy, +ity, +ly */ +#define ADJ (1<<1) /* (nce)-t_ce, +ize,+al, +ness, -t+cy, +ity, +ly */ #define NOUN (1<<2) /* +s (+es), +make, +hood, +ship +less */ #define PROP_COLLECT (1<<3) /* +'s, +an, +ship(for -manship) +less */ #define ACTOR (1<<4) /* +er */ @@ -15,7 +15,7 @@ #define N_AFFIX (1<<8) /* +ic, +ive, +ize, +like, +al, +ful, +ism, +ist, -t+cy, +c (maniac) */ #define V_AFFIX (1<<9) /* +able, +ive, +ity((bility), +ment */ #define V_IRREG (1<<10) /* +ing +es +s*/ -#define VERB (V_IRREG|ED) +#define VERB (V_IRREG|ED) #define MAN (1<<11) /* +man, +men, +women, +woman */ #define ADV (1<<12) /* +hood, +ness */ #define STOP (1<<14) /* stop list */ diff --git a/src/cmd/spell/sprog.c b/src/cmd/spell/sprog.c index 6eaa026f..1627829c 100644 --- a/src/cmd/spell/sprog.c +++ b/src/cmd/spell/sprog.c @@ -580,7 +580,7 @@ main(int argc, char *argv[]) print("-"); else if(!vflag) print("+"); - else + else print("%c",'0' + (suffcount>0) + (prefcount>4? 8: 2*prefcount)); } else if(!h || Set(h,STOP)) { @@ -1122,7 +1122,7 @@ dict(char* bp, char* ep) loop: if(bp >= ep) { - if(xflag) + if(xflag) fprint(2, "=%.*s\n", utfnlen(w, n), w); return 0; } diff --git a/src/cmd/split.c b/src/cmd/split.c index e758786c..14d55ef7 100644 --- a/src/cmd/split.c +++ b/src/cmd/split.c @@ -97,7 +97,7 @@ main(int argc, char *argv[]) } /* - * in case we didn't end with a newline, tack whatever's + * in case we didn't end with a newline, tack whatever's * left onto the last file */ while((n = Bread(b, buf, sizeof(buf))) > 0) @@ -119,7 +119,7 @@ nextfile(void) } else { strcpy(name, stem); strcat(name, suff); - if(++suff[1] > 'z') + if(++suff[1] > 'z') suff[1] = 'a', ++suff[0]; openf(); } @@ -135,7 +135,7 @@ matchfile(Resub *match) strcpy(name+len, suffix); openf(); return 1; - } + } return nextfile(); } diff --git a/src/cmd/srv.c b/src/cmd/srv.c index e53c99c8..c4e79cc4 100644 --- a/src/cmd/srv.c +++ b/src/cmd/srv.c @@ -30,7 +30,7 @@ threadmain(int argc, char **argv) fmtinstall('F', fcallfmt); fmtinstall('M', dirmodefmt); - + ARGBEGIN{ case 'D': debug = 1; @@ -51,7 +51,7 @@ threadmain(int argc, char **argv) default: usage(); }ARGEND - + if(argc != 1 && argc != 2) usage(); @@ -80,7 +80,7 @@ do9p(Fcall *tx, Fcall *rx) static uchar buf[9000]; static char ebuf[200]; int n; - + n = convS2M(tx, buf, sizeof buf); if(n == BIT16SZ){ werrstr("convS2M failed"); @@ -133,7 +133,7 @@ xauth(void) if(rx.type == Rerror) sysfatal("Tversion: %s", rx.ename); msize = rx.msize; - + tx.type = Tauth; tx.tag = 1; tx.afid = afid; @@ -154,7 +154,7 @@ int xread(void *buf, int n) { Fcall tx, rx; - + tx.type = Tread; tx.tag = 1; tx.fid = 0; /* afid above */ @@ -165,7 +165,7 @@ xread(void *buf, int n) werrstr("%s", rx.ename); return -1; } - + if(rx.count > n){ werrstr("too much data returned"); return -1; @@ -178,7 +178,7 @@ int xwrite(void *buf, int n) { Fcall tx, rx; - + tx.type = Twrite; tx.tag = 1; tx.fid = 0; /* afid above */ @@ -354,4 +354,3 @@ xauth_proxy(AuthGetkey *getkey, char *fmt, ...) auth_freerpc(rpc); return ai; } - diff --git a/src/cmd/strings.c b/src/cmd/strings.c index 6e7748ba..1fdbec1d 100644 --- a/src/cmd/strings.c +++ b/src/cmd/strings.c @@ -69,7 +69,7 @@ stringit(char *str) } start = 0; cnt = 0; - } + } posn = Boffset(fin); } diff --git a/src/cmd/svgpic/arcgen.c b/src/cmd/svgpic/arcgen.c index bec41e47..4cb16957 100644 --- a/src/cmd/svgpic/arcgen.c +++ b/src/cmd/svgpic/arcgen.c @@ -221,4 +221,3 @@ quadrant(double x, double y) else if( x> 0.0 && y<=0.0) return(4); else return 0; /* shut up lint */ } - diff --git a/src/cmd/svgpic/linegen.c b/src/cmd/svgpic/linegen.c index e0db5fc6..bc7e9335 100644 --- a/src/cmd/svgpic/linegen.c +++ b/src/cmd/svgpic/linegen.c @@ -225,7 +225,7 @@ obj *linegen(int type) extreme(ex, ey); nx = xi; ny = yi; } - + } p->o_ddval = ddval; if (dbg) { diff --git a/src/cmd/svgpic/misc.c b/src/cmd/svgpic/misc.c index e888fafc..1e2db1b5 100644 --- a/src/cmd/svgpic/misc.c +++ b/src/cmd/svgpic/misc.c @@ -34,7 +34,7 @@ curdir(void) /* convert current dir (hvmode) to RIGHT, LEFT, etc. */ return 0; } -double +double getcomp(obj *p, int t) /* return component of a position */ { switch (t) { diff --git a/src/cmd/svgpic/plsvg.c b/src/cmd/svgpic/plsvg.c index 7f6db9d4..575dc356 100644 --- a/src/cmd/svgpic/plsvg.c +++ b/src/cmd/svgpic/plsvg.c @@ -232,7 +232,7 @@ void arrow(double x0, double y0, double x1, double y1, double w, double h, if(i == 1) printf("M %.3f %.3f L %.3f %.3f", xconv(x1+dx), yconv(y1+dy), xconv(x1), yconv(y1)); else - printf(" L %.3f %.3f", xconv(x1+dx), yconv(y1+dy)); + printf(" L %.3f %.3f", xconv(x1+dx), yconv(y1+dy)); } if (nhead > 2) printf(" Z"); diff --git a/src/cmd/tail.c b/src/cmd/tail.c index b40552bf..68f7c5eb 100644 --- a/src/cmd/tail.c +++ b/src/cmd/tail.c @@ -343,9 +343,9 @@ getnumber(char *s) if(count < 0 || (int)count != count) fatal("too big"); return 1; -} +} -void +void fatal(char *s) { char buf[ERRMAX]; diff --git a/src/cmd/tapefs/32vfs.c b/src/cmd/tapefs/32vfs.c index 1d917f82..af5f5200 100644 --- a/src/cmd/tapefs/32vfs.c +++ b/src/cmd/tapefs/32vfs.c @@ -177,7 +177,7 @@ iget(int ino) if ((flags&VFMT)==VIFDIR) f.mode |= DMDIR; f.uid = g2byte(dp->uid); - f.gid = g2byte(dp->gid); + f.gid = g2byte(dp->gid); f.mdate = g4byte(dp->mtime); return f; } diff --git a/src/cmd/tapefs/util.c b/src/cmd/tapefs/util.c index 199235f3..a166dcd0 100644 --- a/src/cmd/tapefs/util.c +++ b/src/cmd/tapefs/util.c @@ -34,7 +34,7 @@ getpass(char *file) up[nid].id = atoi(line[2]); up[nid].name = strdup(line[0]); nid++; - } + } Bterm(bp); up[nid].name = 0; return up; diff --git a/src/cmd/tapefs/v10fs.c b/src/cmd/tapefs/v10fs.c index c2875b84..0b695dba 100644 --- a/src/cmd/tapefs/v10fs.c +++ b/src/cmd/tapefs/v10fs.c @@ -168,7 +168,7 @@ iget(int ino) if ((flags&VFMT)==VIFDIR) f.mode |= DMDIR; f.uid = g2byte(dp->uid); - f.gid = g2byte(dp->gid); + f.gid = g2byte(dp->gid); f.mdate = g4byte(dp->mtime); return f; } diff --git a/src/cmd/tapefs/v6fs.c b/src/cmd/tapefs/v6fs.c index 74c6737c..43de410c 100644 --- a/src/cmd/tapefs/v6fs.c +++ b/src/cmd/tapefs/v6fs.c @@ -169,7 +169,7 @@ iget(int ino) if ((flags&V6FMT)==V6IFDIR) f.mode |= DMDIR; f.uid = dp->uid; - f.gid = dp->gid; + f.gid = dp->gid; f.mdate = (dp->mtime[2]<<0) + (dp->mtime[3]<<8) +(dp->mtime[0]<<16) + (dp->mtime[1]<<24); return f; diff --git a/src/cmd/tapefs/zipfs.c b/src/cmd/tapefs/zipfs.c index e9354f7b..8725e0c9 100644 --- a/src/cmd/tapefs/zipfs.c +++ b/src/cmd/tapefs/zipfs.c @@ -154,7 +154,7 @@ doread(Ram *r, vlong off, long cnt) sysfatal("%d - unsupported compression method", zh.meth); break; } - + return buf; } @@ -382,4 +382,3 @@ msdos2time(int time, int date) return tm2sec(&tm); } - diff --git a/src/cmd/tar.c b/src/cmd/tar.c index 934fba9d..61e9c4a6 100644 --- a/src/cmd/tar.c +++ b/src/cmd/tar.c @@ -98,7 +98,7 @@ typedef struct Hdr { char devmajor[8]; char devminor[8]; char prefix[Maxpfx]; /* if non-null, path= prefix "/" name */ - + char pad[12]; } Hdr; diff --git a/src/cmd/tbl/t1.c b/src/cmd/tbl/t1.c index 1e6cbf11..6cb7ada1 100644 --- a/src/cmd/tbl/t1.c +++ b/src/cmd/tbl/t1.c @@ -41,7 +41,7 @@ setinp(int argc, char **argv) { sargc = argc; sargv = argv; - sargc--; + sargc--; sargv++; if (sargc > 0) swapin(); @@ -69,10 +69,10 @@ swapin(void) pr1403 = 1; if (match("-", *sargv)) break; - sargc--; + sargc--; sargv++; } - if (sargc <= 0) + if (sargc <= 0) return(0); /* file closing is done by GCOS troff preprocessor */ if(tabin) diff --git a/src/cmd/tbl/t2.c b/src/cmd/tbl/t2.c index 6d2d7414..c3ecce7d 100644 --- a/src/cmd/tbl/t2.c +++ b/src/cmd/tbl/t2.c @@ -21,5 +21,3 @@ tableput(void) freearr(); restline(); } - - diff --git a/src/cmd/tbl/t3.c b/src/cmd/tbl/t3.c index a4dc9f9f..f2f81309 100644 --- a/src/cmd/tbl/t3.c +++ b/src/cmd/tbl/t3.c @@ -1,7 +1,7 @@ /* t3.c: interpret commands affecting whole table */ # include "t.h" struct optstr { - char *optnam; + char *optnam; int *optadd; } options [] = { "expand", &expflg, @@ -46,7 +46,7 @@ getcomm(void) return; } for (cp = line; (c = *cp) != ';'; cp++) { - if (!letter(c)) + if (!letter(c)) continue; found = 0; for (lp = options; lp->optadd; lp++) { @@ -61,9 +61,9 @@ getcomm(void) if ( *cp == '(') while ((ci = *++cp) != ')') *t++ = ci; - else + else cp--; - *t++ = 0; + *t++ = 0; *t = 0; if (lp->optadd == &tab) { if (nb[0]) @@ -100,5 +100,3 @@ backrest(char *cp) un1getc(*--s); return; } - - diff --git a/src/cmd/tbl/t4.c b/src/cmd/tbl/t4.c index 558d3ba3..21fd82c6 100644 --- a/src/cmd/tbl/t4.c +++ b/src/cmd/tbl/t4.c @@ -53,13 +53,13 @@ readspec(void) case ' ': /* note this is also case tab */ continue; case '\n': - if (sawchar == 0) + if (sawchar == 0) continue; case ',': case '.': /* end of table specification */ ncol = max(ncol, icol); if (lefline[ncol][nclin] > 0) { - ncol++; + ncol++; rightl++; }; if (sawchar) @@ -85,24 +85,24 @@ readspec(void) } sawchar = 0; continue; - case 'C': - case 'S': - case 'R': - case 'N': - case 'L': + case 'C': + case 'S': + case 'R': + case 'N': + case 'L': case 'A': c += ('a' - 'A'); - case '_': - if (c == '_') + case '_': + if (c == '_') c = '-'; - case '=': + case '=': case '-': case '^': - case 'c': - case 's': - case 'n': - case 'r': - case 'l': + case 'c': + case 's': + case 'n': + case 'r': + case 'l': case 'a': style[icol][nclin] = c; if (c == 's' && icol <= 0) @@ -122,30 +122,30 @@ readspec(void) error("too many columns in table"); sawchar = 1; continue; - case 'b': + case 'b': case 'i': c += 'A' - 'a'; - case 'B': + case 'B': case 'I': - if (icol == 0) + if (icol == 0) continue; snp = font[icol-1][nclin]; snp[0] = (c == 'I' ? '2' : '3'); snp[1] = 0; continue; - case 't': + case 't': case 'T': if (icol > 0) flags[icol-1][nclin] |= CTOP; continue; - case 'd': + case 'd': case 'D': if (icol > 0) flags[icol-1][nclin] |= CDOWN; continue; - case 'f': + case 'f': case 'F': - if (icol == 0) + if (icol == 0) continue; snp = font[icol-1][nclin]; snp[0] = snp[1] = stopc = 0; @@ -155,34 +155,34 @@ readspec(void) stopc = ')'; c = get1char(); } - if (c == 0) + if (c == 0) break; if (c == stopc) { - stopc = 0; + stopc = 0; break; } - if (stopc == 0) - if (c == ' ' || c == tab ) + if (stopc == 0) + if (c == ' ' || c == tab ) break; if (c == '\n' || c == '|') { - un1getc(c); + un1getc(c); break; } snp[i] = c; - if (c >= '0' && c <= '9') + if (c >= '0' && c <= '9') break; } - if (stopc) + if (stopc) if (get1char() != stopc) error("Nonterminated font name"); continue; - case 'P': + case 'P': case 'p': - if (icol <= 0) + if (icol <= 0) continue; temp = snp = csize[icol-1][nclin]; while (c = get1char()) { - if (c == ' ' || c == tab || c == '\n') + if (c == ' ' || c == tab || c == '\n') break; if (c == '-' || c == '+') if (snp > temp) @@ -191,7 +191,7 @@ readspec(void) *snp++ = c; else if (digit(c)) *snp++ = c; - else + else break; if (snp - temp > 4) error("point size too large"); @@ -201,13 +201,13 @@ readspec(void) error("point size unreasonable"); un1getc (c); continue; - case 'V': + case 'V': case 'v': - if (icol <= 0) + if (icol <= 0) continue; temp = snp = vsize[icol-1][nclin]; while (c = get1char()) { - if (c == ' ' || c == tab || c == '\n') + if (c == ' ' || c == tab || c == '\n') break; if (c == '-' || c == '+') if (snp > temp) @@ -216,7 +216,7 @@ readspec(void) *snp++ = c; else if (digit(c)) *snp++ = c; - else + else break; if (snp - temp > 4) error("vertical spacing value too large"); @@ -224,7 +224,7 @@ readspec(void) *snp = 0; un1getc(c); continue; - case 'w': + case 'w': case 'W': snp = cll [icol-1]; /* Dale Smith didn't like this check - possible to have two text blocks @@ -253,34 +253,34 @@ readspec(void) if (!stopc) un1getc(c); continue; - case 'e': + case 'e': case 'E': - if (icol < 1) + if (icol < 1) continue; evenup[icol-1] = 1; evenflg = 1; continue; - case 'z': + case 'z': case 'Z': /* zero width-ignre width this item */ - if (icol < 1) + if (icol < 1) continue; flags[icol-1][nclin] |= ZEROW; continue; - case 'u': + case 'u': case 'U': /* half line up */ - if (icol < 1) + if (icol < 1) continue; flags[icol-1][nclin] |= HALFUP; continue; - case '0': - case '1': - case '2': - case '3': + case '0': + case '1': + case '2': + case '3': case '4': - case '5': - case '6': - case '7': - case '8': + case '5': + case '6': + case '7': + case '8': case '9': sn[0] = c; snp = sn + 1; @@ -291,7 +291,7 @@ readspec(void) continue; case '|': lefline[icol][nclin]++; - if (icol == 0) + if (icol == 0) left1flg = 1; continue; } @@ -313,9 +313,9 @@ findcol(void) if (c != '\n') un1getc(c); for (s = line; *s = c = get1char(); s++) { - if (c == ')') + if (c == ')') inpar = 0; - if (inpar) + if (inpar) continue; if (c == '\n' || c == 0 || c == '.' || c == ',') break; @@ -326,20 +326,20 @@ findcol(void) } for (p = line; p < s; p++) switch (*p) { - case 'l': - case 'r': - case 'c': - case 'n': - case 'a': + case 'l': + case 'r': + case 'c': + case 'n': + case 'a': case 's': - case 'L': - case 'R': - case 'C': - case 'N': - case 'A': + case 'L': + case 'R': + case 'C': + case 'N': + case 'A': case 'S': - case '-': - case '=': + case '-': + case '=': case '_': n++; } @@ -401,5 +401,3 @@ freearr(void) free(acase); free(topat); } - - diff --git a/src/cmd/tbl/t5.c b/src/cmd/tbl/t5.c index e23784be..c50077e7 100644 --- a/src/cmd/tbl/t5.c +++ b/src/cmd/tbl/t5.c @@ -28,7 +28,7 @@ gettbl(void) while (*cstore++) ; continue; - } else + } else instead[nlin] = 0; if (nodata(nlin)) { if (ch = oneh(nlin)) @@ -46,11 +46,11 @@ gettbl(void) table[nlin] = (struct colstr *) alocv((ncol + 2) * sizeof(table[0][0])); if (cstore[1] == 0) switch (cstore[0]) { - case '_': - fullbot[nlin] = '-'; + case '_': + fullbot[nlin] = '-'; continue; - case '=': - fullbot[nlin] = '='; + case '=': + fullbot[nlin] = '='; continue; } stynum[nlin] = nslin; @@ -60,7 +60,7 @@ gettbl(void) table[nlin][icol].rcol = 0; ch = 1; if (match(cstore, "T{")) { /* text follows */ - table[nlin][icol].col = + table[nlin][icol].col = (char *)(uintptr)gettext(cstore, nlin, icol, font[icol][stynum[nlin]], csize[icol][stynum[nlin]]); @@ -81,7 +81,7 @@ gettbl(void) } while (ctype(nlin, icol + 1) == 's') /* spanning */ table[nlin][++icol].col = ""; - if (ch == '\0') + if (ch == '\0') break; } while (++icol < ncol + 2) { @@ -95,7 +95,7 @@ gettbl(void) } last = cstore; permute(); - if (textflg) + if (textflg) untext(); return; } @@ -108,11 +108,11 @@ nodata(int il) for (c = 0; c < ncol; c++) { switch (ctype(il, c)) { - case 'c': - case 'n': - case 'r': - case 'l': - case 's': + case 'c': + case 'n': + case 'r': + case 'l': + case 's': case 'a': return(0); } @@ -169,17 +169,17 @@ permute(void) int vspand(int ir, int ij, int ifform) { - if (ir < 0) + if (ir < 0) return(0); if (ir >= nlin) return(0); - if (instead[ir]) + if (instead[ir]) return(0); - if (ifform == 0 && ctype(ir, ij) == '^') + if (ifform == 0 && ctype(ir, ij) == '^') return(1); - if (table[ir][ij].rcol != 0) + if (table[ir][ij].rcol != 0) return(0); - if (fullbot[ir]) + if (fullbot[ir]) return(0); return(vspen(table[ir][ij].col)); } @@ -188,11 +188,9 @@ vspand(int ir, int ij, int ifform) int vspen(char *s) { - if (s == 0) + if (s == 0) return(0); - if (!point(s)) + if (!point(s)) return(0); return(match(s, SPAN)); } - - diff --git a/src/cmd/tbl/t6.c b/src/cmd/tbl/t6.c index 463bfa10..aed42a07 100644 --- a/src/cmd/tbl/t6.c +++ b/src/cmd/tbl/t6.c @@ -20,16 +20,16 @@ maktab(void) /* define the tab stops of the table */ Bprint(&tabout, ".%2s\n.rm %2s\n", reg(icol, CRIGHT), reg(icol, CRIGHT)); for (ilin = 0; ilin < nlin; ilin++) { - if (instead[ilin] || fullbot[ilin]) + if (instead[ilin] || fullbot[ilin]) continue; vforml = ilin; for (il = prev(ilin); il >= 0 && vspen(table[il][icol].col); il = prev(il)) vforml = il; - if (fspan(vforml, icol)) + if (fspan(vforml, icol)) continue; - if (filler(table[ilin][icol].col)) + if (filler(table[ilin][icol].col)) continue; - if ((flags[icol][stynum[ilin]] & ZEROW) != 0) + if ((flags[icol][stynum[ilin]] & ZEROW) != 0) continue; switch (ctype(vforml, icol)) { case 'a': @@ -52,10 +52,10 @@ maktab(void) /* define the tab stops of the table */ doubled[icol] = 1; if (real(ss = table[ilin][icol].col) && !vspen(ss)) { s = (int)(uintptr)ss; - if (tx(s) != text) + if (tx(s) != text) continue; Bprint(&tabout, ".nr %d ", TMP); - wide(ss, FN(vforml, icol), SZ(vforml, icol)); + wide(ss, FN(vforml, icol), SZ(vforml, icol)); Bprint(&tabout, "\n"); Bprint(&tabout, ".if \\n(%d<\\n(%d .nr %d \\n(%d\n", S1, TMP, S1, TMP); @@ -73,10 +73,10 @@ maktab(void) /* define the tab stops of the table */ case 'l': if (real(ss = table[ilin][icol].col) && !vspen(ss)) { s = (int)(uintptr)ss; - if (tx(s) != text) + if (tx(s) != text) continue; Bprint(&tabout, ".nr %d ", TMP); - wide(ss, FN(vforml, icol), SZ(vforml, icol)); + wide(ss, FN(vforml, icol), SZ(vforml, icol)); Bprint(&tabout, "\n"); Bprint(&tabout, ".if \\n(%2s<\\n(%d .nr %2s \\n(%d\n", reg(icol, CRIGHT), TMP, reg(icol, CRIGHT), TMP); @@ -85,7 +85,7 @@ maktab(void) /* define the tab stops of the table */ } } if (acase[icol]) { - Bprint(&tabout, ".if \\n(%d>=\\n(%2s .nr %2s \\n(%du+2n\n", + Bprint(&tabout, ".if \\n(%d>=\\n(%2s .nr %2s \\n(%du+2n\n", S2, reg(icol, CRIGHT), reg(icol, CRIGHT), S2); } if (doubled[icol]) { @@ -104,13 +104,13 @@ maktab(void) /* define the tab stops of the table */ for (ilin = 0; ilin < nlin; ilin++) if (k = lspan(ilin, icol)) { ss = table[ilin][icol-k].col; - if (!real(ss) || barent(ss) || vspen(ss) ) + if (!real(ss) || barent(ss) || vspen(ss) ) continue; Bprint(&tabout, ".nr %d ", TMP); wide(table[ilin][icol-k].col, FN(ilin, icol - k), SZ(ilin, icol - k)); for (ik = k; ik >= 0; ik--) { Bprint(&tabout, "-\\n(%2s", reg(icol - ik, CRIGHT)); - if (!expflg && ik > 0) + if (!expflg && ik > 0) Bprint(&tabout, "-%dn", sep[icol-ik]); } Bprint(&tabout, "\n"); @@ -126,13 +126,13 @@ maktab(void) /* define the tab stops of the table */ } } } - if (textflg) + if (textflg) untext(); /* if even requested, make all columns widest width */ if (evenflg) { Bprint(&tabout, ".nr %d 0\n", TMP); for (icol = 0; icol < ncol; icol++) { - if (evenup[icol] == 0) + if (evenup[icol] == 0) continue; Bprint(&tabout, ".if \\n(%2s>\\n(%d .nr %d \\n(%2s\n", reg(icol, CRIGHT), TMP, TMP, reg(icol, CRIGHT)); @@ -169,7 +169,7 @@ maktab(void) /* define the tab stops of the table */ Bprint(&tabout, ".nr %d 1n\n", TMP); Bprint(&tabout, ".nr %2s 0\n", reg(-1, CRIGHT)); tsep = (boxflg || allflg || dboxflg || left1flg) ? 2 : 0; - if (sep[-1] >= 0) + if (sep[-1] >= 0) tsep = sep[-1]; for (icol = 0; icol < ncol; icol++) { Bprint(&tabout, ".nr %2s \\n(%2s+((%d*\\n(%d)/2)\n", reg(icol, CLEFT), @@ -202,14 +202,14 @@ wide(char *s, char *fn, char *size) { if (point(s)) { Bprint(&tabout, "\\w%c", F1); - if (*fn > 0) + if (*fn > 0) putfont(fn); - if (*size) + if (*size) putsize(size); Bprint(&tabout, "%s", s); - if (*fn > 0) + if (*fn > 0) putfont("P"); - if (*size) + if (*size) putsize("0"); Bprint(&tabout, "%c", F1); } else @@ -222,5 +222,3 @@ filler(char *s) { return (point(s) && s[0] == '\\' && s[1] == 'R'); } - - diff --git a/src/cmd/tbl/t7.c b/src/cmd/tbl/t7.c index 2fa9de53..6a873d61 100644 --- a/src/cmd/tbl/t7.c +++ b/src/cmd/tbl/t7.c @@ -7,7 +7,7 @@ runout(void) { int i; - if (boxflg || allflg || dboxflg) + if (boxflg || allflg || dboxflg) need(); if (ctrflg) { Bprint(&tabout, ".nr #I \\n(.i\n"); @@ -65,15 +65,15 @@ runtabs(int lform, int ldata) int ifline(char *s) { - if (!point(s)) + if (!point(s)) return(0); - if (s[0] == '\\') + if (s[0] == '\\') s++; - if (s[1] ) + if (s[1] ) return(0); - if (s[0] == '_') + if (s[0] == '_') return('-'); - if (s[0] == '=') + if (s[0] == '=') return('='); return(0); } @@ -124,7 +124,7 @@ deftail(void) Bprint(&tabout, ".if \\n(T. "); drawline(nlin, 0, ncol, dboxflg ? '=' : '-', 1, 0); Bprint(&tabout, "\n.if \\n(T. .vs\n"); - /* T. is really an argument to a macro but because of + /* T. is really an argument to a macro but because of eqn we don't dare pass it as an argument and reference by $1 */ } for (c = 0; c < ncol; c++) { @@ -146,5 +146,3 @@ deftail(void) Bprint(&tabout, "..\n"); Bprint(&tabout, ".ec\n"); } - - diff --git a/src/cmd/tbl/t8.c b/src/cmd/tbl/t8.c index bfa21ecf..26375df5 100644 --- a/src/cmd/tbl/t8.c +++ b/src/cmd/tbl/t8.c @@ -14,25 +14,25 @@ putline(int i, int nl) char *ss, *size, *fn, *rct; cmidx = watchout = vspf = exvspen = 0; - if (i == 0) + if (i == 0) once = 0; if (i == 0 && ( allflg || boxflg || dboxflg)) fullwide(0, dboxflg ? '=' : '-'); if (instead[nl] == 0 && fullbot[nl] == 0) for (c = 0; c < ncol; c++) { ss = table[nl][c].col; - if (ss == 0) + if (ss == 0) continue; if (vspen(ss)) { for (ip = nl; ip < nlin; ip = next(ip)) - if (!vspen(ss = table[ip][c].col)) + if (!vspen(ss = table[ip][c].col)) break; s = (int)(uintptr)ss; if (s > 0 && s < 128) Bprint(&tabout, ".ne \\n(%c|u+\\n(.Vu\n", (int)s); continue; } - if (point(ss)) + if (point(ss)) continue; s = (int)(uintptr)ss; Bprint(&tabout, ".ne \\n(%c|u+\\n(.Vu\n", s); @@ -55,10 +55,10 @@ putline(int i, int nl) } for (c = 0; c < ncol; c++) { if (instead[nl] == 0 && fullbot[nl] == 0) - if (vspen(table[nl][c].col)) + if (vspen(table[nl][c].col)) vspf = 1; if (lf >= 0) - if (vspen(table[lf][c].col)) + if (vspen(table[lf][c].col)) vspf = 1; } if (vspf) { @@ -69,7 +69,7 @@ putline(int i, int nl) chfont = 0; for (c = 0; c < ncol; c++) { ss = table[nl][c].col; - if (ss == 0) + if (ss == 0) continue; if(font[c][stynum[nl]]) chfont = 1; @@ -107,7 +107,7 @@ putline(int i, int nl) drawvert(lf, i, c, lwid); vct += 2; } - if (rightl && c + 1 == ncol) + if (rightl && c + 1 == ncol) continue; vforml = i; for (lf = prev(nl); lf >= 0 && vspen(table[lf][c].col); lf = prev(lf)) @@ -115,9 +115,9 @@ putline(int i, int nl) form = ctype(vforml, c); if (form != 's') { rct = reg(c, CLEFT); - if (form == 'a') + if (form == 'a') rct = reg(c, CMID); - if (form == 'n' && table[nl][c].rcol && lused[c] == 0) + if (form == 'n' && table[nl][c].rcol && lused[c] == 0) rct = reg(c, CMID); Bprint(&tabout, "\\h'|\\n(%2su'", rct); } @@ -152,10 +152,10 @@ putline(int i, int nl) } } Bprint(&tabout, "%c%c", F1, F2); - if (uphalf) + if (uphalf) Bprint(&tabout, "\\u"); puttext(ss, fn, size); - if (uphalf) + if (uphalf) Bprint(&tabout, "\\d"); Bprint(&tabout, "%c", F1); } @@ -164,13 +164,13 @@ putline(int i, int nl) break; } case 'c': - form = 3; + form = 3; break; case 'r': - form = 2; + form = 2; break; case 'l': - form = 1; + form = 1; break; case '-': case '=': @@ -212,10 +212,10 @@ putline(int i, int nl) vspf = 1; else { - if (uphalf) + if (uphalf) Bprint(&tabout, "\\u"); puttext(ss, fn, size); - if (uphalf) + if (uphalf) Bprint(&tabout, "\\d"); } if (form != 2) @@ -225,8 +225,8 @@ putline(int i, int nl) ip = prev(nl); if (ip >= 0) if (vspen(table[ip][c].col)) { - exvspen = (c + 1 < ncol) && vspen(table[ip][c+1].col) && - (topat[c] == topat[c+1]) && + exvspen = (c + 1 < ncol) && vspen(table[ip][c+1].col) && + (topat[c] == topat[c+1]) && (cmidx == (flags[c+1] [stynum[nl]] & (CTOP | CDOWN) == 0)) && (left(i, c + 1, &lwid) < 0); if (exvspen == 0) { @@ -248,7 +248,7 @@ putline(int i, int nl) } } Bprint(&tabout, "\n"); - if (allh(i) && !pr1403) + if (allh(i) && !pr1403) Bprint(&tabout, ".vs \\n(%du\n", SVS); if (watchout) funnies(i, nl); @@ -270,9 +270,9 @@ puttext(char *s, char *fn, char *size) putfont(fn); putsize(size); Bprint(&tabout, "%s", s); - if (*fn > 0) + if (*fn > 0) Bprint(&tabout, "\\f\\n(%2d", S1); - if (size != 0) + if (size != 0) putsize("0"); } } @@ -289,9 +289,9 @@ funnies(int stl, int lin) Bprint(&tabout, ".nr %d \\n(##\n", S1); /* bottom position */ for (c = 0; c < ncol; c++) { ss = table[lin][c].col; - if (point(ss)) + if (point(ss)) continue; - if (ss == 0) + if (ss == 0) continue; s = (int)(uintptr)ss; Bprint(&tabout, ".sp |\\n(##u-1v\n"); @@ -333,7 +333,7 @@ funnies(int stl, int lin) } Bprint(&tabout, ".%c+\n", s); Bprint(&tabout, ".in -\\n(%du\n", SIND); - if (*fn > 0) + if (*fn > 0) putfont("P"); Bprint(&tabout, ".mk %d\n", S2); Bprint(&tabout, ".if \\n(%d>\\n(%d .nr %d \\n(%d\n", S2, S1, S1, S2); @@ -367,5 +367,3 @@ putsize(char *s) if (s && *s) Bprint(&tabout, "\\s%s", s); } - - diff --git a/src/cmd/tbl/t9.c b/src/cmd/tbl/t9.c index 69e9d6c7..db3a4d11 100644 --- a/src/cmd/tbl/t9.c +++ b/src/cmd/tbl/t9.c @@ -37,13 +37,13 @@ domore(char *dataln) instead[0] = (char *)0; if (dataln[1] == 0) switch (dataln[0]) { - case '_': - fullbot[0] = '-'; - putline(useln, 0); + case '_': + fullbot[0] = '-'; + putline(useln, 0); return(1); - case '=': - fullbot[0] = '='; - putline(useln, 0); + case '=': + fullbot[0] = '='; + putline(useln, 0); return(1); } for (icol = 0; icol < ncol; icol++) { @@ -63,7 +63,7 @@ domore(char *dataln) } while (ctype(useln, icol + 1) == 's') /* spanning */ table[0][++icol].col = ""; - if (ch == '\0') + if (ch == '\0') break; } while (++icol < ncol) @@ -72,5 +72,3 @@ domore(char *dataln) exstore = exspace; /* reuse space for numerical items */ return(1); } - - diff --git a/src/cmd/tbl/tb.c b/src/cmd/tbl/tb.c index 5cc59880..213d371c 100644 --- a/src/cmd/tbl/tb.c +++ b/src/cmd/tbl/tb.c @@ -9,10 +9,10 @@ checkuse(void) for (c = 0; c < ncol; c++) { used[c] = lused[c] = rused[c] = 0; for (i = 0; i < nlin; i++) { - if (instead[i] || fullbot[i]) + if (instead[i] || fullbot[i]) continue; k = ctype(i, c); - if (k == '-' || k == '=') + if (k == '-' || k == '=') continue; if ((k == 'n' || k == 'a')) { rused[c] |= real(table[i][c].rcol); @@ -30,11 +30,11 @@ checkuse(void) int real(char *s) { - if (s == 0) + if (s == 0) return(0); - if (!point(s)) + if (!point(s)) return(1); - if (*s == 0) + if (*s == 0) return(0); return(1); } @@ -97,5 +97,3 @@ release(void) tpcount = -1; exstore = 0; } - - diff --git a/src/cmd/tbl/tc.c b/src/cmd/tbl/tc.c index a89fc0f0..0b9d1961 100644 --- a/src/cmd/tbl/tc.c +++ b/src/cmd/tbl/tc.c @@ -12,9 +12,9 @@ choochar(void) had[icol] = 0; F1 = F2 = 0; for (ilin = 0; ilin < nlin; ilin++) { - if (instead[ilin]) + if (instead[ilin]) continue; - if (fullbot[ilin]) + if (fullbot[ilin]) continue; for (icol = 0; icol < ncol; icol++) { k = ctype(ilin, icol); @@ -32,7 +32,7 @@ choochar(void) } /* choose first funny character */ for ( - s = "\002\003\005\006\007!%&#/?,:;<=>@`^~_{}+-*ABCDEFGHIJKMNOPQRSTUVWXYZabcdefgjkoqrstwxyz"; + s = "\002\003\005\006\007!%&#/?,:;<=>@`^~_{}+-*ABCDEFGHIJKMNOPQRSTUVWXYZabcdefgjkoqrstwxyz"; *s; s++) { if (had[(unsigned char)*s] == 0) { F1 = (unsigned char)*s; @@ -42,7 +42,7 @@ choochar(void) } /* choose second funny character */ for ( - s = "\002\003\005\006\007:_~^`@;,<=>#%&!/?{}+-*ABCDEFGHIJKMNOPQRSTUVWXZabcdefgjkoqrstuwxyz"; + s = "\002\003\005\006\007:_~^`@;,<=>#%&!/?{}+-*ABCDEFGHIJKMNOPQRSTUVWXZabcdefgjkoqrstuwxyz"; *s; s++) { if (had[(unsigned char)*s] == 0) { F2 = (unsigned char)*s; @@ -61,5 +61,3 @@ point(char *ss) int s = (int)(uintptr)ss; return(s >= 128 || s < 0); } - - diff --git a/src/cmd/tbl/te.c b/src/cmd/tbl/te.c index 3df8d445..54df7e82 100644 --- a/src/cmd/tbl/te.c +++ b/src/cmd/tbl/te.c @@ -71,5 +71,3 @@ get1char(void) iline++; return(c); } - - diff --git a/src/cmd/tbl/tf.c b/src/cmd/tbl/tf.c index 3791c32f..097dfe36 100644 --- a/src/cmd/tbl/tf.c +++ b/src/cmd/tbl/tf.c @@ -70,5 +70,3 @@ cleanfc(void) { Bprint(&tabout, ".fc\n"); } - - diff --git a/src/cmd/tbl/tg.c b/src/cmd/tbl/tg.c index 3afc88c6..7b5374bd 100644 --- a/src/cmd/tbl/tg.c +++ b/src/cmd/tbl/tg.c @@ -10,7 +10,7 @@ gettext(char *sp, int ilin, int icol, char *fn, char *sz) char *vs; startline = iline; - if (texname == 0) + if (texname == 0) error("Too many text block diversions"); if (textflg == 0) { Bprint(&tabout, ".nr %d \\n(.lu\n", SL); /* remember old line length */ @@ -21,13 +21,13 @@ gettext(char *sp, int ilin, int icol, char *fn, char *sz) Bprint(&tabout, ".br\n"); Bprint(&tabout, ".di %c+\n", texname); rstofill(); - if (fn && *fn) + if (fn && *fn) Bprint(&tabout, ".nr %d \\n(.f\n.ft %s\n", S1, fn); Bprint(&tabout, ".ft \\n(.f\n"); /* protect font */ vs = vsize[icol][stynum[ilin]]; if ((sz && *sz) || (vs && *vs)) { Bprint(&tabout, ".nr %d \\n(.v\n", S9); - if (vs == 0 || *vs == 0) + if (vs == 0 || *vs == 0) vs = "\\n(.s+2"; if (sz && *sz) Bprint(&tabout, ".ps %s\n", sz); @@ -48,15 +48,15 @@ gettext(char *sp, int ilin, int icol, char *fn, char *sz) iline = startline; error("missing closing T}"); } - if (line[0] == 'T' && line[1] == '}' && line[2] == tab) + if (line[0] == 'T' && line[1] == '}' && line[2] == tab) break; - if (match("T}", line)) + if (match("T}", line)) break; Bprint(&tabout, "%s\n", line); } - if (fn && *fn) + if (fn && *fn) Bprint(&tabout, ".ft \\n(%d\n", S1); - if (sz && *sz) + if (sz && *sz) Bprint(&tabout, ".br\n.ps\n.vs\n"); Bprint(&tabout, ".br\n"); Bprint(&tabout, ".di\n"); @@ -82,5 +82,3 @@ untext(void) Bprint(&tabout, ".nf\n"); Bprint(&tabout, ".ll \\n(%du\n", SL); } - - diff --git a/src/cmd/tbl/ti.c b/src/cmd/tbl/ti.c index ef995bbb..d4a2ab4d 100644 --- a/src/cmd/tbl/ti.c +++ b/src/cmd/tbl/ti.c @@ -9,9 +9,9 @@ interv(int i, int c) if (c >= ncol || c == 0) { if (dboxflg) { - if (i == 0) + if (i == 0) return(BOT); - if (i >= nlin) + if (i >= nlin) return(TOP); return(THRU); } @@ -23,11 +23,11 @@ interv(int i, int c) kl = 0; else kl = lefdata(allh(i) ? i + 1 : i, c); - if (ku == 2 && kl == 2) + if (ku == 2 && kl == 2) return(THRU); - if (ku == 2) + if (ku == 2) return(TOP); - if (kl == BOT) + if (kl == BOT) return(2); return(0); } @@ -45,7 +45,7 @@ interh(int i, int c) return(RIGHT); return(THRU); } - if (i >= nlin) + if (i >= nlin) return(0); kl = c > 0 ? thish (i, c - 1) : 0; if (kl <= 1 && i > 0 && allh(up1(i))) @@ -53,11 +53,11 @@ interh(int i, int c) kr = thish(i, c); if (kr <= 1 && i > 0 && allh(up1(i))) kr = c > 0 ? thish(up1(i), c) : 0; - if (kl == '=' && kr == '=') + if (kl == '=' && kr == '=') return(THRU); - if (kl == '=') + if (kl == '=') return(LEFT); - if (kr == '=') + if (kr == '=') return(RIGHT); return(0); } @@ -67,9 +67,7 @@ int up1(int i) { i--; - while (instead[i] && i > 0) + while (instead[i] && i > 0) i--; return(i); } - - diff --git a/src/cmd/tbl/tm.c b/src/cmd/tbl/tm.c index 5b58f0d1..cee294c4 100644 --- a/src/cmd/tbl/tm.c +++ b/src/cmd/tbl/tm.c @@ -15,8 +15,8 @@ maknew(char *str) str = p; if (ba == 0) { for (dpoint = 0; *str; str++) { - if (*str == '.' && !ineqn(str, p) && - (str > p && digit(*(str - 1)) || + if (*str == '.' && !ineqn(str, p) && + (str > p && digit(*(str - 1)) || digit(*(str + 1)))) dpoint = str; } @@ -27,7 +27,7 @@ maknew(char *str) } if (!dpoint && p == str) /* not numerical, don't split */ return(0); - if (dpoint) + if (dpoint) str = dpoint; } else str = ba; @@ -61,5 +61,3 @@ ineqn (char *s, char *p) } return(0); } - - diff --git a/src/cmd/tbl/tr.c b/src/cmd/tbl/tr.c index 7d586e8b..6a626115 100644 --- a/src/cmd/tbl/tr.c +++ b/src/cmd/tbl/tr.c @@ -24,5 +24,3 @@ reg(int col, int place) error("Too many columns for registers"); return (nregs[qcol*place+col]); } - - diff --git a/src/cmd/tbl/ts.c b/src/cmd/tbl/ts.c index 43cc84ec..2a98b5d6 100644 --- a/src/cmd/tbl/ts.c +++ b/src/cmd/tbl/ts.c @@ -19,7 +19,7 @@ prefix(char *small, char *big) int c; while ((c = *small++) == *big++) - if (c == 0) + if (c == 0) return(1); return(c == 0); } @@ -67,5 +67,3 @@ tcopy (char *s, char *t) while (*s++ = *t++) ; } - - diff --git a/src/cmd/tbl/tt.c b/src/cmd/tbl/tt.c index 96270b75..54c6180e 100644 --- a/src/cmd/tbl/tt.c +++ b/src/cmd/tbl/tt.c @@ -33,7 +33,7 @@ lspan(int i, int c) { int k; - if (ctype(i, c) != 's') + if (ctype(i, c) != 's') return(0); c++; if (c < ncol && ctype(i, c) == 's') @@ -73,15 +73,15 @@ allh(int i) /* also at least one must be horizontl */ int c, one, k; - if (fullbot[i]) + if (fullbot[i]) return(1); - if (i >= nlin) + if (i >= nlin) return(dboxflg || boxflg); for (one = c = 0; c < ncol; c++) { k = thish(i, c); - if (k == 0) + if (k == 0) return(0); - if (k == 1) + if (k == 1) continue; one = 1; } @@ -98,30 +98,28 @@ thish(int i, int c) if (c < 0) return(0); - if (i < 0) + if (i < 0) return(0); t = ctype(i, c); if (t == '_' || t == '-') return('-'); if (t == '=') return('='); - if (t == '^') + if (t == '^') return(1); if (fullbot[i] ) return(fullbot[i]); - if (t == 's') + if (t == 's') return(thish(i, c - 1)); - if (t == 0) + if (t == 0) return(1); pc = &table[i][c]; s = (t == 'a' ? pc->rcol : pc->col); if (s == 0 || (point(s) && *s == 0)) return(1); - if (vspen(s)) + if (vspen(s)) return(1); if (t = barent( s)) return(t); return(0); } - - diff --git a/src/cmd/tbl/tu.c b/src/cmd/tbl/tu.c index 217869e1..94089577 100644 --- a/src/cmd/tbl/tu.c +++ b/src/cmd/tbl/tu.c @@ -7,7 +7,7 @@ makeline(int i, int c, int lintype) int cr, type, shortl; type = thish(i, c); - if (type == 0) + if (type == 0) return; shortl = (table[i][c].col[0] == '\\'); if (c > 0 && !shortl && thish(i, c - 1) == type) @@ -55,17 +55,17 @@ drawline(int i, int cl, int cr, int lintype, int noheight, int shortl) lcount = 0; exhr = exhl = ""; switch (lintype) { - case '-': + case '-': lcount = 1; break; - case '=': - lcount = pr1403 ? 1 : 2; + case '=': + lcount = pr1403 ? 1 : 2; break; - case SHORTLINE: - lcount = 1; + case SHORTLINE: + lcount = 1; break; } - if (lcount <= 0) + if (lcount <= 0) return; nodata = cr - cl >= ncol || noheight || allh(i); if (!nodata) @@ -79,26 +79,26 @@ drawline(int i, int cl, int cr, int lintype, int noheight, int shortl) tohcol(cl); if (lcount > 1) { switch (interv(i, cl)) { - case TOP: - exhl = ln == 0 ? "1p" : "-1p"; + case TOP: + exhl = ln == 0 ? "1p" : "-1p"; break; - case BOT: - exhl = ln == 1 ? "1p" : "-1p"; + case BOT: + exhl = ln == 1 ? "1p" : "-1p"; break; - case THRU: - exhl = "1p"; + case THRU: + exhl = "1p"; break; } if (exhl[0]) Bprint(&tabout, "\\h'%s'", exhl); } else if (lcount == 1) { switch (interv(i, cl)) { - case TOP: - case BOT: - exhl = "-1p"; + case TOP: + case BOT: + exhl = "-1p"; break; - case THRU: - exhl = "1p"; + case THRU: + exhl = "1p"; break; } if (exhl[0]) @@ -106,24 +106,24 @@ drawline(int i, int cl, int cr, int lintype, int noheight, int shortl) } if (lcount > 1) { switch (interv(i, cr + 1)) { - case TOP: - exhr = ln == 0 ? "-1p" : "+1p"; + case TOP: + exhr = ln == 0 ? "-1p" : "+1p"; break; - case BOT: - exhr = ln == 1 ? "-1p" : "+1p"; + case BOT: + exhr = ln == 1 ? "-1p" : "+1p"; break; - case THRU: - exhr = "-1p"; + case THRU: + exhr = "-1p"; break; } } else if (lcount == 1) { switch (interv(i, cr + 1)) { - case TOP: - case BOT: - exhr = "+1p"; + case TOP: + case BOT: + exhr = "+1p"; break; - case THRU: - exhr = "-1p"; + case THRU: + exhr = "-1p"; break; } } @@ -183,18 +183,18 @@ left(int i, int c, int *lwidp) /* returns number of line where it starts */ /* stores into lwid the kind of line */ *lwidp = 0; - if (i < 0) + if (i < 0) return(-1); kind = lefdata(i, c); - if (kind == 0) + if (kind == 0) return(-1); if (i + 1 < nlin) - if (lefdata(next(i), c) == kind) + if (lefdata(next(i), c) == kind) return(-1); li = i; while (i >= 0 && lefdata(i, c) == kind) i = prev(li = i); - if (prev(li) == -1) + if (prev(li) == -1) li = 0; *lwidp = kind; for (lj = i + 1; lj < li; lj++) @@ -212,7 +212,7 @@ lefdata(int i, int c) { int ck; - if (i >= nlin) + if (i >= nlin) i = nlin - 1; if (ctype(i, c) == 's') { for (ck = c; ctype(i, ck) == 's'; ck--) @@ -222,13 +222,13 @@ lefdata(int i, int c) } i = stynum[i]; i = lefline[c][i]; - if (i > 0) + if (i > 0) return(i); - if (dboxflg && c == 0) + if (dboxflg && c == 0) return(2); if (allflg) return(1); - if (boxflg && c == 0) + if (boxflg && c == 0) return(1); return(0); } @@ -239,7 +239,7 @@ next(int i) { while (i + 1 < nlin) { i++; - if (!fullbot[i] && !instead[i]) + if (!fullbot[i] && !instead[i]) break; } return(i); @@ -253,5 +253,3 @@ prev(int i) ; return(i); } - - diff --git a/src/cmd/tbl/tv.c b/src/cmd/tbl/tv.c index 19a4b03f..0fb330cc 100644 --- a/src/cmd/tbl/tv.c +++ b/src/cmd/tbl/tv.c @@ -10,12 +10,12 @@ drawvert(int start, int end, int c, int lwid) end++; vm = 'v'; /* note: nr 35 has value of 1m outside of linesize */ - while (instead[end]) + while (instead[end]) end++; for (ln = 0; ln < lwid; ln++) { epb = ept = 0; pos = 2 * ln - lwid + 1; - if (pos != tp) + if (pos != tp) Bprint(&tabout, "\\h'%dp'", pos - tp); tp = pos; if (end < nlin) { @@ -24,53 +24,53 @@ drawvert(int start, int end, int c, int lwid) else switch (midbar(end, c)) { case '-': - exb = "1v-.5m"; + exb = "1v-.5m"; break; case '=': exb = "1v-.5m"; - epb = 1; + epb = 1; break; } } if (lwid > 1) switch (interh(end, c)) { - case THRU: - epb -= 1; + case THRU: + epb -= 1; break; - case RIGHT: - epb += (ln == 0 ? 1 : -1); + case RIGHT: + epb += (ln == 0 ? 1 : -1); break; - case LEFT: - epb += (ln == 1 ? 1 : -1); + case LEFT: + epb += (ln == 1 ? 1 : -1); break; } if (lwid == 1) switch (interh(end, c)) { - case THRU: - epb -= 1; + case THRU: + epb -= 1; break; - case RIGHT: - case LEFT: - epb += 1; + case RIGHT: + case LEFT: + epb += 1; break; } if (start > 0) { sl = start - 1; - while (sl >= 0 && instead[sl]) + while (sl >= 0 && instead[sl]) sl--; if (sl >= 0 && (fullbot[sl] || allh(sl))) ept = 0; else if (sl >= 0) switch (midbar(sl, c)) { case '-': - ext = ".5m"; + ext = ".5m"; break; case '=': - ext = ".5m"; - ept = -1; + ext = ".5m"; + ept = -1; break; default: - vm = 'm'; + vm = 'm'; break; } else @@ -81,24 +81,24 @@ drawvert(int start, int end, int c, int lwid) } if (lwid > 1) switch (interh(start, c)) { - case THRU: - ept += 1; + case THRU: + ept += 1; break; - case LEFT: - ept += (ln == 0 ? 1 : -1); + case LEFT: + ept += (ln == 0 ? 1 : -1); break; - case RIGHT: - ept += (ln == 1 ? 1 : -1); + case RIGHT: + ept += (ln == 1 ? 1 : -1); break; } else if (lwid == 1) switch (interh(start, c)) { - case THRU: - ept += 1; + case THRU: + ept += 1; break; - case LEFT: - case RIGHT: - ept -= 1; + case LEFT: + case RIGHT: + ept -= 1; break; } if (exb) @@ -163,11 +163,11 @@ midbcol(int i, int c) int barent(char *s) { - if (s == 0) + if (s == 0) return (1); - if (!point(s)) + if (!point(s)) return(0); - if (s[0] == '\\') + if (s[0] == '\\') s++; if (s[1] != 0) return(0); @@ -179,5 +179,3 @@ barent(char *s) } return(0); } - - diff --git a/src/cmd/tcs/conv_ksc.c b/src/cmd/tcs/conv_ksc.c index 293ffad1..da1ebe0a 100644 --- a/src/cmd/tcs/conv_ksc.c +++ b/src/cmd/tcs/conv_ksc.c @@ -158,4 +158,3 @@ uksc_out(Rune *base, int n, long *notused) if(p > obuf) write(1, obuf, p-obuf); } - diff --git a/src/cmd/tcs/font/bbits.c b/src/cmd/tcs/font/bbits.c index e4880336..feb2d755 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/html.c b/src/cmd/tcs/html.c index 93bd9e5a..be71c080 100644 --- a/src/cmd/tcs/html.c +++ b/src/cmd/tcs/html.c @@ -294,7 +294,7 @@ static int hnamecmp(const void *va, const void *vb) { Hchar *a, *b; - + a = (Hchar*)va; b = (Hchar*)vb; return strcmp(a->s, b->s); @@ -304,7 +304,7 @@ static int hrunecmp(const void *va, const void *vb) { Hchar *a, *b; - + a = (Hchar*)va; b = (Hchar*)vb; return a->r - b->r; @@ -315,12 +315,12 @@ html_init(void) { static int init; int i; - + if(init) return; init = 1; memmove(byrune, byname, sizeof byrune); - + /* Eliminate names we aren't allowed to generate. */ for(i=0; i<nelem(byrune); i++){ if(byrune[i].s[0] == '_'){ @@ -328,7 +328,7 @@ html_init(void) byname[i].s++; } } - + qsort(byname, nelem(byname), sizeof byname[0], hnamecmp); qsort(byrune, nelem(byrune), sizeof byrune[0], hrunecmp); } @@ -338,7 +338,7 @@ findbyname(char *s) { Hchar *h; int n, m, x; - + h = byname; n = nelem(byname); while(n > 0){ @@ -386,9 +386,9 @@ html_in(int fd, long *x, struct convert *out) Rune rbuf[N]; Rune *r, *er; int c, i; - + USED(x); - + html_init(); r = rbuf; er = rbuf+N; @@ -453,7 +453,7 @@ html_out(Rune *r, int n, long *x) char *s; Biobuf b; Rune *er; - + USED(x); html_init(); Binit(&b, 1, OWRITE); @@ -468,4 +468,3 @@ html_out(Rune *r, int n, long *x) } Bflush(&b); } - diff --git a/src/cmd/tcs/jis.h b/src/cmd/tcs/jis.h index 9b6d1dcc..9c726ee2 100644 --- a/src/cmd/tcs/jis.h +++ b/src/cmd/tcs/jis.h @@ -104,4 +104,3 @@ * Returns 1 if they are, or 0 otherwise. */ #define CANJ2S(_h, _l) (CANJ2SB(_h) && CANJ2SB(_l)) - diff --git a/src/cmd/tcs/ksc.c b/src/cmd/tcs/ksc.c index 90d6793b..05b0ecaf 100644 --- a/src/cmd/tcs/ksc.c +++ b/src/cmd/tcs/ksc.c @@ -1,7 +1,7 @@ #include "ksc.h" /* KSC5601 -> Unicode mapping table, compressed for the 94*94 codeset. */ -/* +/* * Unlike kuten-table, needed offset is 33 (0x21) instead of * 32 for 7-bit portion of each byte. i.e., a Unicode * codepoint for KSC's codepoint (n, m) would be found at @@ -9,978 +9,978 @@ */ long tabksc5601[] = { /* KSC 5601 -> Unicode mapping table; max codepoint = 0x7d7e */ - 0x3000, 0x3001, 0x3002, 0x00b7, 0x2025, 0x2026, 0x00a8, 0x3003, 0x00ad, - 0x2015, 0x2225, 0xff3c, 0x223c, 0x2018, 0x2019, 0x201c, 0x201d, 0x3014, - 0x3015, 0x3008, 0x3009, 0x300a, 0x300b, 0x300c, 0x300d, 0x300e, 0x300f, - 0x3010, 0x3011, 0x00b1, 0x00d7, 0x00f7, 0x2260, 0x2264, 0x2265, 0x221e, - 0x2234, 0x00b0, 0x2032, 0x2033, 0x2103, 0x212b, 0xffe0, 0xffe1, 0xffe5, - 0x2642, 0x2640, 0x2220, 0x22a5, 0x2312, 0x2202, 0x2207, 0x2261, 0x2252, - 0x00a7, 0x203b, 0x2606, 0x2605, 0x25cb, 0x25cf, 0x25ce, 0x25c7, 0x25c6, - 0x25a1, 0x25a0, 0x25b3, 0x25b2, 0x25bd, 0x25bc, 0x2192, 0x2190, 0x2191, - 0x2193, 0x2194, 0x3013, 0x226a, 0x226b, 0x221a, 0x223d, 0x221d, 0x2235, - 0x222b, 0x222c, 0x2208, 0x220b, 0x2286, 0x2287, 0x2282, 0x2283, 0x222a, - 0x2229, 0x2227, 0x2228, 0xffe2, 0x21d2, 0x21d4, 0x2200, 0x2203, 0x00b4, - 0xff5e, 0x02c7, 0x02d8, 0x02dd, 0x02da, 0x02d9, 0x00b8, 0x02db, 0x00a1, - 0x00bf, 0x02d0, 0x222e, 0x2211, 0x220f, 0x00a4, 0x2109, 0x2030, 0x25c1, - 0x25c0, 0x25b7, 0x25b6, 0x2664, 0x2660, 0x2661, 0x2665, 0x2667, 0x2663, - 0x25c9, 0x25c8, 0x25a3, 0x25d0, 0x25d1, 0x2592, 0x25a4, 0x25a5, 0x25a8, - 0x25a7, 0x25a6, 0x25a9, 0x2668, 0x260f, 0x260e, 0x261c, 0x261e, 0x00b6, - 0x2020, 0x2021, 0x2195, 0x2197, 0x2199, 0x2196, 0x2198, 0x266d, 0x2669, - 0x266a, 0x266c, 0x327f, 0x321c, 0x2116, 0x33c7, 0x2122, 0x33c2, 0x33d8, - 0x2121, -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, 0xff01, - 0xff02, 0xff03, 0xff04, 0xff05, 0xff06, 0xff07, 0xff08, 0xff09, 0xff0a, - 0xff0b, 0xff0c, 0xff0d, 0xff0e, 0xff0f, 0xff10, 0xff11, 0xff12, 0xff13, - 0xff14, 0xff15, 0xff16, 0xff17, 0xff18, 0xff19, 0xff1a, 0xff1b, 0xff1c, - 0xff1d, 0xff1e, 0xff1f, 0xff20, 0xff21, 0xff22, 0xff23, 0xff24, 0xff25, - 0xff26, 0xff27, 0xff28, 0xff29, 0xff2a, 0xff2b, 0xff2c, 0xff2d, 0xff2e, - 0xff2f, 0xff30, 0xff31, 0xff32, 0xff33, 0xff34, 0xff35, 0xff36, 0xff37, - 0xff38, 0xff39, 0xff3a, 0xff3b, 0xffe6, 0xff3d, 0xff3e, 0xff3f, 0xff40, - 0xff41, 0xff42, 0xff43, 0xff44, 0xff45, 0xff46, 0xff47, 0xff48, 0xff49, - 0xff4a, 0xff4b, 0xff4c, 0xff4d, 0xff4e, 0xff4f, 0xff50, 0xff51, 0xff52, - 0xff53, 0xff54, 0xff55, 0xff56, 0xff57, 0xff58, 0xff59, 0xff5a, 0xff5b, - 0xff5c, 0xff5d, 0xffe3, 0x3131, 0x3132, 0x3133, 0x3134, 0x3135, 0x3136, - 0x3137, 0x3138, 0x3139, 0x313a, 0x313b, 0x313c, 0x313d, 0x313e, 0x313f, - 0x3140, 0x3141, 0x3142, 0x3143, 0x3144, 0x3145, 0x3146, 0x3147, 0x3148, - 0x3149, 0x314a, 0x314b, 0x314c, 0x314d, 0x314e, 0x314f, 0x3150, 0x3151, - 0x3152, 0x3153, 0x3154, 0x3155, 0x3156, 0x3157, 0x3158, 0x3159, 0x315a, - 0x315b, 0x315c, 0x315d, 0x315e, 0x315f, 0x3160, 0x3161, 0x3162, 0x3163, - 0x3164, 0x3165, 0x3166, 0x3167, 0x3168, 0x3169, 0x316a, 0x316b, 0x316c, - 0x316d, 0x316e, 0x316f, 0x3170, 0x3171, 0x3172, 0x3173, 0x3174, 0x3175, - 0x3176, 0x3177, 0x3178, 0x3179, 0x317a, 0x317b, 0x317c, 0x317d, 0x317e, - 0x317f, 0x3180, 0x3181, 0x3182, 0x3183, 0x3184, 0x3185, 0x3186, 0x3187, - 0x3188, 0x3189, 0x318a, 0x318b, 0x318c, 0x318d, 0x318e, 0x2170, 0x2171, - 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, -1, - -1, -1, -1, -1, 0x2160, 0x2161, 0x2162, 0x2163, 0x2164, - 0x2165, 0x2166, 0x2167, 0x2168, 0x2169, -1, -1, -1, -1, - -1, -1, -1, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, - 0x0397, 0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, - 0x03a0, 0x03a1, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7, 0x03a8, 0x03a9, - -1, -1, -1, -1, -1, -1, -1, -1, 0x03b1, - 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, 0x03b8, 0x03b9, 0x03ba, - 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, 0x03c0, 0x03c1, 0x03c3, 0x03c4, - 0x03c5, 0x03c6, 0x03c7, 0x03c8, 0x03c9, -1, -1, -1, -1, - -1, -1, 0x2500, 0x2502, 0x250c, 0x2510, 0x2518, 0x2514, 0x251c, - 0x252c, 0x2524, 0x2534, 0x253c, 0x2501, 0x2503, 0x250f, 0x2513, 0x251b, - 0x2517, 0x2523, 0x2533, 0x252b, 0x253b, 0x254b, 0x2520, 0x252f, 0x2528, - 0x2537, 0x253f, 0x251d, 0x2530, 0x2525, 0x2538, 0x2542, 0x2512, 0x2511, - 0x251a, 0x2519, 0x2516, 0x2515, 0x250e, 0x250d, 0x251e, 0x251f, 0x2521, - 0x2522, 0x2526, 0x2527, 0x2529, 0x252a, 0x252d, 0x252e, 0x2531, 0x2532, - 0x2535, 0x2536, 0x2539, 0x253a, 0x253d, 0x253e, 0x2540, 0x2541, 0x2543, - 0x2544, 0x2545, 0x2546, 0x2547, 0x2548, 0x2549, 0x254a, -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, 0x3395, 0x3396, 0x3397, - 0x2113, 0x3398, 0x33c4, 0x33a3, 0x33a4, 0x33a5, 0x33a6, 0x3399, 0x339a, - 0x339b, 0x339c, 0x339d, 0x339e, 0x339f, 0x33a0, 0x33a1, 0x33a2, 0x33ca, - 0x338d, 0x338e, 0x338f, 0x33cf, 0x3388, 0x3389, 0x33c8, 0x33a7, 0x33a8, - 0x33b0, 0x33b1, 0x33b2, 0x33b3, 0x33b4, 0x33b5, 0x33b6, 0x33b7, 0x33b8, - 0x33b9, 0x3380, 0x3381, 0x3382, 0x3383, 0x3384, 0x33ba, 0x33bb, 0x33bc, - 0x33bd, 0x33be, 0x33bf, 0x3390, 0x3391, 0x3392, 0x3393, 0x3394, 0x2126, - 0x33c0, 0x33c1, 0x338a, 0x338b, 0x338c, 0x33d6, 0x33c5, 0x33ad, 0x33ae, - 0x33af, 0x33db, 0x33a9, 0x33aa, 0x33ab, 0x33ac, 0x33dd, 0x33d0, 0x33d3, - 0x33c3, 0x33c9, 0x33dc, 0x33c6, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 0x00c6, 0x00d0, 0x00aa, 0x0126, -1, 0x0132, -1, 0x013f, - 0x0141, 0x00d8, 0x0152, 0x00ba, 0x00de, 0x0166, 0x014a, -1, 0x3260, - 0x3261, 0x3262, 0x3263, 0x3264, 0x3265, 0x3266, 0x3267, 0x3268, 0x3269, - 0x326a, 0x326b, 0x326c, 0x326d, 0x326e, 0x326f, 0x3270, 0x3271, 0x3272, - 0x3273, 0x3274, 0x3275, 0x3276, 0x3277, 0x3278, 0x3279, 0x327a, 0x327b, - 0x24d0, 0x24d1, 0x24d2, 0x24d3, 0x24d4, 0x24d5, 0x24d6, 0x24d7, 0x24d8, - 0x24d9, 0x24da, 0x24db, 0x24dc, 0x24dd, 0x24de, 0x24df, 0x24e0, 0x24e1, - 0x24e2, 0x24e3, 0x24e4, 0x24e5, 0x24e6, 0x24e7, 0x24e8, 0x24e9, 0x2460, - 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467, 0x2468, 0x2469, - 0x246a, 0x246b, 0x246c, 0x246d, 0x246e, 0x00bd, 0x2153, 0x2154, 0x00bc, - 0x00be, 0x215b, 0x215c, 0x215d, 0x215e, 0x00e6, 0x0111, 0x00f0, 0x0127, - 0x0131, 0x0133, 0x0138, 0x0140, 0x0142, 0x00f8, 0x0153, 0x00df, 0x00fe, - 0x0167, 0x014b, 0x0149, 0x3200, 0x3201, 0x3202, 0x3203, 0x3204, 0x3205, - 0x3206, 0x3207, 0x3208, 0x3209, 0x320a, 0x320b, 0x320c, 0x320d, 0x320e, - 0x320f, 0x3210, 0x3211, 0x3212, 0x3213, 0x3214, 0x3215, 0x3216, 0x3217, - 0x3218, 0x3219, 0x321a, 0x321b, 0x249c, 0x249d, 0x249e, 0x249f, 0x24a0, - 0x24a1, 0x24a2, 0x24a3, 0x24a4, 0x24a5, 0x24a6, 0x24a7, 0x24a8, 0x24a9, - 0x24aa, 0x24ab, 0x24ac, 0x24ad, 0x24ae, 0x24af, 0x24b0, 0x24b1, 0x24b2, - 0x24b3, 0x24b4, 0x24b5, 0x2474, 0x2475, 0x2476, 0x2477, 0x2478, 0x2479, - 0x247a, 0x247b, 0x247c, 0x247d, 0x247e, 0x247f, 0x2480, 0x2481, 0x2482, - 0x00b9, 0x00b2, 0x00b3, 0x2074, 0x207f, 0x2081, 0x2082, 0x2083, 0x2084, - 0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047, 0x3048, 0x3049, - 0x304a, 0x304b, 0x304c, 0x304d, 0x304e, 0x304f, 0x3050, 0x3051, 0x3052, - 0x3053, 0x3054, 0x3055, 0x3056, 0x3057, 0x3058, 0x3059, 0x305a, 0x305b, - 0x305c, 0x305d, 0x305e, 0x305f, 0x3060, 0x3061, 0x3062, 0x3063, 0x3064, - 0x3065, 0x3066, 0x3067, 0x3068, 0x3069, 0x306a, 0x306b, 0x306c, 0x306d, - 0x306e, 0x306f, 0x3070, 0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076, - 0x3077, 0x3078, 0x3079, 0x307a, 0x307b, 0x307c, 0x307d, 0x307e, 0x307f, - 0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087, 0x3088, - 0x3089, 0x308a, 0x308b, 0x308c, 0x308d, 0x308e, 0x308f, 0x3090, 0x3091, - 0x3092, 0x3093, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 0x30a1, 0x30a2, 0x30a3, 0x30a4, 0x30a5, - 0x30a6, 0x30a7, 0x30a8, 0x30a9, 0x30aa, 0x30ab, 0x30ac, 0x30ad, 0x30ae, - 0x30af, 0x30b0, 0x30b1, 0x30b2, 0x30b3, 0x30b4, 0x30b5, 0x30b6, 0x30b7, - 0x30b8, 0x30b9, 0x30ba, 0x30bb, 0x30bc, 0x30bd, 0x30be, 0x30bf, 0x30c0, - 0x30c1, 0x30c2, 0x30c3, 0x30c4, 0x30c5, 0x30c6, 0x30c7, 0x30c8, 0x30c9, - 0x30ca, 0x30cb, 0x30cc, 0x30cd, 0x30ce, 0x30cf, 0x30d0, 0x30d1, 0x30d2, - 0x30d3, 0x30d4, 0x30d5, 0x30d6, 0x30d7, 0x30d8, 0x30d9, 0x30da, 0x30db, - 0x30dc, 0x30dd, 0x30de, 0x30df, 0x30e0, 0x30e1, 0x30e2, 0x30e3, 0x30e4, - 0x30e5, 0x30e6, 0x30e7, 0x30e8, 0x30e9, 0x30ea, 0x30eb, 0x30ec, 0x30ed, - 0x30ee, 0x30ef, 0x30f0, 0x30f1, 0x30f2, 0x30f3, 0x30f4, 0x30f5, 0x30f6, - -1, -1, -1, -1, -1, -1, -1, -1, 0x0410, - 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401, 0x0416, 0x0417, 0x0418, - 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f, 0x0420, 0x0421, - 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042a, - 0x042b, 0x042c, 0x042d, 0x042e, 0x042f, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451, - 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, -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, -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, -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, -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, 0x3400, 0x3401, 0x3402, - 0x3403, 0x3404, 0x3405, 0x3406, 0x3407, 0x3408, 0x3409, 0x340a, 0x340b, - 0x340c, 0x340d, 0x340e, 0x340f, 0x3410, 0x3411, 0x3412, 0x3413, 0x3414, - 0x3415, 0x3416, 0x3417, 0x3418, 0x3419, 0x341a, 0x341b, 0x341c, 0x341d, - 0x341e, 0x341f, 0x3420, 0x3421, 0x3422, 0x3423, 0x3424, 0x3425, 0x3426, - 0x3427, 0x3428, 0x3429, 0x342a, 0x342b, 0x342c, 0x342d, 0x342e, 0x342f, - 0x3430, 0x3431, 0x3432, 0x3433, 0x3434, 0x3435, 0x3436, 0x3437, 0x3438, - 0x3439, 0x343a, 0x343b, 0x343c, 0x343d, 0x343e, 0x343f, 0x3440, 0x3441, - 0x3442, 0x3443, 0x3444, 0x3445, 0x3446, 0x3447, 0x3448, 0x3449, 0x344a, - 0x344b, 0x344c, 0x344d, 0x344e, 0x344f, 0x3450, 0x3451, 0x3452, 0x3453, - 0x3454, 0x3455, 0x3456, 0x3457, 0x3458, 0x3459, 0x345a, 0x345b, 0x345c, - 0x345d, 0x345e, 0x345f, 0x3460, 0x3461, 0x3462, 0x3463, 0x3464, 0x3465, - 0x3466, 0x3467, 0x3468, 0x3469, 0x346a, 0x346b, 0x346c, 0x346d, 0x346e, - 0x346f, 0x3470, 0x3471, 0x3472, 0x3473, 0x3474, 0x3475, 0x3476, 0x3477, - 0x3478, 0x3479, 0x347a, 0x347b, 0x347c, 0x347d, 0x347e, 0x347f, 0x3480, - 0x3481, 0x3482, 0x3483, 0x3484, 0x3485, 0x3486, 0x3487, 0x3488, 0x3489, - 0x348a, 0x348b, 0x348c, 0x348d, 0x348e, 0x348f, 0x3490, 0x3491, 0x3492, - 0x3493, 0x3494, 0x3495, 0x3496, 0x3497, 0x3498, 0x3499, 0x349a, 0x349b, - 0x349c, 0x349d, 0x349e, 0x349f, 0x34a0, 0x34a1, 0x34a2, 0x34a3, 0x34a4, - 0x34a5, 0x34a6, 0x34a7, 0x34a8, 0x34a9, 0x34aa, 0x34ab, 0x34ac, 0x34ad, - 0x34ae, 0x34af, 0x34b0, 0x34b1, 0x34b2, 0x34b3, 0x34b4, 0x34b5, 0x34b6, - 0x34b7, 0x34b8, 0x34b9, 0x34ba, 0x34bb, 0x34bc, 0x34bd, 0x34be, 0x34bf, - 0x34c0, 0x34c1, 0x34c2, 0x34c3, 0x34c4, 0x34c5, 0x34c6, 0x34c7, 0x34c8, - 0x34c9, 0x34ca, 0x34cb, 0x34cc, 0x34cd, 0x34ce, 0x34cf, 0x34d0, 0x34d1, - 0x34d2, 0x34d3, 0x34d4, 0x34d5, 0x34d6, 0x34d7, 0x34d8, 0x34d9, 0x34da, - 0x34db, 0x34dc, 0x34dd, 0x34de, 0x34df, 0x34e0, 0x34e1, 0x34e2, 0x34e3, - 0x34e4, 0x34e5, 0x34e6, 0x34e7, 0x34e8, 0x34e9, 0x34ea, 0x34eb, 0x34ec, - 0x34ed, 0x34ee, 0x34ef, 0x34f0, 0x34f1, 0x34f2, 0x34f3, 0x34f4, 0x34f5, - 0x34f6, 0x34f7, 0x34f8, 0x34f9, 0x34fa, 0x34fb, 0x34fc, 0x34fd, 0x34fe, - 0x34ff, 0x3500, 0x3501, 0x3502, 0x3503, 0x3504, 0x3505, 0x3506, 0x3507, - 0x3508, 0x3509, 0x350a, 0x350b, 0x350c, 0x350d, 0x350e, 0x350f, 0x3510, - 0x3511, 0x3512, 0x3513, 0x3514, 0x3515, 0x3516, 0x3517, 0x3518, 0x3519, - 0x351a, 0x351b, 0x351c, 0x351d, 0x351e, 0x351f, 0x3520, 0x3521, 0x3522, - 0x3523, 0x3524, 0x3525, 0x3526, 0x3527, 0x3528, 0x3529, 0x352a, 0x352b, - 0x352c, 0x352d, 0x352e, 0x352f, 0x3530, 0x3531, 0x3532, 0x3533, 0x3534, - 0x3535, 0x3536, 0x3537, 0x3538, 0x3539, 0x353a, 0x353b, 0x353c, 0x353d, - 0x353e, 0x353f, 0x3540, 0x3541, 0x3542, 0x3543, 0x3544, 0x3545, 0x3546, - 0x3547, 0x3548, 0x3549, 0x354a, 0x354b, 0x354c, 0x354d, 0x354e, 0x354f, - 0x3550, 0x3551, 0x3552, 0x3553, 0x3554, 0x3555, 0x3556, 0x3557, 0x3558, - 0x3559, 0x355a, 0x355b, 0x355c, 0x355d, 0x355e, 0x355f, 0x3560, 0x3561, - 0x3562, 0x3563, 0x3564, 0x3565, 0x3566, 0x3567, 0x3568, 0x3569, 0x356a, - 0x356b, 0x356c, 0x356d, 0x356e, 0x356f, 0x3570, 0x3571, 0x3572, 0x3573, - 0x3574, 0x3575, 0x3576, 0x3577, 0x3578, 0x3579, 0x357a, 0x357b, 0x357c, - 0x357d, 0x357e, 0x357f, 0x3580, 0x3581, 0x3582, 0x3583, 0x3584, 0x3585, - 0x3586, 0x3587, 0x3588, 0x3589, 0x358a, 0x358b, 0x358c, 0x358d, 0x358e, - 0x358f, 0x3590, 0x3591, 0x3592, 0x3593, 0x3594, 0x3595, 0x3596, 0x3597, - 0x3598, 0x3599, 0x359a, 0x359b, 0x359c, 0x359d, 0x359e, 0x359f, 0x35a0, - 0x35a1, 0x35a2, 0x35a3, 0x35a4, 0x35a5, 0x35a6, 0x35a7, 0x35a8, 0x35a9, - 0x35aa, 0x35ab, 0x35ac, 0x35ad, 0x35ae, 0x35af, 0x35b0, 0x35b1, 0x35b2, - 0x35b3, 0x35b4, 0x35b5, 0x35b6, 0x35b7, 0x35b8, 0x35b9, 0x35ba, 0x35bb, - 0x35bc, 0x35bd, 0x35be, 0x35bf, 0x35c0, 0x35c1, 0x35c2, 0x35c3, 0x35c4, - 0x35c5, 0x35c6, 0x35c7, 0x35c8, 0x35c9, 0x35ca, 0x35cb, 0x35cc, 0x35cd, - 0x35ce, 0x35cf, 0x35d0, 0x35d1, 0x35d2, 0x35d3, 0x35d4, 0x35d5, 0x35d6, - 0x35d7, 0x35d8, 0x35d9, 0x35da, 0x35db, 0x35dc, 0x35dd, 0x35de, 0x35df, - 0x35e0, 0x35e1, 0x35e2, 0x35e3, 0x35e4, 0x35e5, 0x35e6, 0x35e7, 0x35e8, - 0x35e9, 0x35ea, 0x35eb, 0x35ec, 0x35ed, 0x35ee, 0x35ef, 0x35f0, 0x35f1, - 0x35f2, 0x35f3, 0x35f4, 0x35f5, 0x35f6, 0x35f7, 0x35f8, 0x35f9, 0x35fa, - 0x35fb, 0x35fc, 0x35fd, 0x35fe, 0x35ff, 0x3600, 0x3601, 0x3602, 0x3603, - 0x3604, 0x3605, 0x3606, 0x3607, 0x3608, 0x3609, 0x360a, 0x360b, 0x360c, - 0x360d, 0x360e, 0x360f, 0x3610, 0x3611, 0x3612, 0x3613, 0x3614, 0x3615, - 0x3616, 0x3617, 0x3618, 0x3619, 0x361a, 0x361b, 0x361c, 0x361d, 0x361e, - 0x361f, 0x3620, 0x3621, 0x3622, 0x3623, 0x3624, 0x3625, 0x3626, 0x3627, - 0x3628, 0x3629, 0x362a, 0x362b, 0x362c, 0x362d, 0x362e, 0x362f, 0x3630, - 0x3631, 0x3632, 0x3633, 0x3634, 0x3635, 0x3636, 0x3637, 0x3638, 0x3639, - 0x363a, 0x363b, 0x363c, 0x363d, 0x363e, 0x363f, 0x3640, 0x3641, 0x3642, - 0x3643, 0x3644, 0x3645, 0x3646, 0x3647, 0x3648, 0x3649, 0x364a, 0x364b, - 0x364c, 0x364d, 0x364e, 0x364f, 0x3650, 0x3651, 0x3652, 0x3653, 0x3654, - 0x3655, 0x3656, 0x3657, 0x3658, 0x3659, 0x365a, 0x365b, 0x365c, 0x365d, - 0x365e, 0x365f, 0x3660, 0x3661, 0x3662, 0x3663, 0x3664, 0x3665, 0x3666, - 0x3667, 0x3668, 0x3669, 0x366a, 0x366b, 0x366c, 0x366d, 0x366e, 0x366f, - 0x3670, 0x3671, 0x3672, 0x3673, 0x3674, 0x3675, 0x3676, 0x3677, 0x3678, - 0x3679, 0x367a, 0x367b, 0x367c, 0x367d, 0x367e, 0x367f, 0x3680, 0x3681, - 0x3682, 0x3683, 0x3684, 0x3685, 0x3686, 0x3687, 0x3688, 0x3689, 0x368a, - 0x368b, 0x368c, 0x368d, 0x368e, 0x368f, 0x3690, 0x3691, 0x3692, 0x3693, - 0x3694, 0x3695, 0x3696, 0x3697, 0x3698, 0x3699, 0x369a, 0x369b, 0x369c, - 0x369d, 0x369e, 0x369f, 0x36a0, 0x36a1, 0x36a2, 0x36a3, 0x36a4, 0x36a5, - 0x36a6, 0x36a7, 0x36a8, 0x36a9, 0x36aa, 0x36ab, 0x36ac, 0x36ad, 0x36ae, - 0x36af, 0x36b0, 0x36b1, 0x36b2, 0x36b3, 0x36b4, 0x36b5, 0x36b6, 0x36b7, - 0x36b8, 0x36b9, 0x36ba, 0x36bb, 0x36bc, 0x36bd, 0x36be, 0x36bf, 0x36c0, - 0x36c1, 0x36c2, 0x36c3, 0x36c4, 0x36c5, 0x36c6, 0x36c7, 0x36c8, 0x36c9, - 0x36ca, 0x36cb, 0x36cc, 0x36cd, 0x36ce, 0x36cf, 0x36d0, 0x36d1, 0x36d2, - 0x36d3, 0x36d4, 0x36d5, 0x36d6, 0x36d7, 0x36d8, 0x36d9, 0x36da, 0x36db, - 0x36dc, 0x36dd, 0x36de, 0x36df, 0x36e0, 0x36e1, 0x36e2, 0x36e3, 0x36e4, - 0x36e5, 0x36e6, 0x36e7, 0x36e8, 0x36e9, 0x36ea, 0x36eb, 0x36ec, 0x36ed, - 0x36ee, 0x36ef, 0x36f0, 0x36f1, 0x36f2, 0x36f3, 0x36f4, 0x36f5, 0x36f6, - 0x36f7, 0x36f8, 0x36f9, 0x36fa, 0x36fb, 0x36fc, 0x36fd, 0x36fe, 0x36ff, - 0x3700, 0x3701, 0x3702, 0x3703, 0x3704, 0x3705, 0x3706, 0x3707, 0x3708, - 0x3709, 0x370a, 0x370b, 0x370c, 0x370d, 0x370e, 0x370f, 0x3710, 0x3711, - 0x3712, 0x3713, 0x3714, 0x3715, 0x3716, 0x3717, 0x3718, 0x3719, 0x371a, - 0x371b, 0x371c, 0x371d, 0x371e, 0x371f, 0x3720, 0x3721, 0x3722, 0x3723, - 0x3724, 0x3725, 0x3726, 0x3727, 0x3728, 0x3729, 0x372a, 0x372b, 0x372c, - 0x372d, 0x372e, 0x372f, 0x3730, 0x3731, 0x3732, 0x3733, 0x3734, 0x3735, - 0x3736, 0x3737, 0x3738, 0x3739, 0x373a, 0x373b, 0x373c, 0x373d, 0x373e, - 0x373f, 0x3740, 0x3741, 0x3742, 0x3743, 0x3744, 0x3745, 0x3746, 0x3747, - 0x3748, 0x3749, 0x374a, 0x374b, 0x374c, 0x374d, 0x374e, 0x374f, 0x3750, - 0x3751, 0x3752, 0x3753, 0x3754, 0x3755, 0x3756, 0x3757, 0x3758, 0x3759, - 0x375a, 0x375b, 0x375c, 0x375d, 0x375e, 0x375f, 0x3760, 0x3761, 0x3762, - 0x3763, 0x3764, 0x3765, 0x3766, 0x3767, 0x3768, 0x3769, 0x376a, 0x376b, - 0x376c, 0x376d, 0x376e, 0x376f, 0x3770, 0x3771, 0x3772, 0x3773, 0x3774, - 0x3775, 0x3776, 0x3777, 0x3778, 0x3779, 0x377a, 0x377b, 0x377c, 0x377d, - 0x377e, 0x377f, 0x3780, 0x3781, 0x3782, 0x3783, 0x3784, 0x3785, 0x3786, - 0x3787, 0x3788, 0x3789, 0x378a, 0x378b, 0x378c, 0x378d, 0x378e, 0x378f, - 0x3790, 0x3791, 0x3792, 0x3793, 0x3794, 0x3795, 0x3796, 0x3797, 0x3798, - 0x3799, 0x379a, 0x379b, 0x379c, 0x379d, 0x379e, 0x379f, 0x37a0, 0x37a1, - 0x37a2, 0x37a3, 0x37a4, 0x37a5, 0x37a6, 0x37a7, 0x37a8, 0x37a9, 0x37aa, - 0x37ab, 0x37ac, 0x37ad, 0x37ae, 0x37af, 0x37b0, 0x37b1, 0x37b2, 0x37b3, - 0x37b4, 0x37b5, 0x37b6, 0x37b7, 0x37b8, 0x37b9, 0x37ba, 0x37bb, 0x37bc, - 0x37bd, 0x37be, 0x37bf, 0x37c0, 0x37c1, 0x37c2, 0x37c3, 0x37c4, 0x37c5, - 0x37c6, 0x37c7, 0x37c8, 0x37c9, 0x37ca, 0x37cb, 0x37cc, 0x37cd, 0x37ce, - 0x37cf, 0x37d0, 0x37d1, 0x37d2, 0x37d3, 0x37d4, 0x37d5, 0x37d6, 0x37d7, - 0x37d8, 0x37d9, 0x37da, 0x37db, 0x37dc, 0x37dd, 0x37de, 0x37df, 0x37e0, - 0x37e1, 0x37e2, 0x37e3, 0x37e4, 0x37e5, 0x37e6, 0x37e7, 0x37e8, 0x37e9, - 0x37ea, 0x37eb, 0x37ec, 0x37ed, 0x37ee, 0x37ef, 0x37f0, 0x37f1, 0x37f2, - 0x37f3, 0x37f4, 0x37f5, 0x37f6, 0x37f7, 0x37f8, 0x37f9, 0x37fa, 0x37fb, - 0x37fc, 0x37fd, 0x37fe, 0x37ff, 0x3800, 0x3801, 0x3802, 0x3803, 0x3804, - 0x3805, 0x3806, 0x3807, 0x3808, 0x3809, 0x380a, 0x380b, 0x380c, 0x380d, - 0x380e, 0x380f, 0x3810, 0x3811, 0x3812, 0x3813, 0x3814, 0x3815, 0x3816, - 0x3817, 0x3818, 0x3819, 0x381a, 0x381b, 0x381c, 0x381d, 0x381e, 0x381f, - 0x3820, 0x3821, 0x3822, 0x3823, 0x3824, 0x3825, 0x3826, 0x3827, 0x3828, - 0x3829, 0x382a, 0x382b, 0x382c, 0x382d, 0x382e, 0x382f, 0x3830, 0x3831, - 0x3832, 0x3833, 0x3834, 0x3835, 0x3836, 0x3837, 0x3838, 0x3839, 0x383a, - 0x383b, 0x383c, 0x383d, 0x383e, 0x383f, 0x3840, 0x3841, 0x3842, 0x3843, - 0x3844, 0x3845, 0x3846, 0x3847, 0x3848, 0x3849, 0x384a, 0x384b, 0x384c, - 0x384d, 0x384e, 0x384f, 0x3850, 0x3851, 0x3852, 0x3853, 0x3854, 0x3855, - 0x3856, 0x3857, 0x3858, 0x3859, 0x385a, 0x385b, 0x385c, 0x385d, 0x385e, - 0x385f, 0x3860, 0x3861, 0x3862, 0x3863, 0x3864, 0x3865, 0x3866, 0x3867, - 0x3868, 0x3869, 0x386a, 0x386b, 0x386c, 0x386d, 0x386e, 0x386f, 0x3870, - 0x3871, 0x3872, 0x3873, 0x3874, 0x3875, 0x3876, 0x3877, 0x3878, 0x3879, - 0x387a, 0x387b, 0x387c, 0x387d, 0x387e, 0x387f, 0x3880, 0x3881, 0x3882, - 0x3883, 0x3884, 0x3885, 0x3886, 0x3887, 0x3888, 0x3889, 0x388a, 0x388b, - 0x388c, 0x388d, 0x388e, 0x388f, 0x3890, 0x3891, 0x3892, 0x3893, 0x3894, - 0x3895, 0x3896, 0x3897, 0x3898, 0x3899, 0x389a, 0x389b, 0x389c, 0x389d, - 0x389e, 0x389f, 0x38a0, 0x38a1, 0x38a2, 0x38a3, 0x38a4, 0x38a5, 0x38a6, - 0x38a7, 0x38a8, 0x38a9, 0x38aa, 0x38ab, 0x38ac, 0x38ad, 0x38ae, 0x38af, - 0x38b0, 0x38b1, 0x38b2, 0x38b3, 0x38b4, 0x38b5, 0x38b6, 0x38b7, 0x38b8, - 0x38b9, 0x38ba, 0x38bb, 0x38bc, 0x38bd, 0x38be, 0x38bf, 0x38c0, 0x38c1, - 0x38c2, 0x38c3, 0x38c4, 0x38c5, 0x38c6, 0x38c7, 0x38c8, 0x38c9, 0x38ca, - 0x38cb, 0x38cc, 0x38cd, 0x38ce, 0x38cf, 0x38d0, 0x38d1, 0x38d2, 0x38d3, - 0x38d4, 0x38d5, 0x38d6, 0x38d7, 0x38d8, 0x38d9, 0x38da, 0x38db, 0x38dc, - 0x38dd, 0x38de, 0x38df, 0x38e0, 0x38e1, 0x38e2, 0x38e3, 0x38e4, 0x38e5, - 0x38e6, 0x38e7, 0x38e8, 0x38e9, 0x38ea, 0x38eb, 0x38ec, 0x38ed, 0x38ee, - 0x38ef, 0x38f0, 0x38f1, 0x38f2, 0x38f3, 0x38f4, 0x38f5, 0x38f6, 0x38f7, - 0x38f8, 0x38f9, 0x38fa, 0x38fb, 0x38fc, 0x38fd, 0x38fe, 0x38ff, 0x3900, - 0x3901, 0x3902, 0x3903, 0x3904, 0x3905, 0x3906, 0x3907, 0x3908, 0x3909, - 0x390a, 0x390b, 0x390c, 0x390d, 0x390e, 0x390f, 0x3910, 0x3911, 0x3912, - 0x3913, 0x3914, 0x3915, 0x3916, 0x3917, 0x3918, 0x3919, 0x391a, 0x391b, - 0x391c, 0x391d, 0x391e, 0x391f, 0x3920, 0x3921, 0x3922, 0x3923, 0x3924, - 0x3925, 0x3926, 0x3927, 0x3928, 0x3929, 0x392a, 0x392b, 0x392c, 0x392d, - 0x392e, 0x392f, 0x3930, 0x3931, 0x3932, 0x3933, 0x3934, 0x3935, 0x3936, - 0x3937, 0x3938, 0x3939, 0x393a, 0x393b, 0x393c, 0x393d, 0x393e, 0x393f, - 0x3940, 0x3941, 0x3942, 0x3943, 0x3944, 0x3945, 0x3946, 0x3947, 0x3948, - 0x3949, 0x394a, 0x394b, 0x394c, 0x394d, 0x394e, 0x394f, 0x3950, 0x3951, - 0x3952, 0x3953, 0x3954, 0x3955, 0x3956, 0x3957, 0x3958, 0x3959, 0x395a, - 0x395b, 0x395c, 0x395d, 0x395e, 0x395f, 0x3960, 0x3961, 0x3962, 0x3963, - 0x3964, 0x3965, 0x3966, 0x3967, 0x3968, 0x3969, 0x396a, 0x396b, 0x396c, - 0x396d, 0x396e, 0x396f, 0x3970, 0x3971, 0x3972, 0x3973, 0x3974, 0x3975, - 0x3976, 0x3977, 0x3978, 0x3979, 0x397a, 0x397b, 0x397c, 0x397d, 0x397e, - 0x397f, 0x3980, 0x3981, 0x3982, 0x3983, 0x3984, 0x3985, 0x3986, 0x3987, - 0x3988, 0x3989, 0x398a, 0x398b, 0x398c, 0x398d, 0x398e, 0x398f, 0x3990, - 0x3991, 0x3992, 0x3993, 0x3994, 0x3995, 0x3996, 0x3997, 0x3998, 0x3999, - 0x399a, 0x399b, 0x399c, 0x399d, 0x399e, 0x399f, 0x39a0, 0x39a1, 0x39a2, - 0x39a3, 0x39a4, 0x39a5, 0x39a6, 0x39a7, 0x39a8, 0x39a9, 0x39aa, 0x39ab, - 0x39ac, 0x39ad, 0x39ae, 0x39af, 0x39b0, 0x39b1, 0x39b2, 0x39b3, 0x39b4, - 0x39b5, 0x39b6, 0x39b7, 0x39b8, 0x39b9, 0x39ba, 0x39bb, 0x39bc, 0x39bd, - 0x39be, 0x39bf, 0x39c0, 0x39c1, 0x39c2, 0x39c3, 0x39c4, 0x39c5, 0x39c6, - 0x39c7, 0x39c8, 0x39c9, 0x39ca, 0x39cb, 0x39cc, 0x39cd, 0x39ce, 0x39cf, - 0x39d0, 0x39d1, 0x39d2, 0x39d3, 0x39d4, 0x39d5, 0x39d6, 0x39d7, 0x39d8, - 0x39d9, 0x39da, 0x39db, 0x39dc, 0x39dd, 0x39de, 0x39df, 0x39e0, 0x39e1, - 0x39e2, 0x39e3, 0x39e4, 0x39e5, 0x39e6, 0x39e7, 0x39e8, 0x39e9, 0x39ea, - 0x39eb, 0x39ec, 0x39ed, 0x39ee, 0x39ef, 0x39f0, 0x39f1, 0x39f2, 0x39f3, - 0x39f4, 0x39f5, 0x39f6, 0x39f7, 0x39f8, 0x39f9, 0x39fa, 0x39fb, 0x39fc, - 0x39fd, 0x39fe, 0x39ff, 0x3a00, 0x3a01, 0x3a02, 0x3a03, 0x3a04, 0x3a05, - 0x3a06, 0x3a07, 0x3a08, 0x3a09, 0x3a0a, 0x3a0b, 0x3a0c, 0x3a0d, 0x3a0e, - 0x3a0f, 0x3a10, 0x3a11, 0x3a12, 0x3a13, 0x3a14, 0x3a15, 0x3a16, 0x3a17, - 0x3a18, 0x3a19, 0x3a1a, 0x3a1b, 0x3a1c, 0x3a1d, 0x3a1e, 0x3a1f, 0x3a20, - 0x3a21, 0x3a22, 0x3a23, 0x3a24, 0x3a25, 0x3a26, 0x3a27, 0x3a28, 0x3a29, - 0x3a2a, 0x3a2b, 0x3a2c, 0x3a2d, 0x3a2e, 0x3a2f, 0x3a30, 0x3a31, 0x3a32, - 0x3a33, 0x3a34, 0x3a35, 0x3a36, 0x3a37, 0x3a38, 0x3a39, 0x3a3a, 0x3a3b, - 0x3a3c, 0x3a3d, 0x3a3e, 0x3a3f, 0x3a40, 0x3a41, 0x3a42, 0x3a43, 0x3a44, - 0x3a45, 0x3a46, 0x3a47, 0x3a48, 0x3a49, 0x3a4a, 0x3a4b, 0x3a4c, 0x3a4d, - 0x3a4e, 0x3a4f, 0x3a50, 0x3a51, 0x3a52, 0x3a53, 0x3a54, 0x3a55, 0x3a56, - 0x3a57, 0x3a58, 0x3a59, 0x3a5a, 0x3a5b, 0x3a5c, 0x3a5d, 0x3a5e, 0x3a5f, - 0x3a60, 0x3a61, 0x3a62, 0x3a63, 0x3a64, 0x3a65, 0x3a66, 0x3a67, 0x3a68, - 0x3a69, 0x3a6a, 0x3a6b, 0x3a6c, 0x3a6d, 0x3a6e, 0x3a6f, 0x3a70, 0x3a71, - 0x3a72, 0x3a73, 0x3a74, 0x3a75, 0x3a76, 0x3a77, 0x3a78, 0x3a79, 0x3a7a, - 0x3a7b, 0x3a7c, 0x3a7d, 0x3a7e, 0x3a7f, 0x3a80, 0x3a81, 0x3a82, 0x3a83, - 0x3a84, 0x3a85, 0x3a86, 0x3a87, 0x3a88, 0x3a89, 0x3a8a, 0x3a8b, 0x3a8c, - 0x3a8d, 0x3a8e, 0x3a8f, 0x3a90, 0x3a91, 0x3a92, 0x3a93, 0x3a94, 0x3a95, - 0x3a96, 0x3a97, 0x3a98, 0x3a99, 0x3a9a, 0x3a9b, 0x3a9c, 0x3a9d, 0x3a9e, - 0x3a9f, 0x3aa0, 0x3aa1, 0x3aa2, 0x3aa3, 0x3aa4, 0x3aa5, 0x3aa6, 0x3aa7, - 0x3aa8, 0x3aa9, 0x3aaa, 0x3aab, 0x3aac, 0x3aad, 0x3aae, 0x3aaf, 0x3ab0, - 0x3ab1, 0x3ab2, 0x3ab3, 0x3ab4, 0x3ab5, 0x3ab6, 0x3ab7, 0x3ab8, 0x3ab9, - 0x3aba, 0x3abb, 0x3abc, 0x3abd, 0x3abe, 0x3abf, 0x3ac0, 0x3ac1, 0x3ac2, - 0x3ac3, 0x3ac4, 0x3ac5, 0x3ac6, 0x3ac7, 0x3ac8, 0x3ac9, 0x3aca, 0x3acb, - 0x3acc, 0x3acd, 0x3ace, 0x3acf, 0x3ad0, 0x3ad1, 0x3ad2, 0x3ad3, 0x3ad4, - 0x3ad5, 0x3ad6, 0x3ad7, 0x3ad8, 0x3ad9, 0x3ada, 0x3adb, 0x3adc, 0x3add, - 0x3ade, 0x3adf, 0x3ae0, 0x3ae1, 0x3ae2, 0x3ae3, 0x3ae4, 0x3ae5, 0x3ae6, - 0x3ae7, 0x3ae8, 0x3ae9, 0x3aea, 0x3aeb, 0x3aec, 0x3aed, 0x3aee, 0x3aef, - 0x3af0, 0x3af1, 0x3af2, 0x3af3, 0x3af4, 0x3af5, 0x3af6, 0x3af7, 0x3af8, - 0x3af9, 0x3afa, 0x3afb, 0x3afc, 0x3afd, 0x3afe, 0x3aff, 0x3b00, 0x3b01, - 0x3b02, 0x3b03, 0x3b04, 0x3b05, 0x3b06, 0x3b07, 0x3b08, 0x3b09, 0x3b0a, - 0x3b0b, 0x3b0c, 0x3b0d, 0x3b0e, 0x3b0f, 0x3b10, 0x3b11, 0x3b12, 0x3b13, - 0x3b14, 0x3b15, 0x3b16, 0x3b17, 0x3b18, 0x3b19, 0x3b1a, 0x3b1b, 0x3b1c, - 0x3b1d, 0x3b1e, 0x3b1f, 0x3b20, 0x3b21, 0x3b22, 0x3b23, 0x3b24, 0x3b25, - 0x3b26, 0x3b27, 0x3b28, 0x3b29, 0x3b2a, 0x3b2b, 0x3b2c, 0x3b2d, 0x3b2e, - 0x3b2f, 0x3b30, 0x3b31, 0x3b32, 0x3b33, 0x3b34, 0x3b35, 0x3b36, 0x3b37, - 0x3b38, 0x3b39, 0x3b3a, 0x3b3b, 0x3b3c, 0x3b3d, 0x3b3e, 0x3b3f, 0x3b40, - 0x3b41, 0x3b42, 0x3b43, 0x3b44, 0x3b45, 0x3b46, 0x3b47, 0x3b48, 0x3b49, - 0x3b4a, 0x3b4b, 0x3b4c, 0x3b4d, 0x3b4e, 0x3b4f, 0x3b50, 0x3b51, 0x3b52, - 0x3b53, 0x3b54, 0x3b55, 0x3b56, 0x3b57, 0x3b58, 0x3b59, 0x3b5a, 0x3b5b, - 0x3b5c, 0x3b5d, 0x3b5e, 0x3b5f, 0x3b60, 0x3b61, 0x3b62, 0x3b63, 0x3b64, - 0x3b65, 0x3b66, 0x3b67, 0x3b68, 0x3b69, 0x3b6a, 0x3b6b, 0x3b6c, 0x3b6d, - 0x3b6e, 0x3b6f, 0x3b70, 0x3b71, 0x3b72, 0x3b73, 0x3b74, 0x3b75, 0x3b76, - 0x3b77, 0x3b78, 0x3b79, 0x3b7a, 0x3b7b, 0x3b7c, 0x3b7d, 0x3b7e, 0x3b7f, - 0x3b80, 0x3b81, 0x3b82, 0x3b83, 0x3b84, 0x3b85, 0x3b86, 0x3b87, 0x3b88, - 0x3b89, 0x3b8a, 0x3b8b, 0x3b8c, 0x3b8d, 0x3b8e, 0x3b8f, 0x3b90, 0x3b91, - 0x3b92, 0x3b93, 0x3b94, 0x3b95, 0x3b96, 0x3b97, 0x3b98, 0x3b99, 0x3b9a, - 0x3b9b, 0x3b9c, 0x3b9d, 0x3b9e, 0x3b9f, 0x3ba0, 0x3ba1, 0x3ba2, 0x3ba3, - 0x3ba4, 0x3ba5, 0x3ba6, 0x3ba7, 0x3ba8, 0x3ba9, 0x3baa, 0x3bab, 0x3bac, - 0x3bad, 0x3bae, 0x3baf, 0x3bb0, 0x3bb1, 0x3bb2, 0x3bb3, 0x3bb4, 0x3bb5, - 0x3bb6, 0x3bb7, 0x3bb8, 0x3bb9, 0x3bba, 0x3bbb, 0x3bbc, 0x3bbd, 0x3bbe, - 0x3bbf, 0x3bc0, 0x3bc1, 0x3bc2, 0x3bc3, 0x3bc4, 0x3bc5, 0x3bc6, 0x3bc7, - 0x3bc8, 0x3bc9, 0x3bca, 0x3bcb, 0x3bcc, 0x3bcd, 0x3bce, 0x3bcf, 0x3bd0, - 0x3bd1, 0x3bd2, 0x3bd3, 0x3bd4, 0x3bd5, 0x3bd6, 0x3bd7, 0x3bd8, 0x3bd9, - 0x3bda, 0x3bdb, 0x3bdc, 0x3bdd, 0x3bde, 0x3bdf, 0x3be0, 0x3be1, 0x3be2, - 0x3be3, 0x3be4, 0x3be5, 0x3be6, 0x3be7, 0x3be8, 0x3be9, 0x3bea, 0x3beb, - 0x3bec, 0x3bed, 0x3bee, 0x3bef, 0x3bf0, 0x3bf1, 0x3bf2, 0x3bf3, 0x3bf4, - 0x3bf5, 0x3bf6, 0x3bf7, 0x3bf8, 0x3bf9, 0x3bfa, 0x3bfb, 0x3bfc, 0x3bfd, - 0x3bfe, 0x3bff, 0x3c00, 0x3c01, 0x3c02, 0x3c03, 0x3c04, 0x3c05, 0x3c06, - 0x3c07, 0x3c08, 0x3c09, 0x3c0a, 0x3c0b, 0x3c0c, 0x3c0d, 0x3c0e, 0x3c0f, - 0x3c10, 0x3c11, 0x3c12, 0x3c13, 0x3c14, 0x3c15, 0x3c16, 0x3c17, 0x3c18, - 0x3c19, 0x3c1a, 0x3c1b, 0x3c1c, 0x3c1d, 0x3c1e, 0x3c1f, 0x3c20, 0x3c21, - 0x3c22, 0x3c23, 0x3c24, 0x3c25, 0x3c26, 0x3c27, 0x3c28, 0x3c29, 0x3c2a, - 0x3c2b, 0x3c2c, 0x3c2d, 0x3c2e, 0x3c2f, 0x3c30, 0x3c31, 0x3c32, 0x3c33, - 0x3c34, 0x3c35, 0x3c36, 0x3c37, 0x3c38, 0x3c39, 0x3c3a, 0x3c3b, 0x3c3c, - 0x3c3d, 0x3c3e, 0x3c3f, 0x3c40, 0x3c41, 0x3c42, 0x3c43, 0x3c44, 0x3c45, - 0x3c46, 0x3c47, 0x3c48, 0x3c49, 0x3c4a, 0x3c4b, 0x3c4c, 0x3c4d, 0x3c4e, - 0x3c4f, 0x3c50, 0x3c51, 0x3c52, 0x3c53, 0x3c54, 0x3c55, 0x3c56, 0x3c57, - 0x3c58, 0x3c59, 0x3c5a, 0x3c5b, 0x3c5c, 0x3c5d, 0x3c5e, 0x3c5f, 0x3c60, - 0x3c61, 0x3c62, 0x3c63, 0x3c64, 0x3c65, 0x3c66, 0x3c67, 0x3c68, 0x3c69, - 0x3c6a, 0x3c6b, 0x3c6c, 0x3c6d, 0x3c6e, 0x3c6f, 0x3c70, 0x3c71, 0x3c72, - 0x3c73, 0x3c74, 0x3c75, 0x3c76, 0x3c77, 0x3c78, 0x3c79, 0x3c7a, 0x3c7b, - 0x3c7c, 0x3c7d, 0x3c7e, 0x3c7f, 0x3c80, 0x3c81, 0x3c82, 0x3c83, 0x3c84, - 0x3c85, 0x3c86, 0x3c87, 0x3c88, 0x3c89, 0x3c8a, 0x3c8b, 0x3c8c, 0x3c8d, - 0x3c8e, 0x3c8f, 0x3c90, 0x3c91, 0x3c92, 0x3c93, 0x3c94, 0x3c95, 0x3c96, - 0x3c97, 0x3c98, 0x3c99, 0x3c9a, 0x3c9b, 0x3c9c, 0x3c9d, 0x3c9e, 0x3c9f, - 0x3ca0, 0x3ca1, 0x3ca2, 0x3ca3, 0x3ca4, 0x3ca5, 0x3ca6, 0x3ca7, 0x3ca8, - 0x3ca9, 0x3caa, 0x3cab, 0x3cac, 0x3cad, 0x3cae, 0x3caf, 0x3cb0, 0x3cb1, - 0x3cb2, 0x3cb3, 0x3cb4, 0x3cb5, 0x3cb6, 0x3cb7, 0x3cb8, 0x3cb9, 0x3cba, - 0x3cbb, 0x3cbc, 0x3cbd, 0x3cbe, 0x3cbf, 0x3cc0, 0x3cc1, 0x3cc2, 0x3cc3, - 0x3cc4, 0x3cc5, 0x3cc6, 0x3cc7, 0x3cc8, 0x3cc9, 0x3cca, 0x3ccb, 0x3ccc, - 0x3ccd, 0x3cce, 0x3ccf, 0x3cd0, 0x3cd1, 0x3cd2, 0x3cd3, 0x3cd4, 0x3cd5, - 0x3cd6, 0x3cd7, 0x3cd8, 0x3cd9, 0x3cda, 0x3cdb, 0x3cdc, 0x3cdd, 0x3cde, - 0x3cdf, 0x3ce0, 0x3ce1, 0x3ce2, 0x3ce3, 0x3ce4, 0x3ce5, 0x3ce6, 0x3ce7, - 0x3ce8, 0x3ce9, 0x3cea, 0x3ceb, 0x3cec, 0x3ced, 0x3cee, 0x3cef, 0x3cf0, - 0x3cf1, 0x3cf2, 0x3cf3, 0x3cf4, 0x3cf5, 0x3cf6, 0x3cf7, 0x3cf8, 0x3cf9, - 0x3cfa, 0x3cfb, 0x3cfc, 0x3cfd, 0x3cfe, 0x3cff, 0x3d00, 0x3d01, 0x3d02, - 0x3d03, 0x3d04, 0x3d05, 0x3d06, 0x3d07, 0x3d08, 0x3d09, 0x3d0a, 0x3d0b, - 0x3d0c, 0x3d0d, 0x3d0e, 0x3d0f, 0x3d10, 0x3d11, 0x3d12, 0x3d13, 0x3d14, - 0x3d15, 0x3d16, 0x3d17, 0x3d18, 0x3d19, 0x3d1a, 0x3d1b, 0x3d1c, 0x3d1d, - 0x3d1e, 0x3d1f, 0x3d20, 0x3d21, 0x3d22, 0x3d23, 0x3d24, 0x3d25, 0x3d26, - 0x3d27, 0x3d28, 0x3d29, 0x3d2a, 0x3d2b, 0x3d2c, 0x3d2d, -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, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 0x4f3d, 0x4f73, 0x5047, 0x50f9, 0x52a0, 0x53ef, 0x5475, - 0x54e5, 0x5609, 0x5ac1, 0x5bb6, 0x6687, 0x67b6, 0x67b7, 0x67ef, 0x6b4c, - 0x73c2, 0x75c2, 0x7a3c, 0x82db, 0x8304, 0x8857, 0x8888, 0x8a36, 0x8cc8, - 0x8dcf, 0x8efb, 0x8fe6, 0x99d5, 0x523b, 0x5374, 0x5404, 0x606a, 0x6164, - 0x6bbc, 0x73cf, 0x811a, 0x89ba, 0x89d2, 0x95a3, 0x4f83, 0x520a, 0x58be, - 0x5978, 0x59e6, 0x5e72, 0x5e79, 0x61c7, 0x63c0, 0x6746, 0x67ec, 0x687f, - 0x6f97, 0x764e, 0x770b, 0x78f5, 0x7a08, 0x7aff, 0x7c21, 0x809d, 0x826e, - 0x8271, 0x8aeb, 0x9593, 0x4e6b, 0x559d, 0x66f7, 0x6e34, 0x78a3, 0x7aed, - 0x845b, 0x8910, 0x874e, 0x97a8, 0x52d8, 0x574e, 0x582a, 0x5d4c, 0x611f, - 0x61be, 0x6221, 0x6562, 0x67d1, 0x6a44, 0x6e1b, 0x7518, 0x75b3, 0x76e3, - 0x77b0, 0x7d3a, 0x90af, 0x9451, 0x9452, 0x9f95, 0x5323, 0x5cac, 0x7532, - 0x80db, 0x9240, 0x9598, 0x525b, 0x5808, 0x59dc, 0x5ca1, 0x5d17, 0x5eb7, - 0x5f3a, 0x5f4a, 0x6177, 0x6c5f, 0x757a, 0x7586, 0x7ce0, 0x7d73, 0x7db1, - 0x7f8c, 0x8154, 0x8221, 0x8591, 0x8941, 0x8b1b, 0x92fc, 0x964d, 0x9c47, - 0x4ecb, 0x4ef7, 0x500b, 0x51f1, 0x584f, 0x6137, 0x613e, 0x6168, 0x6539, - 0x69ea, 0x6f11, 0x75a5, 0x7686, 0x76d6, 0x7b87, 0x82a5, 0x84cb, 0xf900, - 0x93a7, 0x958b, 0x5580, 0x5ba2, 0x5751, 0xf901, 0x7cb3, 0x7fb9, 0x91b5, - 0x5028, 0x53bb, 0x5c45, 0x5de8, 0x62d2, 0x636e, 0x64da, 0x64e7, 0x6e20, - 0x70ac, 0x795b, 0x8ddd, 0x8e1e, 0xf902, 0x907d, 0x9245, 0x92f8, 0x4e7e, - 0x4ef6, 0x5065, 0x5dfe, 0x5efa, 0x6106, 0x6957, 0x8171, 0x8654, 0x8e47, - 0x9375, 0x9a2b, 0x4e5e, 0x5091, 0x6770, 0x6840, 0x5109, 0x528d, 0x5292, - 0x6aa2, 0x77bc, 0x9210, 0x9ed4, 0x52ab, 0x602f, 0x8ff2, 0x5048, 0x61a9, - 0x63ed, 0x64ca, 0x683c, 0x6a84, 0x6fc0, 0x8188, 0x89a1, 0x9694, 0x5805, - 0x727d, 0x72ac, 0x7504, 0x7d79, 0x7e6d, 0x80a9, 0x898b, 0x8b74, 0x9063, - 0x9d51, 0x6289, 0x6c7a, 0x6f54, 0x7d50, 0x7f3a, 0x8a23, 0x517c, 0x614a, - 0x7b9d, 0x8b19, 0x9257, 0x938c, 0x4eac, 0x4fd3, 0x501e, 0x50be, 0x5106, - 0x52c1, 0x52cd, 0x537f, 0x5770, 0x5883, 0x5e9a, 0x5f91, 0x6176, 0x61ac, - 0x64ce, 0x656c, 0x666f, 0x66bb, 0x66f4, 0x6897, 0x6d87, 0x7085, 0x70f1, - 0x749f, 0x74a5, 0x74ca, 0x75d9, 0x786c, 0x78ec, 0x7adf, 0x7af6, 0x7d45, - 0x7d93, 0x8015, 0x803f, 0x811b, 0x8396, 0x8b66, 0x8f15, 0x9015, 0x93e1, - 0x9803, 0x9838, 0x9a5a, 0x9be8, 0x4fc2, 0x5553, 0x583a, 0x5951, 0x5b63, - 0x5c46, 0x60b8, 0x6212, 0x6842, 0x68b0, 0x68e8, 0x6eaa, 0x754c, 0x7678, - 0x78ce, 0x7a3d, 0x7cfb, 0x7e6b, 0x7e7c, 0x8a08, 0x8aa1, 0x8c3f, 0x968e, - 0x9dc4, 0x53e4, 0x53e9, 0x544a, 0x5471, 0x56fa, 0x59d1, 0x5b64, 0x5c3b, - 0x5eab, 0x62f7, 0x6537, 0x6545, 0x6572, 0x66a0, 0x67af, 0x69c1, 0x6cbd, - 0x75fc, 0x7690, 0x777e, 0x7a3f, 0x7f94, 0x8003, 0x80a1, 0x818f, 0x82e6, - 0x82fd, 0x83f0, 0x85c1, 0x8831, 0x88b4, 0x8aa5, 0xf903, 0x8f9c, 0x932e, - 0x96c7, 0x9867, 0x9ad8, 0x9f13, 0x54ed, 0x659b, 0x66f2, 0x688f, 0x7a40, - 0x8c37, 0x9d60, 0x56f0, 0x5764, 0x5d11, 0x6606, 0x68b1, 0x68cd, 0x6efe, - 0x7428, 0x889e, 0x9be4, 0x6c68, 0xf904, 0x9aa8, 0x4f9b, 0x516c, 0x5171, - 0x529f, 0x5b54, 0x5de5, 0x6050, 0x606d, 0x62f1, 0x63a7, 0x653b, 0x73d9, - 0x7a7a, 0x86a3, 0x8ca2, 0x978f, 0x4e32, 0x5be1, 0x6208, 0x679c, 0x74dc, - 0x79d1, 0x83d3, 0x8a87, 0x8ab2, 0x8de8, 0x904e, 0x934b, 0x9846, 0x5ed3, - 0x69e8, 0x85ff, 0x90ed, 0xf905, 0x51a0, 0x5b98, 0x5bec, 0x6163, 0x68fa, - 0x6b3e, 0x704c, 0x742f, 0x74d8, 0x7ba1, 0x7f50, 0x83c5, 0x89c0, 0x8cab, - 0x95dc, 0x9928, 0x522e, 0x605d, 0x62ec, 0x9002, 0x4f8a, 0x5149, 0x5321, - 0x58d9, 0x5ee3, 0x66e0, 0x6d38, 0x709a, 0x72c2, 0x73d6, 0x7b50, 0x80f1, - 0x945b, 0x5366, 0x639b, 0x7f6b, 0x4e56, 0x5080, 0x584a, 0x58de, 0x602a, - 0x6127, 0x62d0, 0x69d0, 0x9b41, 0x5b8f, 0x7d18, 0x80b1, 0x8f5f, 0x4ea4, - 0x50d1, 0x54ac, 0x55ac, 0x5b0c, 0x5da0, 0x5de7, 0x652a, 0x654e, 0x6821, - 0x6a4b, 0x72e1, 0x768e, 0x77ef, 0x7d5e, 0x7ff9, 0x81a0, 0x854e, 0x86df, - 0x8f03, 0x8f4e, 0x90ca, 0x9903, 0x9a55, 0x9bab, 0x4e18, 0x4e45, 0x4e5d, - 0x4ec7, 0x4ff1, 0x5177, 0x52fe, 0x5340, 0x53e3, 0x53e5, 0x548e, 0x5614, - 0x5775, 0x57a2, 0x5bc7, 0x5d87, 0x5ed0, 0x61fc, 0x62d8, 0x6551, 0x67b8, - 0x67e9, 0x69cb, 0x6b50, 0x6bc6, 0x6bec, 0x6c42, 0x6e9d, 0x7078, 0x72d7, - 0x7396, 0x7403, 0x77bf, 0x77e9, 0x7a76, 0x7d7f, 0x8009, 0x81fc, 0x8205, - 0x820a, 0x82df, 0x8862, 0x8b33, 0x8cfc, 0x8ec0, 0x9011, 0x90b1, 0x9264, - 0x92b6, 0x99d2, 0x9a45, 0x9ce9, 0x9dd7, 0x9f9c, 0x570b, 0x5c40, 0x83ca, - 0x97a0, 0x97ab, 0x9eb4, 0x541b, 0x7a98, 0x7fa4, 0x88d9, 0x8ecd, 0x90e1, - 0x5800, 0x5c48, 0x6398, 0x7a9f, 0x5bae, 0x5f13, 0x7a79, 0x7aae, 0x828e, - 0x8eac, 0x5026, 0x5238, 0x52f8, 0x5377, 0x5708, 0x62f3, 0x6372, 0x6b0a, - 0x6dc3, 0x7737, 0x53a5, 0x7357, 0x8568, 0x8e76, 0x95d5, 0x673a, 0x6ac3, - 0x6f70, 0x8a6d, 0x8ecc, 0x994b, 0xf906, 0x6677, 0x6b78, 0x8cb4, 0x9b3c, - 0xf907, 0x53eb, 0x572d, 0x594e, 0x63c6, 0x69fb, 0x73ea, 0x7845, 0x7aba, - 0x7ac5, 0x7cfe, 0x8475, 0x898f, 0x8d73, 0x9035, 0x95a8, 0x52fb, 0x5747, - 0x7547, 0x7b60, 0x83cc, 0x921e, 0xf908, 0x6a58, 0x514b, 0x524b, 0x5287, - 0x621f, 0x68d8, 0x6975, 0x9699, 0x50c5, 0x52a4, 0x52e4, 0x61c3, 0x65a4, - 0x6839, 0x69ff, 0x747e, 0x7b4b, 0x82b9, 0x83eb, 0x89b2, 0x8b39, 0x8fd1, - 0x9949, 0xf909, 0x4eca, 0x5997, 0x64d2, 0x6611, 0x6a8e, 0x7434, 0x7981, - 0x79bd, 0x82a9, 0x887e, 0x887f, 0x895f, 0xf90a, 0x9326, 0x4f0b, 0x53ca, - 0x6025, 0x6271, 0x6c72, 0x7d1a, 0x7d66, 0x4e98, 0x5162, 0x77dc, 0x80af, - 0x4f01, 0x4f0e, 0x5176, 0x5180, 0x55dc, 0x5668, 0x573b, 0x57fa, 0x57fc, - 0x5914, 0x5947, 0x5993, 0x5bc4, 0x5c90, 0x5d0e, 0x5df1, 0x5e7e, 0x5fcc, - 0x6280, 0x65d7, 0x65e3, 0x671e, 0x671f, 0x675e, 0x68cb, 0x68c4, 0x6a5f, - 0x6b3a, 0x6c23, 0x6c7d, 0x6c82, 0x6dc7, 0x7398, 0x7426, 0x742a, 0x7482, - 0x74a3, 0x7578, 0x757f, 0x7881, 0x78ef, 0x7941, 0x7947, 0x7948, 0x797a, - 0x7b95, 0x7d00, 0x7dba, 0x7f88, 0x8006, 0x802d, 0x808c, 0x8a18, 0x8b4f, - 0x8c48, 0x8d77, 0x9321, 0x9324, 0x98e2, 0x9951, 0x9a0e, 0x9a0f, 0x9a65, - 0x9e92, 0x7dca, 0x4f76, 0x5409, 0x62ee, 0x6854, 0x91d1, 0x55ab, 0x513a, - 0xf90b, 0xf90c, 0x5a1c, 0x61e6, 0xf90d, 0x62cf, 0x62ff, 0xf90e, 0xf90f, - 0xf910, 0xf911, 0xf912, 0xf913, 0x90a3, 0xf914, 0xf915, 0xf916, 0xf917, - 0xf918, 0x8afe, 0xf919, 0xf91a, 0xf91b, 0xf91c, 0x6696, 0xf91d, 0x7156, - 0xf91e, 0xf91f, 0x96e3, 0xf920, 0x634f, 0x637a, 0x5357, 0xf921, 0x678f, - 0x6960, 0x6e73, 0xf922, 0x7537, 0xf923, 0xf924, 0xf925, 0x7d0d, 0xf926, - 0xf927, 0x8872, 0x56ca, 0x5a18, 0xf928, 0xf929, 0xf92a, 0xf92b, 0xf92c, - 0x4e43, 0xf92d, 0x5167, 0x5948, 0x67f0, 0x8010, 0xf92e, 0x5973, 0x5e74, - 0x649a, 0x79ca, 0x5ff5, 0x606c, 0x62c8, 0x637b, 0x5be7, 0x5bd7, 0x52aa, - 0xf92f, 0x5974, 0x5f29, 0x6012, 0xf930, 0xf931, 0xf932, 0x7459, 0xf933, - 0xf934, 0xf935, 0xf936, 0xf937, 0xf938, 0x99d1, 0xf939, 0xf93a, 0xf93b, - 0xf93c, 0xf93d, 0xf93e, 0xf93f, 0xf940, 0xf941, 0xf942, 0xf943, 0x6fc3, - 0xf944, 0xf945, 0x81bf, 0x8fb2, 0x60f1, 0xf946, 0xf947, 0x8166, 0xf948, - 0xf949, 0x5c3f, 0xf94a, 0xf94b, 0xf94c, 0xf94d, 0xf94e, 0xf94f, 0xf950, - 0xf951, 0x5ae9, 0x8a25, 0x677b, 0x7d10, 0xf952, 0xf953, 0xf954, 0xf955, - 0xf956, 0xf957, 0x80fd, 0xf958, 0xf959, 0x5c3c, 0x6ce5, 0x533f, 0x6eba, - 0x591a, 0x8336, 0x4e39, 0x4eb6, 0x4f46, 0x55ae, 0x5718, 0x58c7, 0x5f56, - 0x65b7, 0x65e6, 0x6a80, 0x6bb5, 0x6e4d, 0x77ed, 0x7aef, 0x7c1e, 0x7dde, - 0x86cb, 0x8892, 0x9132, 0x935b, 0x64bb, 0x6fbe, 0x737a, 0x75b8, 0x9054, - 0x5556, 0x574d, 0x61ba, 0x64d4, 0x66c7, 0x6de1, 0x6e5b, 0x6f6d, 0x6fb9, - 0x75f0, 0x8043, 0x81bd, 0x8541, 0x8983, 0x8ac7, 0x8b5a, 0x931f, 0x6c93, - 0x7553, 0x7b54, 0x8e0f, 0x905d, 0x5510, 0x5802, 0x5858, 0x5e62, 0x6207, - 0x649e, 0x68e0, 0x7576, 0x7cd6, 0x87b3, 0x9ee8, 0x4ee3, 0x5788, 0x576e, - 0x5927, 0x5c0d, 0x5cb1, 0x5e36, 0x5f85, 0x6234, 0x64e1, 0x73b3, 0x81fa, - 0x888b, 0x8cb8, 0x968a, 0x9edb, 0x5b85, 0x5fb7, 0x60b3, 0x5012, 0x5200, - 0x5230, 0x5716, 0x5835, 0x5857, 0x5c0e, 0x5c60, 0x5cf6, 0x5d8b, 0x5ea6, - 0x5f92, 0x60bc, 0x6311, 0x6389, 0x6417, 0x6843, 0x68f9, 0x6ac2, 0x6dd8, - 0x6e21, 0x6ed4, 0x6fe4, 0x71fe, 0x76dc, 0x7779, 0x79b1, 0x7a3b, 0x8404, - 0x89a9, 0x8ced, 0x8df3, 0x8e48, 0x9003, 0x9014, 0x9053, 0x90fd, 0x934d, - 0x9676, 0x97dc, 0x6bd2, 0x7006, 0x7258, 0x72a2, 0x7368, 0x7763, 0x79bf, - 0x7be4, 0x7e9b, 0x8b80, 0x58a9, 0x60c7, 0x6566, 0x65fd, 0x66be, 0x6c8c, - 0x711e, 0x71c9, 0x8c5a, 0x9813, 0x4e6d, 0x7a81, 0x4edd, 0x51ac, 0x51cd, - 0x52d5, 0x540c, 0x61a7, 0x6771, 0x6850, 0x68df, 0x6d1e, 0x6f7c, 0x75bc, - 0x77b3, 0x7ae5, 0x80f4, 0x8463, 0x9285, 0x515c, 0x6597, 0x675c, 0x6793, - 0x75d8, 0x7ac7, 0x8373, 0xf95a, 0x8c46, 0x9017, 0x982d, 0x5c6f, 0x81c0, - 0x829a, 0x9041, 0x906f, 0x920d, 0x5f97, 0x5d9d, 0x6a59, 0x71c8, 0x767b, - 0x7b49, 0x85e4, 0x8b04, 0x9127, 0x9a30, 0x5587, 0x61f6, 0xf95b, 0x7669, - 0x7f85, 0x863f, 0x87ba, 0x88f8, 0x908f, 0xf95c, 0x6d1b, 0x70d9, 0x73de, - 0x7d61, 0x843d, 0xf95d, 0x916a, 0x99f1, 0xf95e, 0x4e82, 0x5375, 0x6b04, - 0x6b12, 0x703e, 0x721b, 0x862d, 0x9e1e, 0x524c, 0x8fa3, 0x5d50, 0x64e5, - 0x652c, 0x6b16, 0x6feb, 0x7c43, 0x7e9c, 0x85cd, 0x8964, 0x89bd, 0x62c9, - 0x81d8, 0x881f, 0x5eca, 0x6717, 0x6d6a, 0x72fc, 0x7405, 0x746f, 0x8782, - 0x90de, 0x4f86, 0x5d0d, 0x5fa0, 0x840a, 0x51b7, 0x63a0, 0x7565, 0x4eae, - 0x5006, 0x5169, 0x51c9, 0x6881, 0x6a11, 0x7cae, 0x7cb1, 0x7ce7, 0x826f, - 0x8ad2, 0x8f1b, 0x91cf, 0x4fb6, 0x5137, 0x52f5, 0x5442, 0x5eec, 0x616e, - 0x623e, 0x65c5, 0x6ada, 0x6ffe, 0x792a, 0x85dc, 0x8823, 0x95ad, 0x9a62, - 0x9a6a, 0x9e97, 0x9ece, 0x529b, 0x66c6, 0x6b77, 0x701d, 0x792b, 0x8f62, - 0x9742, 0x6190, 0x6200, 0x6523, 0x6f23, 0x7149, 0x7489, 0x7df4, 0x806f, - 0x84ee, 0x8f26, 0x9023, 0x934a, 0x51bd, 0x5217, 0x52a3, 0x6d0c, 0x70c8, - 0x88c2, 0x5ec9, 0x6582, 0x6bae, 0x6fc2, 0x7c3e, 0x7375, 0x4ee4, 0x4f36, - 0x56f9, 0xf95f, 0x5cba, 0x5dba, 0x601c, 0x73b2, 0x7b2d, 0x7f9a, 0x7fce, - 0x8046, 0x901e, 0x9234, 0x96f6, 0x9748, 0x9818, 0x9f61, 0x4f8b, 0x6fa7, - 0x79ae, 0x91b4, 0x96b7, 0x52de, 0xf960, 0x6488, 0x64c4, 0x6ad3, 0x6f5e, - 0x7018, 0x7210, 0x76e7, 0x8001, 0x8606, 0x865c, 0x8def, 0x8f05, 0x9732, - 0x9b6f, 0x9dfa, 0x9e75, 0x788c, 0x797f, 0x7da0, 0x83c9, 0x9304, 0x9e7f, - 0x9e93, 0x8ad6, 0x58df, 0x5f04, 0x6727, 0x7027, 0x74cf, 0x7c60, 0x807e, - 0x5121, 0x7028, 0x7262, 0x78ca, 0x8cc2, 0x8cda, 0x8cf4, 0x96f7, 0x4e86, - 0x50da, 0x5bee, 0x5ed6, 0x6599, 0x71ce, 0x7642, 0x77ad, 0x804a, 0x84fc, - 0x907c, 0x9b27, 0x9f8d, 0x58d8, 0x5a41, 0x5c62, 0x6a13, 0x6dda, 0x6f0f, - 0x763b, 0x7d2f, 0x7e37, 0x851e, 0x8938, 0x93e4, 0x964b, 0x5289, 0x65d2, - 0x67f3, 0x69b4, 0x6d41, 0x6e9c, 0x700f, 0x7409, 0x7460, 0x7559, 0x7624, - 0x786b, 0x8b2c, 0x985e, 0x516d, 0x622e, 0x9678, 0x4f96, 0x502b, 0x5d19, - 0x6dea, 0x7db8, 0x8f2a, 0x5f8b, 0x6144, 0x6817, 0xf961, 0x9686, 0x52d2, - 0x808b, 0x51dc, 0x51cc, 0x695e, 0x7a1c, 0x7dbe, 0x83f1, 0x9675, 0x4fda, - 0x5229, 0x5398, 0x540f, 0x550e, 0x5c65, 0x60a7, 0x674e, 0x68a8, 0x6d6c, - 0x7281, 0x72f8, 0x7406, 0x7483, 0xf962, 0x75e2, 0x7c6c, 0x7f79, 0x7fb8, - 0x8389, 0x88cf, 0x88e1, 0x91cc, 0x91d0, 0x96e2, 0x9bc9, 0x541d, 0x6f7e, - 0x71d0, 0x7498, 0x85fa, 0x8eaa, 0x96a3, 0x9c57, 0x9e9f, 0x6797, 0x6dcb, - 0x7433, 0x81e8, 0x9716, 0x782c, 0x7acb, 0x7b20, 0x7c92, 0x6469, 0x746a, - 0x75f2, 0x78bc, 0x78e8, 0x99ac, 0x9b54, 0x9ebb, 0x5bde, 0x5e55, 0x6f20, - 0x819c, 0x83ab, 0x9088, 0x4e07, 0x534d, 0x5a29, 0x5dd2, 0x5f4e, 0x6162, - 0x633d, 0x6669, 0x66fc, 0x6eff, 0x6f2b, 0x7063, 0x779e, 0x842c, 0x8513, - 0x883b, 0x8f13, 0x9945, 0x9c3b, 0x551c, 0x62b9, 0x672b, 0x6cab, 0x8309, - 0x896a, 0x977a, 0x4ea1, 0x5984, 0x5fd8, 0x5fd9, 0x671b, 0x7db2, 0x7f54, - 0x8292, 0x832b, 0x83bd, 0x8f1e, 0x9099, 0x57cb, 0x59b9, 0x5a92, 0x5bd0, - 0x6627, 0x679a, 0x6885, 0x6bcf, 0x7164, 0x7f75, 0x8cb7, 0x8ce3, 0x9081, - 0x9b45, 0x8108, 0x8c8a, 0x964c, 0x9a40, 0x9ea5, 0x5b5f, 0x6c13, 0x731b, - 0x76f2, 0x76df, 0x840c, 0x51aa, 0x8993, 0x514d, 0x5195, 0x52c9, 0x68c9, - 0x6c94, 0x7704, 0x7720, 0x7dbf, 0x7dec, 0x9762, 0x9eb5, 0x6ec5, 0x8511, - 0x51a5, 0x540d, 0x547d, 0x660e, 0x669d, 0x6927, 0x6e9f, 0x76bf, 0x7791, - 0x8317, 0x84c2, 0x879f, 0x9169, 0x9298, 0x9cf4, 0x8882, 0x4fae, 0x5192, - 0x52df, 0x59c6, 0x5e3d, 0x6155, 0x6478, 0x6479, 0x66ae, 0x67d0, 0x6a21, - 0x6bcd, 0x6bdb, 0x725f, 0x7261, 0x7441, 0x7738, 0x77db, 0x8017, 0x82bc, - 0x8305, 0x8b00, 0x8b28, 0x8c8c, 0x6728, 0x6c90, 0x7267, 0x76ee, 0x7766, - 0x7a46, 0x9da9, 0x6b7f, 0x6c92, 0x5922, 0x6726, 0x8499, 0x536f, 0x5893, - 0x5999, 0x5edf, 0x63cf, 0x6634, 0x6773, 0x6e3a, 0x732b, 0x7ad7, 0x82d7, - 0x9328, 0x52d9, 0x5deb, 0x61ae, 0x61cb, 0x620a, 0x62c7, 0x64ab, 0x65e0, - 0x6959, 0x6b66, 0x6bcb, 0x7121, 0x73f7, 0x755d, 0x7e46, 0x821e, 0x8302, - 0x856a, 0x8aa3, 0x8cbf, 0x9727, 0x9d61, 0x58a8, 0x9ed8, 0x5011, 0x520e, - 0x543b, 0x554f, 0x6587, 0x6c76, 0x7d0a, 0x7d0b, 0x805e, 0x868a, 0x9580, - 0x96ef, 0x52ff, 0x6c95, 0x7269, 0x5473, 0x5a9a, 0x5c3e, 0x5d4b, 0x5f4c, - 0x5fae, 0x672a, 0x68b6, 0x6963, 0x6e3c, 0x6e44, 0x7709, 0x7c73, 0x7f8e, - 0x8587, 0x8b0e, 0x8ff7, 0x9761, 0x9ef4, 0x5cb7, 0x60b6, 0x610d, 0x61ab, - 0x654f, 0x65fb, 0x65fc, 0x6c11, 0x6cef, 0x739f, 0x73c9, 0x7de1, 0x9594, - 0x5bc6, 0x871c, 0x8b10, 0x525d, 0x535a, 0x62cd, 0x640f, 0x64b2, 0x6734, - 0x6a38, 0x6cca, 0x73c0, 0x749e, 0x7b94, 0x7c95, 0x7e1b, 0x818a, 0x8236, - 0x8584, 0x8feb, 0x96f9, 0x99c1, 0x4f34, 0x534a, 0x53cd, 0x53db, 0x62cc, - 0x642c, 0x6500, 0x6591, 0x69c3, 0x6cee, 0x6f58, 0x73ed, 0x7554, 0x7622, - 0x76e4, 0x76fc, 0x78d0, 0x78fb, 0x792c, 0x7d46, 0x822c, 0x87e0, 0x8fd4, - 0x9812, 0x98ef, 0x52c3, 0x62d4, 0x64a5, 0x6e24, 0x6f51, 0x767c, 0x8dcb, - 0x91b1, 0x9262, 0x9aee, 0x9b43, 0x5023, 0x508d, 0x574a, 0x59a8, 0x5c28, - 0x5e47, 0x5f77, 0x623f, 0x653e, 0x65b9, 0x65c1, 0x6609, 0x678b, 0x699c, - 0x6ec2, 0x78c5, 0x7d21, 0x80aa, 0x8180, 0x822b, 0x82b3, 0x84a1, 0x868c, - 0x8a2a, 0x8b17, 0x90a6, 0x9632, 0x9f90, 0x500d, 0x4ff3, 0xf963, 0x57f9, - 0x5f98, 0x62dc, 0x6392, 0x676f, 0x6e43, 0x7119, 0x76c3, 0x80cc, 0x80da, - 0x88f4, 0x88f5, 0x8919, 0x8ce0, 0x8f29, 0x914d, 0x966a, 0x4f2f, 0x4f70, - 0x5e1b, 0x67cf, 0x6822, 0x767d, 0x767e, 0x9b44, 0x5e61, 0x6a0a, 0x7169, - 0x71d4, 0x756a, 0xf964, 0x7e41, 0x8543, 0x85e9, 0x98dc, 0x4f10, 0x7b4f, - 0x7f70, 0x95a5, 0x51e1, 0x5e06, 0x68b5, 0x6c3e, 0x6c4e, 0x6cdb, 0x72af, - 0x7bc4, 0x8303, 0x6cd5, 0x743a, 0x50fb, 0x5288, 0x58c1, 0x64d8, 0x6a97, - 0x74a7, 0x7656, 0x78a7, 0x8617, 0x95e2, 0x9739, 0xf965, 0x535e, 0x5f01, - 0x8b8a, 0x8fa8, 0x8faf, 0x908a, 0x5225, 0x77a5, 0x9c49, 0x9f08, 0x4e19, - 0x5002, 0x5175, 0x5c5b, 0x5e77, 0x661e, 0x663a, 0x67c4, 0x68c5, 0x70b3, - 0x7501, 0x75c5, 0x79c9, 0x7add, 0x8f27, 0x9920, 0x9a08, 0x4fdd, 0x5821, - 0x5831, 0x5bf6, 0x666e, 0x6b65, 0x6d11, 0x6e7a, 0x6f7d, 0x73e4, 0x752b, - 0x83e9, 0x88dc, 0x8913, 0x8b5c, 0x8f14, 0x4f0f, 0x50d5, 0x5310, 0x535c, - 0x5b93, 0x5fa9, 0x670d, 0x798f, 0x8179, 0x832f, 0x8514, 0x8907, 0x8986, - 0x8f39, 0x8f3b, 0x99a5, 0x9c12, 0x672c, 0x4e76, 0x4ff8, 0x5949, 0x5c01, - 0x5cef, 0x5cf0, 0x6367, 0x68d2, 0x70fd, 0x71a2, 0x742b, 0x7e2b, 0x84ec, - 0x8702, 0x9022, 0x92d2, 0x9cf3, 0x4e0d, 0x4ed8, 0x4fef, 0x5085, 0x5256, - 0x526f, 0x5426, 0x5490, 0x57e0, 0x592b, 0x5a66, 0x5b5a, 0x5b75, 0x5bcc, - 0x5e9c, 0xf966, 0x6276, 0x6577, 0x65a7, 0x6d6e, 0x6ea5, 0x7236, 0x7b26, - 0x7c3f, 0x7f36, 0x8150, 0x8151, 0x819a, 0x8240, 0x8299, 0x83a9, 0x8a03, - 0x8ca0, 0x8ce6, 0x8cfb, 0x8d74, 0x8dba, 0x90e8, 0x91dc, 0x961c, 0x9644, - 0x99d9, 0x9ce7, 0x5317, 0x5206, 0x5429, 0x5674, 0x58b3, 0x5954, 0x596e, - 0x5fff, 0x61a4, 0x626e, 0x6610, 0x6c7e, 0x711a, 0x76c6, 0x7c89, 0x7cde, - 0x7d1b, 0x82ac, 0x8cc1, 0x96f0, 0xf967, 0x4f5b, 0x5f17, 0x5f7f, 0x62c2, - 0x5d29, 0x670b, 0x68da, 0x787c, 0x7e43, 0x9d6c, 0x4e15, 0x5099, 0x5315, - 0x532a, 0x5351, 0x5983, 0x5a62, 0x5e87, 0x60b2, 0x618a, 0x6249, 0x6279, - 0x6590, 0x6787, 0x69a7, 0x6bd4, 0x6bd6, 0x6bd7, 0x6bd8, 0x6cb8, 0xf968, - 0x7435, 0x75fa, 0x7812, 0x7891, 0x79d5, 0x79d8, 0x7c83, 0x7dcb, 0x7fe1, - 0x80a5, 0x813e, 0x81c2, 0x83f2, 0x871a, 0x88e8, 0x8ab9, 0x8b6c, 0x8cbb, - 0x9119, 0x975e, 0x98db, 0x9f3b, 0x56ac, 0x5b2a, 0x5f6c, 0x658c, 0x6ab3, - 0x6baf, 0x6d5c, 0x6ff1, 0x7015, 0x725d, 0x73ad, 0x8ca7, 0x8cd3, 0x983b, - 0x6191, 0x6c37, 0x8058, 0x9a01, 0x4e4d, 0x4e8b, 0x4e9b, 0x4ed5, 0x4f3a, - 0x4f3c, 0x4f7f, 0x4fdf, 0x50ff, 0x53f2, 0x53f8, 0x5506, 0x55e3, 0x56db, - 0x58eb, 0x5962, 0x5a11, 0x5beb, 0x5bfa, 0x5c04, 0x5df3, 0x5e2b, 0x5f99, - 0x601d, 0x6368, 0x659c, 0x65af, 0x67f6, 0x67fb, 0x68ad, 0x6b7b, 0x6c99, - 0x6cd7, 0x6e23, 0x7009, 0x7345, 0x7802, 0x793e, 0x7940, 0x7960, 0x79c1, - 0x7be9, 0x7d17, 0x7d72, 0x8086, 0x820d, 0x838e, 0x84d1, 0x86c7, 0x88df, - 0x8a50, 0x8a5e, 0x8b1d, 0x8cdc, 0x8d66, 0x8fad, 0x90aa, 0x98fc, 0x99df, - 0x9e9d, 0x524a, 0xf969, 0x6714, 0xf96a, 0x5098, 0x522a, 0x5c71, 0x6563, - 0x6c55, 0x73ca, 0x7523, 0x759d, 0x7b97, 0x849c, 0x9178, 0x9730, 0x4e77, - 0x6492, 0x6bba, 0x715e, 0x85a9, 0x4e09, 0xf96b, 0x6749, 0x68ee, 0x6e17, - 0x829f, 0x8518, 0x886b, 0x63f7, 0x6f81, 0x9212, 0x98af, 0x4e0a, 0x50b7, - 0x50cf, 0x511f, 0x5546, 0x55aa, 0x5617, 0x5b40, 0x5c19, 0x5ce0, 0x5e38, - 0x5e8a, 0x5ea0, 0x5ec2, 0x60f3, 0x6851, 0x6a61, 0x6e58, 0x723d, 0x7240, - 0x72c0, 0x76f8, 0x7965, 0x7bb1, 0x7fd4, 0x88f3, 0x89f4, 0x8a73, 0x8c61, - 0x8cde, 0x971c, 0x585e, 0x74bd, 0x8cfd, 0x55c7, 0xf96c, 0x7a61, 0x7d22, - 0x8272, 0x7272, 0x751f, 0x7525, 0xf96d, 0x7b19, 0x5885, 0x58fb, 0x5dbc, - 0x5e8f, 0x5eb6, 0x5f90, 0x6055, 0x6292, 0x637f, 0x654d, 0x6691, 0x66d9, - 0x66f8, 0x6816, 0x68f2, 0x7280, 0x745e, 0x7b6e, 0x7d6e, 0x7dd6, 0x7f72, - 0x80e5, 0x8212, 0x85af, 0x897f, 0x8a93, 0x901d, 0x92e4, 0x9ecd, 0x9f20, - 0x5915, 0x596d, 0x5e2d, 0x60dc, 0x6614, 0x6673, 0x6790, 0x6c50, 0x6dc5, - 0x6f5f, 0x77f3, 0x78a9, 0x84c6, 0x91cb, 0x932b, 0x4ed9, 0x50ca, 0x5148, - 0x5584, 0x5b0b, 0x5ba3, 0x6247, 0x657e, 0x65cb, 0x6e32, 0x717d, 0x7401, - 0x7444, 0x7487, 0x74bf, 0x766c, 0x79aa, 0x7dda, 0x7e55, 0x7fa8, 0x817a, - 0x81b3, 0x8239, 0x861a, 0x87ec, 0x8a75, 0x8de3, 0x9078, 0x9291, 0x9425, - 0x994d, 0x9bae, 0x5368, 0x5c51, 0x6954, 0x6cc4, 0x6d29, 0x6e2b, 0x820c, - 0x859b, 0x893b, 0x8a2d, 0x8aaa, 0x96ea, 0x9f67, 0x5261, 0x66b9, 0x6bb2, - 0x7e96, 0x87fe, 0x8d0d, 0x9583, 0x965d, 0x651d, 0x6d89, 0x71ee, 0xf96e, - 0x57ce, 0x59d3, 0x5bac, 0x6027, 0x60fa, 0x6210, 0x661f, 0x665f, 0x7329, - 0x73f9, 0x76db, 0x7701, 0x7b6c, 0x8056, 0x8072, 0x8165, 0x8aa0, 0x9192, - 0x4e16, 0x52e2, 0x6b72, 0x6d17, 0x7a05, 0x7b39, 0x7d30, 0xf96f, 0x8cb0, - 0x53ec, 0x562f, 0x5851, 0x5bb5, 0x5c0f, 0x5c11, 0x5de2, 0x6240, 0x6383, - 0x6414, 0x662d, 0x68b3, 0x6cbc, 0x6d88, 0x6eaf, 0x701f, 0x70a4, 0x71d2, - 0x7526, 0x758f, 0x758e, 0x7619, 0x7b11, 0x7be0, 0x7c2b, 0x7d20, 0x7d39, - 0x852c, 0x856d, 0x8607, 0x8a34, 0x900d, 0x9061, 0x90b5, 0x92b7, 0x97f6, - 0x9a37, 0x4fd7, 0x5c6c, 0x675f, 0x6d91, 0x7c9f, 0x7e8c, 0x8b16, 0x8d16, - 0x901f, 0x5b6b, 0x5dfd, 0x640d, 0x84c0, 0x905c, 0x98e1, 0x7387, 0x5b8b, - 0x609a, 0x677e, 0x6dde, 0x8a1f, 0x8aa6, 0x9001, 0x980c, 0x5237, 0xf970, - 0x7051, 0x788e, 0x9396, 0x8870, 0x91d7, 0x4fee, 0x53d7, 0x55fd, 0x56da, - 0x5782, 0x58fd, 0x5ac2, 0x5b88, 0x5cab, 0x5cc0, 0x5e25, 0x6101, 0x620d, - 0x624b, 0x6388, 0x641c, 0x6536, 0x6578, 0x6a39, 0x6b8a, 0x6c34, 0x6d19, - 0x6f31, 0x71e7, 0x72e9, 0x7378, 0x7407, 0x74b2, 0x7626, 0x7761, 0x79c0, - 0x7a57, 0x7aea, 0x7cb9, 0x7d8f, 0x7dac, 0x7e61, 0x7f9e, 0x8129, 0x8331, - 0x8490, 0x84da, 0x85ea, 0x8896, 0x8ab0, 0x8b90, 0x8f38, 0x9042, 0x9083, - 0x916c, 0x9296, 0x92b9, 0x968b, 0x96a7, 0x96a8, 0x96d6, 0x9700, 0x9808, - 0x9996, 0x9ad3, 0x9b1a, 0x53d4, 0x587e, 0x5919, 0x5b70, 0x5bbf, 0x6dd1, - 0x6f5a, 0x719f, 0x7421, 0x74b9, 0x8085, 0x83fd, 0x5de1, 0x5f87, 0x5faa, - 0x6042, 0x65ec, 0x6812, 0x696f, 0x6a53, 0x6b89, 0x6d35, 0x6df3, 0x73e3, - 0x76fe, 0x77ac, 0x7b4d, 0x7d14, 0x8123, 0x821c, 0x8340, 0x84f4, 0x8563, - 0x8a62, 0x8ac4, 0x9187, 0x931e, 0x9806, 0x99b4, 0x620c, 0x8853, 0x8ff0, - 0x9265, 0x5d07, 0x5d27, 0x5d69, 0x745f, 0x819d, 0x8768, 0x6fd5, 0x62fe, - 0x7fd2, 0x8936, 0x8972, 0x4e1e, 0x4e58, 0x50e7, 0x52dd, 0x5347, 0x627f, - 0x6607, 0x7e69, 0x8805, 0x965e, 0x4f8d, 0x5319, 0x5636, 0x59cb, 0x5aa4, - 0x5c38, 0x5c4e, 0x5c4d, 0x5e02, 0x5f11, 0x6043, 0x65bd, 0x662f, 0x6642, - 0x67be, 0x67f4, 0x731c, 0x77e2, 0x793a, 0x7fc5, 0x8494, 0x84cd, 0x8996, - 0x8a66, 0x8a69, 0x8ae1, 0x8c55, 0x8c7a, 0x57f4, 0x5bd4, 0x5f0f, 0x606f, - 0x62ed, 0x690d, 0x6b96, 0x6e5c, 0x7184, 0x7bd2, 0x8755, 0x8b58, 0x8efe, - 0x98df, 0x98fe, 0x4f38, 0x4f81, 0x4fe1, 0x547b, 0x5a20, 0x5bb8, 0x613c, - 0x65b0, 0x6668, 0x71fc, 0x7533, 0x795e, 0x7d33, 0x814e, 0x81e3, 0x8398, - 0x85aa, 0x85ce, 0x8703, 0x8a0a, 0x8eab, 0x8f9b, 0xf971, 0x8fc5, 0x5931, - 0x5ba4, 0x5be6, 0x6089, 0x5be9, 0x5c0b, 0x5fc3, 0x6c81, 0xf972, 0x6df1, - 0x700b, 0x751a, 0x82af, 0x8af6, 0x4ec0, 0x5341, 0xf973, 0x96d9, 0x6c0f, - 0x4e9e, 0x4fc4, 0x5152, 0x555e, 0x5a25, 0x5ce8, 0x6211, 0x7259, 0x82bd, - 0x83aa, 0x86fe, 0x8859, 0x8a1d, 0x963f, 0x96c5, 0x9913, 0x9d09, 0x9d5d, - 0x580a, 0x5cb3, 0x5dbd, 0x5e44, 0x60e1, 0x6115, 0x63e1, 0x6a02, 0x6e25, - 0x9102, 0x9354, 0x984e, 0x9c10, 0x9f77, 0x5b89, 0x5cb8, 0x6309, 0x664f, - 0x6848, 0x773c, 0x96c1, 0x978d, 0x9854, 0x9b9f, 0x65a1, 0x8b01, 0x8ecb, - 0x95bc, 0x5535, 0x5ca9, 0x5dd6, 0x5eb5, 0x6697, 0x764c, 0x83f4, 0x95c7, - 0x58d3, 0x62bc, 0x72ce, 0x9d28, 0x4ef0, 0x592e, 0x600f, 0x663b, 0x6b83, - 0x79e7, 0x9d26, 0x5393, 0x54c0, 0x57c3, 0x5d16, 0x611b, 0x66d6, 0x6daf, - 0x788d, 0x827e, 0x9698, 0x9744, 0x5384, 0x627c, 0x6396, 0x6db2, 0x7e0a, - 0x814b, 0x984d, 0x6afb, 0x7f4c, 0x9daf, 0x9e1a, 0x4e5f, 0x503b, 0x51b6, - 0x591c, 0x60f9, 0x63f6, 0x6930, 0x723a, 0x8036, 0xf974, 0x91ce, 0x5f31, - 0xf975, 0xf976, 0x7d04, 0x82e5, 0x846f, 0x84bb, 0x85e5, 0x8e8d, 0xf977, - 0x4f6f, 0xf978, 0xf979, 0x58e4, 0x5b43, 0x6059, 0x63da, 0x6518, 0x656d, - 0x6698, 0xf97a, 0x694a, 0x6a23, 0x6d0b, 0x7001, 0x716c, 0x75d2, 0x760d, - 0x79b3, 0x7a70, 0xf97b, 0x7f8a, 0xf97c, 0x8944, 0xf97d, 0x8b93, 0x91c0, - 0x967d, 0xf97e, 0x990a, 0x5704, 0x5fa1, 0x65bc, 0x6f01, 0x7600, 0x79a6, - 0x8a9e, 0x99ad, 0x9b5a, 0x9f6c, 0x5104, 0x61b6, 0x6291, 0x6a8d, 0x81c6, - 0x5043, 0x5830, 0x5f66, 0x7109, 0x8a00, 0x8afa, 0x5b7c, 0x8616, 0x4ffa, - 0x513c, 0x56b4, 0x5944, 0x63a9, 0x6df9, 0x5daa, 0x696d, 0x5186, 0x4e88, - 0x4f59, 0xf97f, 0xf980, 0xf981, 0x5982, 0xf982, 0xf983, 0x6b5f, 0x6c5d, - 0xf984, 0x74b5, 0x7916, 0xf985, 0x8207, 0x8245, 0x8339, 0x8f3f, 0x8f5d, - 0xf986, 0x9918, 0xf987, 0xf988, 0xf989, 0x4ea6, 0xf98a, 0x57df, 0x5f79, - 0x6613, 0xf98b, 0xf98c, 0x75ab, 0x7e79, 0x8b6f, 0xf98d, 0x9006, 0x9a5b, - 0x56a5, 0x5827, 0x59f8, 0x5a1f, 0x5bb4, 0xf98e, 0x5ef6, 0xf98f, 0xf990, - 0x6350, 0x633b, 0xf991, 0x693d, 0x6c87, 0x6cbf, 0x6d8e, 0x6d93, 0x6df5, - 0x6f14, 0xf992, 0x70df, 0x7136, 0x7159, 0xf993, 0x71c3, 0x71d5, 0xf994, - 0x784f, 0x786f, 0xf995, 0x7b75, 0x7de3, 0xf996, 0x7e2f, 0xf997, 0x884d, - 0x8edf, 0xf998, 0xf999, 0xf99a, 0x925b, 0xf99b, 0x9cf6, 0xf99c, 0xf99d, - 0xf99e, 0x6085, 0x6d85, 0xf99f, 0x71b1, 0xf9a0, 0xf9a1, 0x95b1, 0x53ad, - 0xf9a2, 0xf9a3, 0xf9a4, 0x67d3, 0xf9a5, 0x708e, 0x7130, 0x7430, 0x8276, - 0x82d2, 0xf9a6, 0x95bb, 0x9ae5, 0x9e7d, 0x66c4, 0xf9a7, 0x71c1, 0x8449, - 0xf9a8, 0xf9a9, 0x584b, 0xf9aa, 0xf9ab, 0x5db8, 0x5f71, 0xf9ac, 0x6620, - 0x668e, 0x6979, 0x69ae, 0x6c38, 0x6cf3, 0x6e36, 0x6f41, 0x6fda, 0x701b, - 0x702f, 0x7150, 0x71df, 0x7370, 0xf9ad, 0x745b, 0xf9ae, 0x74d4, 0x76c8, - 0x7a4e, 0x7e93, 0xf9af, 0xf9b0, 0x82f1, 0x8a60, 0x8fce, 0xf9b1, 0x9348, - 0xf9b2, 0x9719, 0xf9b3, 0xf9b4, 0x4e42, 0x502a, 0xf9b5, 0x5208, 0x53e1, - 0x66f3, 0x6c6d, 0x6fca, 0x730a, 0x777f, 0x7a62, 0x82ae, 0x85dd, 0x8602, - 0xf9b6, 0x88d4, 0x8a63, 0x8b7d, 0x8c6b, 0xf9b7, 0x92b3, 0xf9b8, 0x9713, - 0x9810, 0x4e94, 0x4f0d, 0x4fc9, 0x50b2, 0x5348, 0x543e, 0x5433, 0x55da, - 0x5862, 0x58ba, 0x5967, 0x5a1b, 0x5be4, 0x609f, 0xf9b9, 0x61ca, 0x6556, - 0x65ff, 0x6664, 0x68a7, 0x6c5a, 0x6fb3, 0x70cf, 0x71ac, 0x7352, 0x7b7d, - 0x8708, 0x8aa4, 0x9c32, 0x9f07, 0x5c4b, 0x6c83, 0x7344, 0x7389, 0x923a, - 0x6eab, 0x7465, 0x761f, 0x7a69, 0x7e15, 0x860a, 0x5140, 0x58c5, 0x64c1, - 0x74ee, 0x7515, 0x7670, 0x7fc1, 0x9095, 0x96cd, 0x9954, 0x6e26, 0x74e6, - 0x7aa9, 0x7aaa, 0x81e5, 0x86d9, 0x8778, 0x8a1b, 0x5a49, 0x5b8c, 0x5b9b, - 0x68a1, 0x6900, 0x6d63, 0x73a9, 0x7413, 0x742c, 0x7897, 0x7de9, 0x7feb, - 0x8118, 0x8155, 0x839e, 0x8c4c, 0x962e, 0x9811, 0x66f0, 0x5f80, 0x65fa, - 0x6789, 0x6c6a, 0x738b, 0x502d, 0x5a03, 0x6b6a, 0x77ee, 0x5916, 0x5d6c, - 0x5dcd, 0x7325, 0x754f, 0xf9ba, 0xf9bb, 0x50e5, 0x51f9, 0x582f, 0x592d, - 0x5996, 0x59da, 0x5be5, 0xf9bc, 0xf9bd, 0x5da2, 0x62d7, 0x6416, 0x6493, - 0x64fe, 0xf9be, 0x66dc, 0xf9bf, 0x6a48, 0xf9c0, 0x71ff, 0x7464, 0xf9c1, - 0x7a88, 0x7aaf, 0x7e47, 0x7e5e, 0x8000, 0x8170, 0xf9c2, 0x87ef, 0x8981, - 0x8b20, 0x9059, 0xf9c3, 0x9080, 0x9952, 0x617e, 0x6b32, 0x6d74, 0x7e1f, - 0x8925, 0x8fb1, 0x4fd1, 0x50ad, 0x5197, 0x52c7, 0x57c7, 0x5889, 0x5bb9, - 0x5eb8, 0x6142, 0x6995, 0x6d8c, 0x6e67, 0x6eb6, 0x7194, 0x7462, 0x7528, - 0x752c, 0x8073, 0x8338, 0x84c9, 0x8e0a, 0x9394, 0x93de, 0xf9c4, 0x4e8e, - 0x4f51, 0x5076, 0x512a, 0x53c8, 0x53cb, 0x53f3, 0x5b87, 0x5bd3, 0x5c24, - 0x611a, 0x6182, 0x65f4, 0x725b, 0x7397, 0x7440, 0x76c2, 0x7950, 0x7991, - 0x79b9, 0x7d06, 0x7fbd, 0x828b, 0x85d5, 0x865e, 0x8fc2, 0x9047, 0x90f5, - 0x91ea, 0x9685, 0x96e8, 0x96e9, 0x52d6, 0x5f67, 0x65ed, 0x6631, 0x682f, - 0x715c, 0x7a36, 0x90c1, 0x980a, 0x4e91, 0xf9c5, 0x6a52, 0x6b9e, 0x6f90, - 0x7189, 0x8018, 0x82b8, 0x8553, 0x904b, 0x9695, 0x96f2, 0x97fb, 0x851a, - 0x9b31, 0x4e90, 0x718a, 0x96c4, 0x5143, 0x539f, 0x54e1, 0x5713, 0x5712, - 0x57a3, 0x5a9b, 0x5ac4, 0x5bc3, 0x6028, 0x613f, 0x63f4, 0x6c85, 0x6d39, - 0x6e72, 0x6e90, 0x7230, 0x733f, 0x7457, 0x82d1, 0x8881, 0x8f45, 0x9060, - 0xf9c6, 0x9662, 0x9858, 0x9d1b, 0x6708, 0x8d8a, 0x925e, 0x4f4d, 0x5049, - 0x50de, 0x5371, 0x570d, 0x59d4, 0x5a01, 0x5c09, 0x6170, 0x6690, 0x6e2d, - 0x7232, 0x744b, 0x7def, 0x80c3, 0x840e, 0x8466, 0x853f, 0x875f, 0x885b, - 0x8918, 0x8b02, 0x9055, 0x97cb, 0x9b4f, 0x4e73, 0x4f91, 0x5112, 0x516a, - 0xf9c7, 0x552f, 0x55a9, 0x5b7a, 0x5ba5, 0x5e7c, 0x5e7d, 0x5ebe, 0x60a0, - 0x60df, 0x6108, 0x6109, 0x63c4, 0x6538, 0x6709, 0xf9c8, 0x67d4, 0x67da, - 0xf9c9, 0x6961, 0x6962, 0x6cb9, 0x6d27, 0xf9ca, 0x6e38, 0xf9cb, 0x6fe1, - 0x7336, 0x7337, 0xf9cc, 0x745c, 0x7531, 0xf9cd, 0x7652, 0xf9ce, 0xf9cf, - 0x7dad, 0x81fe, 0x8438, 0x88d5, 0x8a98, 0x8adb, 0x8aed, 0x8e30, 0x8e42, - 0x904a, 0x903e, 0x907a, 0x9149, 0x91c9, 0x936e, 0xf9d0, 0xf9d1, 0x5809, - 0xf9d2, 0x6bd3, 0x8089, 0x80b2, 0xf9d3, 0xf9d4, 0x5141, 0x596b, 0x5c39, - 0xf9d5, 0xf9d6, 0x6f64, 0x73a7, 0x80e4, 0x8d07, 0xf9d7, 0x9217, 0x958f, - 0xf9d8, 0xf9d9, 0xf9da, 0xf9db, 0x807f, 0x620e, 0x701c, 0x7d68, 0x878d, - 0xf9dc, 0x57a0, 0x6069, 0x6147, 0x6bb7, 0x8abe, 0x9280, 0x96b1, 0x4e59, - 0x541f, 0x6deb, 0x852d, 0x9670, 0x97f3, 0x98ee, 0x63d6, 0x6ce3, 0x9091, - 0x51dd, 0x61c9, 0x81ba, 0x9df9, 0x4f9d, 0x501a, 0x5100, 0x5b9c, 0x610f, - 0x61ff, 0x64ec, 0x6905, 0x6bc5, 0x7591, 0x77e3, 0x7fa9, 0x8264, 0x858f, - 0x87fb, 0x8863, 0x8abc, 0x8b70, 0x91ab, 0x4e8c, 0x4ee5, 0x4f0a, 0xf9dd, - 0xf9de, 0x5937, 0x59e8, 0xf9df, 0x5df2, 0x5f1b, 0x5f5b, 0x6021, 0xf9e0, - 0xf9e1, 0xf9e2, 0xf9e3, 0x723e, 0x73e5, 0xf9e4, 0x7570, 0x75cd, 0xf9e5, - 0x79fb, 0xf9e6, 0x800c, 0x8033, 0x8084, 0x82e1, 0x8351, 0xf9e7, 0xf9e8, - 0x8cbd, 0x8cb3, 0x9087, 0xf9e9, 0xf9ea, 0x98f4, 0x990c, 0xf9eb, 0xf9ec, - 0x7037, 0x76ca, 0x7fca, 0x7fcc, 0x7ffc, 0x8b1a, 0x4eba, 0x4ec1, 0x5203, - 0x5370, 0xf9ed, 0x54bd, 0x56e0, 0x59fb, 0x5bc5, 0x5f15, 0x5fcd, 0x6e6e, - 0xf9ee, 0xf9ef, 0x7d6a, 0x8335, 0xf9f0, 0x8693, 0x8a8d, 0xf9f1, 0x976d, - 0x9777, 0xf9f2, 0xf9f3, 0x4e00, 0x4f5a, 0x4f7e, 0x58f9, 0x65e5, 0x6ea2, - 0x9038, 0x93b0, 0x99b9, 0x4efb, 0x58ec, 0x598a, 0x59d9, 0x6041, 0xf9f4, - 0xf9f5, 0x7a14, 0xf9f6, 0x834f, 0x8cc3, 0x5165, 0x5344, 0xf9f7, 0xf9f8, - 0xf9f9, 0x4ecd, 0x5269, 0x5b55, 0x82bf, 0x4ed4, 0x523a, 0x54a8, 0x59c9, - 0x59ff, 0x5b50, 0x5b57, 0x5b5c, 0x6063, 0x6148, 0x6ecb, 0x7099, 0x716e, - 0x7386, 0x74f7, 0x75b5, 0x78c1, 0x7d2b, 0x8005, 0x81ea, 0x8328, 0x8517, - 0x85c9, 0x8aee, 0x8cc7, 0x96cc, 0x4f5c, 0x52fa, 0x56bc, 0x65ab, 0x6628, - 0x707c, 0x70b8, 0x7235, 0x7dbd, 0x828d, 0x914c, 0x96c0, 0x9d72, 0x5b71, - 0x68e7, 0x6b98, 0x6f7a, 0x76de, 0x5c91, 0x66ab, 0x6f5b, 0x7bb4, 0x7c2a, - 0x8836, 0x96dc, 0x4e08, 0x4ed7, 0x5320, 0x5834, 0x58bb, 0x58ef, 0x596c, - 0x5c07, 0x5e33, 0x5e84, 0x5f35, 0x638c, 0x66b2, 0x6756, 0x6a1f, 0x6aa3, - 0x6b0c, 0x6f3f, 0x7246, 0xf9fa, 0x7350, 0x748b, 0x7ae0, 0x7ca7, 0x8178, - 0x81df, 0x81e7, 0x838a, 0x846c, 0x8523, 0x8594, 0x85cf, 0x88dd, 0x8d13, - 0x91ac, 0x9577, 0x969c, 0x518d, 0x54c9, 0x5728, 0x5bb0, 0x624d, 0x6750, - 0x683d, 0x6893, 0x6e3d, 0x6ed3, 0x707d, 0x7e21, 0x88c1, 0x8ca1, 0x8f09, - 0x9f4b, 0x9f4e, 0x722d, 0x7b8f, 0x8acd, 0x931a, 0x4f47, 0x4f4e, 0x5132, - 0x5480, 0x59d0, 0x5e95, 0x62b5, 0x6775, 0x696e, 0x6a17, 0x6cae, 0x6e1a, - 0x72d9, 0x732a, 0x75bd, 0x7bb8, 0x7d35, 0x82e7, 0x83f9, 0x8457, 0x85f7, - 0x8a5b, 0x8caf, 0x8e87, 0x9019, 0x90b8, 0x96ce, 0x9f5f, 0x52e3, 0x540a, - 0x5ae1, 0x5bc2, 0x6458, 0x6575, 0x6ef4, 0x72c4, 0xf9fb, 0x7684, 0x7a4d, - 0x7b1b, 0x7c4d, 0x7e3e, 0x7fdf, 0x837b, 0x8b2b, 0x8cca, 0x8d64, 0x8de1, - 0x8e5f, 0x8fea, 0x8ff9, 0x9069, 0x93d1, 0x4f43, 0x4f7a, 0x50b3, 0x5168, - 0x5178, 0x524d, 0x526a, 0x5861, 0x587c, 0x5960, 0x5c08, 0x5c55, 0x5edb, - 0x609b, 0x6230, 0x6813, 0x6bbf, 0x6c08, 0x6fb1, 0x714e, 0x7420, 0x7530, - 0x7538, 0x7551, 0x7672, 0x7b4c, 0x7b8b, 0x7bad, 0x7bc6, 0x7e8f, 0x8a6e, - 0x8f3e, 0x8f49, 0x923f, 0x9293, 0x9322, 0x942b, 0x96fb, 0x985a, 0x986b, - 0x991e, 0x5207, 0x622a, 0x6298, 0x6d59, 0x7664, 0x7aca, 0x7bc0, 0x7d76, - 0x5360, 0x5cbe, 0x5e97, 0x6f38, 0x70b9, 0x7c98, 0x9711, 0x9b8e, 0x9ede, - 0x63a5, 0x647a, 0x8776, 0x4e01, 0x4e95, 0x4ead, 0x505c, 0x5075, 0x5448, - 0x59c3, 0x5b9a, 0x5e40, 0x5ead, 0x5ef7, 0x5f81, 0x60c5, 0x633a, 0x653f, - 0x6574, 0x65cc, 0x6676, 0x6678, 0x67fe, 0x6968, 0x6a89, 0x6b63, 0x6c40, - 0x6dc0, 0x6de8, 0x6e1f, 0x6e5e, 0x701e, 0x70a1, 0x738e, 0x73fd, 0x753a, - 0x775b, 0x7887, 0x798e, 0x7a0b, 0x7a7d, 0x7cbe, 0x7d8e, 0x8247, 0x8a02, - 0x8aea, 0x8c9e, 0x912d, 0x914a, 0x91d8, 0x9266, 0x92cc, 0x9320, 0x9706, - 0x9756, 0x975c, 0x9802, 0x9f0e, 0x5236, 0x5291, 0x557c, 0x5824, 0x5e1d, - 0x5f1f, 0x608c, 0x63d0, 0x68af, 0x6fdf, 0x796d, 0x7b2c, 0x81cd, 0x85ba, - 0x88fd, 0x8af8, 0x8e44, 0x918d, 0x9664, 0x969b, 0x973d, 0x984c, 0x9f4a, - 0x4fce, 0x5146, 0x51cb, 0x52a9, 0x5632, 0x5f14, 0x5f6b, 0x63aa, 0x64cd, - 0x65e9, 0x6641, 0x66fa, 0x66f9, 0x671d, 0x689d, 0x68d7, 0x69fd, 0x6f15, - 0x6f6e, 0x7167, 0x71e5, 0x722a, 0x74aa, 0x773a, 0x7956, 0x795a, 0x79df, - 0x7a20, 0x7a95, 0x7c97, 0x7cdf, 0x7d44, 0x7e70, 0x8087, 0x85fb, 0x86a4, - 0x8a54, 0x8abf, 0x8d99, 0x8e81, 0x9020, 0x906d, 0x91e3, 0x963b, 0x96d5, - 0x9ce5, 0x65cf, 0x7c07, 0x8db3, 0x93c3, 0x5b58, 0x5c0a, 0x5352, 0x62d9, - 0x731d, 0x5027, 0x5b97, 0x5f9e, 0x60b0, 0x616b, 0x68d5, 0x6dd9, 0x742e, - 0x7a2e, 0x7d42, 0x7d9c, 0x7e31, 0x816b, 0x8e2a, 0x8e35, 0x937e, 0x9418, - 0x4f50, 0x5750, 0x5de6, 0x5ea7, 0x632b, 0x7f6a, 0x4e3b, 0x4f4f, 0x4f8f, - 0x505a, 0x59dd, 0x80c4, 0x546a, 0x5468, 0x55fe, 0x594f, 0x5b99, 0x5dde, - 0x5eda, 0x665d, 0x6731, 0x67f1, 0x682a, 0x6ce8, 0x6d32, 0x6e4a, 0x6f8d, - 0x70b7, 0x73e0, 0x7587, 0x7c4c, 0x7d02, 0x7d2c, 0x7da2, 0x821f, 0x86db, - 0x8a3b, 0x8a85, 0x8d70, 0x8e8a, 0x8f33, 0x9031, 0x914e, 0x9152, 0x9444, - 0x99d0, 0x7af9, 0x7ca5, 0x4fca, 0x5101, 0x51c6, 0x57c8, 0x5bef, 0x5cfb, - 0x6659, 0x6a3d, 0x6d5a, 0x6e96, 0x6fec, 0x710c, 0x756f, 0x7ae3, 0x8822, - 0x9021, 0x9075, 0x96cb, 0x99ff, 0x8301, 0x4e2d, 0x4ef2, 0x8846, 0x91cd, - 0x537d, 0x6adb, 0x696b, 0x6c41, 0x847a, 0x589e, 0x618e, 0x66fe, 0x62ef, - 0x70dd, 0x7511, 0x75c7, 0x7e52, 0x84b8, 0x8b49, 0x8d08, 0x4e4b, 0x53ea, - 0x54ab, 0x5730, 0x5740, 0x5fd7, 0x6301, 0x6307, 0x646f, 0x652f, 0x65e8, - 0x667a, 0x679d, 0x67b3, 0x6b62, 0x6c60, 0x6c9a, 0x6f2c, 0x77e5, 0x7825, - 0x7949, 0x7957, 0x7d19, 0x80a2, 0x8102, 0x81f3, 0x829d, 0x82b7, 0x8718, - 0x8a8c, 0xf9fc, 0x8d04, 0x8dbe, 0x9072, 0x76f4, 0x7a19, 0x7a37, 0x7e54, - 0x8077, 0x5507, 0x55d4, 0x5875, 0x632f, 0x6422, 0x6649, 0x664b, 0x686d, - 0x699b, 0x6b84, 0x6d25, 0x6eb1, 0x73cd, 0x7468, 0x74a1, 0x755b, 0x75b9, - 0x76e1, 0x771e, 0x778b, 0x79e6, 0x7e09, 0x7e1d, 0x81fb, 0x852f, 0x8897, - 0x8a3a, 0x8cd1, 0x8eeb, 0x8fb0, 0x9032, 0x93ad, 0x9663, 0x9673, 0x9707, - 0x4f84, 0x53f1, 0x59ea, 0x5ac9, 0x5e19, 0x684e, 0x74c6, 0x75be, 0x79e9, - 0x7a92, 0x81a3, 0x86ed, 0x8cea, 0x8dcc, 0x8fed, 0x659f, 0x6715, 0xf9fd, - 0x57f7, 0x6f57, 0x7ddd, 0x8f2f, 0x93f6, 0x96c6, 0x5fb5, 0x61f2, 0x6f84, - 0x4e14, 0x4f98, 0x501f, 0x53c9, 0x55df, 0x5d6f, 0x5dee, 0x6b21, 0x6b64, - 0x78cb, 0x7b9a, 0xf9fe, 0x8e49, 0x8eca, 0x906e, 0x6349, 0x643e, 0x7740, - 0x7a84, 0x932f, 0x947f, 0x9f6a, 0x64b0, 0x6faf, 0x71e6, 0x74a8, 0x74da, - 0x7ac4, 0x7c12, 0x7e82, 0x7cb2, 0x7e98, 0x8b9a, 0x8d0a, 0x947d, 0x9910, - 0x994c, 0x5239, 0x5bdf, 0x64e6, 0x672d, 0x7d2e, 0x50ed, 0x53c3, 0x5879, - 0x6158, 0x6159, 0x61fa, 0x65ac, 0x7ad9, 0x8b92, 0x8b96, 0x5009, 0x5021, - 0x5275, 0x5531, 0x5a3c, 0x5ee0, 0x5f70, 0x6134, 0x655e, 0x660c, 0x6636, - 0x66a2, 0x69cd, 0x6ec4, 0x6f32, 0x7316, 0x7621, 0x7a93, 0x8139, 0x8259, - 0x83d6, 0x84bc, 0x50b5, 0x57f0, 0x5bc0, 0x5be8, 0x5f69, 0x63a1, 0x7826, - 0x7db5, 0x83dc, 0x8521, 0x91c7, 0x91f5, 0x518a, 0x67f5, 0x7b56, 0x8cac, - 0x51c4, 0x59bb, 0x60bd, 0x8655, 0x501c, 0xf9ff, 0x5254, 0x5c3a, 0x617d, - 0x621a, 0x62d3, 0x64f2, 0x65a5, 0x6ecc, 0x7620, 0x810a, 0x8e60, 0x965f, - 0x96bb, 0x4edf, 0x5343, 0x5598, 0x5929, 0x5ddd, 0x64c5, 0x6cc9, 0x6dfa, - 0x7394, 0x7a7f, 0x821b, 0x85a6, 0x8ce4, 0x8e10, 0x9077, 0x91e7, 0x95e1, - 0x9621, 0x97c6, 0x51f8, 0x54f2, 0x5586, 0x5fb9, 0x64a4, 0x6f88, 0x7db4, - 0x8f1f, 0x8f4d, 0x9435, 0x50c9, 0x5c16, 0x6cbe, 0x6dfb, 0x751b, 0x77bb, - 0x7c3d, 0x7c64, 0x8a79, 0x8ac2, 0x581e, 0x59be, 0x5e16, 0x6377, 0x7252, - 0x758a, 0x776b, 0x8adc, 0x8cbc, 0x8f12, 0x5ef3, 0x6674, 0x6df8, 0x807d, - 0x83c1, 0x8acb, 0x9751, 0x9bd6, 0xfa00, 0x5243, 0x66ff, 0x6d95, 0x6eef, - 0x7de0, 0x8ae6, 0x902e, 0x905e, 0x9ad4, 0x521d, 0x527f, 0x54e8, 0x6194, - 0x6284, 0x62db, 0x68a2, 0x6912, 0x695a, 0x6a35, 0x7092, 0x7126, 0x785d, - 0x7901, 0x790e, 0x79d2, 0x7a0d, 0x8096, 0x8278, 0x82d5, 0x8349, 0x8549, - 0x8c82, 0x8d85, 0x9162, 0x918b, 0x91ae, 0x4fc3, 0x56d1, 0x71ed, 0x77d7, - 0x8700, 0x89f8, 0x5bf8, 0x5fd6, 0x6751, 0x90a8, 0x53e2, 0x585a, 0x5bf5, - 0x60a4, 0x6181, 0x6460, 0x7e3d, 0x8070, 0x8525, 0x9283, 0x64ae, 0x50ac, - 0x5d14, 0x6700, 0x589c, 0x62bd, 0x63a8, 0x690e, 0x6978, 0x6a1e, 0x6e6b, - 0x76ba, 0x79cb, 0x82bb, 0x8429, 0x8acf, 0x8da8, 0x8ffd, 0x9112, 0x914b, - 0x919c, 0x9310, 0x9318, 0x939a, 0x96db, 0x9a36, 0x9c0d, 0x4e11, 0x755c, - 0x795d, 0x7afa, 0x7b51, 0x7bc9, 0x7e2e, 0x84c4, 0x8e59, 0x8e74, 0x8ef8, - 0x9010, 0x6625, 0x693f, 0x7443, 0x51fa, 0x672e, 0x9edc, 0x5145, 0x5fe0, - 0x6c96, 0x87f2, 0x885d, 0x8877, 0x60b4, 0x81b5, 0x8403, 0x8d05, 0x53d6, - 0x5439, 0x5634, 0x5a36, 0x5c31, 0x708a, 0x7fe0, 0x805a, 0x8106, 0x81ed, - 0x8da3, 0x9189, 0x9a5f, 0x9df2, 0x5074, 0x4ec4, 0x53a0, 0x60fb, 0x6e2c, - 0x5c64, 0x4f88, 0x5024, 0x55e4, 0x5cd9, 0x5e5f, 0x6065, 0x6894, 0x6cbb, - 0x6dc4, 0x71be, 0x75d4, 0x75f4, 0x7661, 0x7a1a, 0x7a49, 0x7dc7, 0x7dfb, - 0x7f6e, 0x81f4, 0x86a9, 0x8f1c, 0x96c9, 0x99b3, 0x9f52, 0x5247, 0x52c5, - 0x98ed, 0x89aa, 0x4e03, 0x67d2, 0x6f06, 0x4fb5, 0x5be2, 0x6795, 0x6c88, - 0x6d78, 0x741b, 0x7827, 0x91dd, 0x937c, 0x87c4, 0x79e4, 0x7a31, 0x5feb, - 0x4ed6, 0x54a4, 0x553e, 0x58ae, 0x59a5, 0x60f0, 0x6253, 0x62d6, 0x6736, - 0x6955, 0x8235, 0x9640, 0x99b1, 0x99dd, 0x502c, 0x5353, 0x5544, 0x577c, - 0xfa01, 0x6258, 0xfa02, 0x64e2, 0x666b, 0x67dd, 0x6fc1, 0x6fef, 0x7422, - 0x7438, 0x8a17, 0x9438, 0x5451, 0x5606, 0x5766, 0x5f48, 0x619a, 0x6b4e, - 0x7058, 0x70ad, 0x7dbb, 0x8a95, 0x596a, 0x812b, 0x63a2, 0x7708, 0x803d, - 0x8caa, 0x5854, 0x642d, 0x69bb, 0x5b95, 0x5e11, 0x6e6f, 0xfa03, 0x8569, - 0x514c, 0x53f0, 0x592a, 0x6020, 0x614b, 0x6b86, 0x6c70, 0x6cf0, 0x7b1e, - 0x80ce, 0x82d4, 0x8dc6, 0x90b0, 0x98b1, 0xfa04, 0x64c7, 0x6fa4, 0x6491, - 0x6504, 0x514e, 0x5410, 0x571f, 0x8a0e, 0x615f, 0x6876, 0xfa05, 0x75db, - 0x7b52, 0x7d71, 0x901a, 0x5806, 0x69cc, 0x817f, 0x892a, 0x9000, 0x9839, - 0x5078, 0x5957, 0x59ac, 0x6295, 0x900f, 0x9b2a, 0x615d, 0x7279, 0x95d6, - 0x5761, 0x5a46, 0x5df4, 0x628a, 0x64ad, 0x64fa, 0x6777, 0x6ce2, 0x6d3e, - 0x722c, 0x7436, 0x7834, 0x7f77, 0x82ad, 0x8ddb, 0x9817, 0x5224, 0x5742, - 0x677f, 0x7248, 0x74e3, 0x8ca9, 0x8fa6, 0x9211, 0x962a, 0x516b, 0x53ed, - 0x634c, 0x4f69, 0x5504, 0x6096, 0x6557, 0x6c9b, 0x6d7f, 0x724c, 0x72fd, - 0x7a17, 0x8987, 0x8c9d, 0x5f6d, 0x6f8e, 0x70f9, 0x81a8, 0x610e, 0x4fbf, - 0x504f, 0x6241, 0x7247, 0x7bc7, 0x7de8, 0x7fe9, 0x904d, 0x97ad, 0x9a19, - 0x8cb6, 0x576a, 0x5e73, 0x67b0, 0x840d, 0x8a55, 0x5420, 0x5b16, 0x5e63, - 0x5ee2, 0x5f0a, 0x6583, 0x80ba, 0x853d, 0x9589, 0x965b, 0x4f48, 0x5305, - 0x530d, 0x530f, 0x5486, 0x54fa, 0x5703, 0x5e03, 0x6016, 0x629b, 0x62b1, - 0x6355, 0xfa06, 0x6ce1, 0x6d66, 0x75b1, 0x7832, 0x80de, 0x812f, 0x82de, - 0x8461, 0x84b2, 0x888d, 0x8912, 0x900b, 0x92ea, 0x98fd, 0x9b91, 0x5e45, - 0x66b4, 0x66dd, 0x7011, 0x7206, 0xfa07, 0x4ff5, 0x527d, 0x5f6a, 0x6153, - 0x6753, 0x6a19, 0x6f02, 0x74e2, 0x7968, 0x8868, 0x8c79, 0x98c7, 0x98c4, - 0x9a43, 0x54c1, 0x7a1f, 0x6953, 0x8af7, 0x8c4a, 0x98a8, 0x99ae, 0x5f7c, - 0x62ab, 0x75b2, 0x76ae, 0x88ab, 0x907f, 0x9642, 0x5339, 0x5f3c, 0x5fc5, - 0x6ccc, 0x73cc, 0x7562, 0x758b, 0x7b46, 0x82fe, 0x999d, 0x4e4f, 0x903c, - 0x4e0b, 0x4f55, 0x53a6, 0x590f, 0x5ec8, 0x6630, 0x6cb3, 0x7455, 0x8377, - 0x8766, 0x8cc0, 0x9050, 0x971e, 0x9c15, 0x58d1, 0x5b78, 0x8650, 0x8b14, - 0x9db4, 0x5bd2, 0x6068, 0x608d, 0x65f1, 0x6c57, 0x6f22, 0x6fa3, 0x701a, - 0x7f55, 0x7ff0, 0x9591, 0x9592, 0x9650, 0x97d3, 0x5272, 0x8f44, 0x51fd, - 0x542b, 0x54b8, 0x5563, 0x558a, 0x6abb, 0x6db5, 0x7dd8, 0x8266, 0x929c, - 0x9677, 0x9e79, 0x5408, 0x54c8, 0x76d2, 0x86e4, 0x95a4, 0x95d4, 0x965c, - 0x4ea2, 0x4f09, 0x59ee, 0x5ae6, 0x5df7, 0x6052, 0x6297, 0x676d, 0x6841, - 0x6c86, 0x6e2f, 0x7f38, 0x809b, 0x822a, 0xfa08, 0xfa09, 0x9805, 0x4ea5, - 0x5055, 0x54b3, 0x5793, 0x595a, 0x5b69, 0x5bb3, 0x61c8, 0x6977, 0x6d77, - 0x7023, 0x87f9, 0x89e3, 0x8a72, 0x8ae7, 0x9082, 0x99ed, 0x9ab8, 0x52be, - 0x6838, 0x5016, 0x5e78, 0x674f, 0x8347, 0x884c, 0x4eab, 0x5411, 0x56ae, - 0x73e6, 0x9115, 0x97ff, 0x9909, 0x9957, 0x9999, 0x5653, 0x589f, 0x865b, - 0x8a31, 0x61b2, 0x6af6, 0x737b, 0x8ed2, 0x6b47, 0x96aa, 0x9a57, 0x5955, - 0x7200, 0x8d6b, 0x9769, 0x4fd4, 0x5cf4, 0x5f26, 0x61f8, 0x665b, 0x6ceb, - 0x70ab, 0x7384, 0x73b9, 0x73fe, 0x7729, 0x774d, 0x7d43, 0x7d62, 0x7e23, - 0x8237, 0x8852, 0xfa0a, 0x8ce2, 0x9249, 0x986f, 0x5b51, 0x7a74, 0x8840, - 0x9801, 0x5acc, 0x4fe0, 0x5354, 0x593e, 0x5cfd, 0x633e, 0x6d79, 0x72f9, - 0x8105, 0x8107, 0x83a2, 0x92cf, 0x9830, 0x4ea8, 0x5144, 0x5211, 0x578b, - 0x5f62, 0x6cc2, 0x6ece, 0x7005, 0x7050, 0x70af, 0x7192, 0x73e9, 0x7469, - 0x834a, 0x87a2, 0x8861, 0x9008, 0x90a2, 0x93a3, 0x99a8, 0x516e, 0x5f57, - 0x60e0, 0x6167, 0x66b3, 0x8559, 0x8e4a, 0x91af, 0x978b, 0x4e4e, 0x4e92, - 0x547c, 0x58d5, 0x58fa, 0x597d, 0x5cb5, 0x5f27, 0x6236, 0x6248, 0x660a, - 0x6667, 0x6beb, 0x6d69, 0x6dcf, 0x6e56, 0x6ef8, 0x6f94, 0x6fe0, 0x6fe9, - 0x705d, 0x72d0, 0x7425, 0x745a, 0x74e0, 0x7693, 0x795c, 0x7cca, 0x7e1e, - 0x80e1, 0x82a6, 0x846b, 0x84bf, 0x864e, 0x865f, 0x8774, 0x8b77, 0x8c6a, - 0x93ac, 0x9800, 0x9865, 0x60d1, 0x6216, 0x9177, 0x5a5a, 0x660f, 0x6df7, - 0x6e3e, 0x743f, 0x9b42, 0x5ffd, 0x60da, 0x7b0f, 0x54c4, 0x5f18, 0x6c5e, - 0x6cd3, 0x6d2a, 0x70d8, 0x7d05, 0x8679, 0x8a0c, 0x9d3b, 0x5316, 0x548c, - 0x5b05, 0x6a3a, 0x706b, 0x7575, 0x798d, 0x79be, 0x82b1, 0x83ef, 0x8a71, - 0x8b41, 0x8ca8, 0x9774, 0xfa0b, 0x64f4, 0x652b, 0x78ba, 0x78bb, 0x7a6b, - 0x4e38, 0x559a, 0x5950, 0x5ba6, 0x5e7b, 0x60a3, 0x63db, 0x6b61, 0x6665, - 0x6853, 0x6e19, 0x7165, 0x74b0, 0x7d08, 0x9084, 0x9a69, 0x9c25, 0x6d3b, - 0x6ed1, 0x733e, 0x8c41, 0x95ca, 0x51f0, 0x5e4c, 0x5fa8, 0x604d, 0x60f6, - 0x6130, 0x614c, 0x6643, 0x6644, 0x69a5, 0x6cc1, 0x6e5f, 0x6ec9, 0x6f62, - 0x714c, 0x749c, 0x7687, 0x7bc1, 0x7c27, 0x8352, 0x8757, 0x9051, 0x968d, - 0x9ec3, 0x532f, 0x56de, 0x5efb, 0x5f8a, 0x6062, 0x6094, 0x61f7, 0x6666, - 0x6703, 0x6a9c, 0x6dee, 0x6fae, 0x7070, 0x736a, 0x7e6a, 0x81be, 0x8334, - 0x86d4, 0x8aa8, 0x8cc4, 0x5283, 0x7372, 0x5b96, 0x6a6b, 0x9404, 0x54ee, - 0x5686, 0x5b5d, 0x6548, 0x6585, 0x66c9, 0x689f, 0x6d8d, 0x6dc6, 0x723b, - 0x80b4, 0x9175, 0x9a4d, 0x4faf, 0x5019, 0x539a, 0x540e, 0x543c, 0x5589, - 0x55c5, 0x5e3f, 0x5f8c, 0x673d, 0x7166, 0x73dd, 0x9005, 0x52db, 0x52f3, - 0x5864, 0x58ce, 0x7104, 0x718f, 0x71fb, 0x85b0, 0x8a13, 0x6688, 0x85a8, - 0x55a7, 0x6684, 0x714a, 0x8431, 0x5349, 0x5599, 0x6bc1, 0x5f59, 0x5fbd, - 0x63ee, 0x6689, 0x7147, 0x8af1, 0x8f1d, 0x9ebe, 0x4f11, 0x643a, 0x70cb, - 0x7566, 0x8667, 0x6064, 0x8b4e, 0x9df8, 0x5147, 0x51f6, 0x5308, 0x6d36, - 0x80f8, 0x9ed1, 0x6615, 0x6b23, 0x7098, 0x75d5, 0x5403, 0x5c79, 0x7d07, - 0x8a16, 0x6b20, 0x6b3d, 0x6b46, 0x5438, 0x6070, 0x6d3d, 0x7fd5, 0x8208, - 0x50d6, 0x51de, 0x559c, 0x566b, 0x56cd, 0x59ec, 0x5b09, 0x5e0c, 0x6199, - 0x6198, 0x6231, 0x665e, 0x66e6, 0x7199, 0x71b9, 0x71ba, 0x72a7, 0x79a7, - 0x7a00, 0x7fb2, 0x8a70, + 0x3000, 0x3001, 0x3002, 0x00b7, 0x2025, 0x2026, 0x00a8, 0x3003, 0x00ad, + 0x2015, 0x2225, 0xff3c, 0x223c, 0x2018, 0x2019, 0x201c, 0x201d, 0x3014, + 0x3015, 0x3008, 0x3009, 0x300a, 0x300b, 0x300c, 0x300d, 0x300e, 0x300f, + 0x3010, 0x3011, 0x00b1, 0x00d7, 0x00f7, 0x2260, 0x2264, 0x2265, 0x221e, + 0x2234, 0x00b0, 0x2032, 0x2033, 0x2103, 0x212b, 0xffe0, 0xffe1, 0xffe5, + 0x2642, 0x2640, 0x2220, 0x22a5, 0x2312, 0x2202, 0x2207, 0x2261, 0x2252, + 0x00a7, 0x203b, 0x2606, 0x2605, 0x25cb, 0x25cf, 0x25ce, 0x25c7, 0x25c6, + 0x25a1, 0x25a0, 0x25b3, 0x25b2, 0x25bd, 0x25bc, 0x2192, 0x2190, 0x2191, + 0x2193, 0x2194, 0x3013, 0x226a, 0x226b, 0x221a, 0x223d, 0x221d, 0x2235, + 0x222b, 0x222c, 0x2208, 0x220b, 0x2286, 0x2287, 0x2282, 0x2283, 0x222a, + 0x2229, 0x2227, 0x2228, 0xffe2, 0x21d2, 0x21d4, 0x2200, 0x2203, 0x00b4, + 0xff5e, 0x02c7, 0x02d8, 0x02dd, 0x02da, 0x02d9, 0x00b8, 0x02db, 0x00a1, + 0x00bf, 0x02d0, 0x222e, 0x2211, 0x220f, 0x00a4, 0x2109, 0x2030, 0x25c1, + 0x25c0, 0x25b7, 0x25b6, 0x2664, 0x2660, 0x2661, 0x2665, 0x2667, 0x2663, + 0x25c9, 0x25c8, 0x25a3, 0x25d0, 0x25d1, 0x2592, 0x25a4, 0x25a5, 0x25a8, + 0x25a7, 0x25a6, 0x25a9, 0x2668, 0x260f, 0x260e, 0x261c, 0x261e, 0x00b6, + 0x2020, 0x2021, 0x2195, 0x2197, 0x2199, 0x2196, 0x2198, 0x266d, 0x2669, + 0x266a, 0x266c, 0x327f, 0x321c, 0x2116, 0x33c7, 0x2122, 0x33c2, 0x33d8, + 0x2121, -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, 0xff01, + 0xff02, 0xff03, 0xff04, 0xff05, 0xff06, 0xff07, 0xff08, 0xff09, 0xff0a, + 0xff0b, 0xff0c, 0xff0d, 0xff0e, 0xff0f, 0xff10, 0xff11, 0xff12, 0xff13, + 0xff14, 0xff15, 0xff16, 0xff17, 0xff18, 0xff19, 0xff1a, 0xff1b, 0xff1c, + 0xff1d, 0xff1e, 0xff1f, 0xff20, 0xff21, 0xff22, 0xff23, 0xff24, 0xff25, + 0xff26, 0xff27, 0xff28, 0xff29, 0xff2a, 0xff2b, 0xff2c, 0xff2d, 0xff2e, + 0xff2f, 0xff30, 0xff31, 0xff32, 0xff33, 0xff34, 0xff35, 0xff36, 0xff37, + 0xff38, 0xff39, 0xff3a, 0xff3b, 0xffe6, 0xff3d, 0xff3e, 0xff3f, 0xff40, + 0xff41, 0xff42, 0xff43, 0xff44, 0xff45, 0xff46, 0xff47, 0xff48, 0xff49, + 0xff4a, 0xff4b, 0xff4c, 0xff4d, 0xff4e, 0xff4f, 0xff50, 0xff51, 0xff52, + 0xff53, 0xff54, 0xff55, 0xff56, 0xff57, 0xff58, 0xff59, 0xff5a, 0xff5b, + 0xff5c, 0xff5d, 0xffe3, 0x3131, 0x3132, 0x3133, 0x3134, 0x3135, 0x3136, + 0x3137, 0x3138, 0x3139, 0x313a, 0x313b, 0x313c, 0x313d, 0x313e, 0x313f, + 0x3140, 0x3141, 0x3142, 0x3143, 0x3144, 0x3145, 0x3146, 0x3147, 0x3148, + 0x3149, 0x314a, 0x314b, 0x314c, 0x314d, 0x314e, 0x314f, 0x3150, 0x3151, + 0x3152, 0x3153, 0x3154, 0x3155, 0x3156, 0x3157, 0x3158, 0x3159, 0x315a, + 0x315b, 0x315c, 0x315d, 0x315e, 0x315f, 0x3160, 0x3161, 0x3162, 0x3163, + 0x3164, 0x3165, 0x3166, 0x3167, 0x3168, 0x3169, 0x316a, 0x316b, 0x316c, + 0x316d, 0x316e, 0x316f, 0x3170, 0x3171, 0x3172, 0x3173, 0x3174, 0x3175, + 0x3176, 0x3177, 0x3178, 0x3179, 0x317a, 0x317b, 0x317c, 0x317d, 0x317e, + 0x317f, 0x3180, 0x3181, 0x3182, 0x3183, 0x3184, 0x3185, 0x3186, 0x3187, + 0x3188, 0x3189, 0x318a, 0x318b, 0x318c, 0x318d, 0x318e, 0x2170, 0x2171, + 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, -1, + -1, -1, -1, -1, 0x2160, 0x2161, 0x2162, 0x2163, 0x2164, + 0x2165, 0x2166, 0x2167, 0x2168, 0x2169, -1, -1, -1, -1, + -1, -1, -1, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, + 0x0397, 0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, + 0x03a0, 0x03a1, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7, 0x03a8, 0x03a9, + -1, -1, -1, -1, -1, -1, -1, -1, 0x03b1, + 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, 0x03b8, 0x03b9, 0x03ba, + 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, 0x03c0, 0x03c1, 0x03c3, 0x03c4, + 0x03c5, 0x03c6, 0x03c7, 0x03c8, 0x03c9, -1, -1, -1, -1, + -1, -1, 0x2500, 0x2502, 0x250c, 0x2510, 0x2518, 0x2514, 0x251c, + 0x252c, 0x2524, 0x2534, 0x253c, 0x2501, 0x2503, 0x250f, 0x2513, 0x251b, + 0x2517, 0x2523, 0x2533, 0x252b, 0x253b, 0x254b, 0x2520, 0x252f, 0x2528, + 0x2537, 0x253f, 0x251d, 0x2530, 0x2525, 0x2538, 0x2542, 0x2512, 0x2511, + 0x251a, 0x2519, 0x2516, 0x2515, 0x250e, 0x250d, 0x251e, 0x251f, 0x2521, + 0x2522, 0x2526, 0x2527, 0x2529, 0x252a, 0x252d, 0x252e, 0x2531, 0x2532, + 0x2535, 0x2536, 0x2539, 0x253a, 0x253d, 0x253e, 0x2540, 0x2541, 0x2543, + 0x2544, 0x2545, 0x2546, 0x2547, 0x2548, 0x2549, 0x254a, -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, 0x3395, 0x3396, 0x3397, + 0x2113, 0x3398, 0x33c4, 0x33a3, 0x33a4, 0x33a5, 0x33a6, 0x3399, 0x339a, + 0x339b, 0x339c, 0x339d, 0x339e, 0x339f, 0x33a0, 0x33a1, 0x33a2, 0x33ca, + 0x338d, 0x338e, 0x338f, 0x33cf, 0x3388, 0x3389, 0x33c8, 0x33a7, 0x33a8, + 0x33b0, 0x33b1, 0x33b2, 0x33b3, 0x33b4, 0x33b5, 0x33b6, 0x33b7, 0x33b8, + 0x33b9, 0x3380, 0x3381, 0x3382, 0x3383, 0x3384, 0x33ba, 0x33bb, 0x33bc, + 0x33bd, 0x33be, 0x33bf, 0x3390, 0x3391, 0x3392, 0x3393, 0x3394, 0x2126, + 0x33c0, 0x33c1, 0x338a, 0x338b, 0x338c, 0x33d6, 0x33c5, 0x33ad, 0x33ae, + 0x33af, 0x33db, 0x33a9, 0x33aa, 0x33ab, 0x33ac, 0x33dd, 0x33d0, 0x33d3, + 0x33c3, 0x33c9, 0x33dc, 0x33c6, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 0x00c6, 0x00d0, 0x00aa, 0x0126, -1, 0x0132, -1, 0x013f, + 0x0141, 0x00d8, 0x0152, 0x00ba, 0x00de, 0x0166, 0x014a, -1, 0x3260, + 0x3261, 0x3262, 0x3263, 0x3264, 0x3265, 0x3266, 0x3267, 0x3268, 0x3269, + 0x326a, 0x326b, 0x326c, 0x326d, 0x326e, 0x326f, 0x3270, 0x3271, 0x3272, + 0x3273, 0x3274, 0x3275, 0x3276, 0x3277, 0x3278, 0x3279, 0x327a, 0x327b, + 0x24d0, 0x24d1, 0x24d2, 0x24d3, 0x24d4, 0x24d5, 0x24d6, 0x24d7, 0x24d8, + 0x24d9, 0x24da, 0x24db, 0x24dc, 0x24dd, 0x24de, 0x24df, 0x24e0, 0x24e1, + 0x24e2, 0x24e3, 0x24e4, 0x24e5, 0x24e6, 0x24e7, 0x24e8, 0x24e9, 0x2460, + 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467, 0x2468, 0x2469, + 0x246a, 0x246b, 0x246c, 0x246d, 0x246e, 0x00bd, 0x2153, 0x2154, 0x00bc, + 0x00be, 0x215b, 0x215c, 0x215d, 0x215e, 0x00e6, 0x0111, 0x00f0, 0x0127, + 0x0131, 0x0133, 0x0138, 0x0140, 0x0142, 0x00f8, 0x0153, 0x00df, 0x00fe, + 0x0167, 0x014b, 0x0149, 0x3200, 0x3201, 0x3202, 0x3203, 0x3204, 0x3205, + 0x3206, 0x3207, 0x3208, 0x3209, 0x320a, 0x320b, 0x320c, 0x320d, 0x320e, + 0x320f, 0x3210, 0x3211, 0x3212, 0x3213, 0x3214, 0x3215, 0x3216, 0x3217, + 0x3218, 0x3219, 0x321a, 0x321b, 0x249c, 0x249d, 0x249e, 0x249f, 0x24a0, + 0x24a1, 0x24a2, 0x24a3, 0x24a4, 0x24a5, 0x24a6, 0x24a7, 0x24a8, 0x24a9, + 0x24aa, 0x24ab, 0x24ac, 0x24ad, 0x24ae, 0x24af, 0x24b0, 0x24b1, 0x24b2, + 0x24b3, 0x24b4, 0x24b5, 0x2474, 0x2475, 0x2476, 0x2477, 0x2478, 0x2479, + 0x247a, 0x247b, 0x247c, 0x247d, 0x247e, 0x247f, 0x2480, 0x2481, 0x2482, + 0x00b9, 0x00b2, 0x00b3, 0x2074, 0x207f, 0x2081, 0x2082, 0x2083, 0x2084, + 0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047, 0x3048, 0x3049, + 0x304a, 0x304b, 0x304c, 0x304d, 0x304e, 0x304f, 0x3050, 0x3051, 0x3052, + 0x3053, 0x3054, 0x3055, 0x3056, 0x3057, 0x3058, 0x3059, 0x305a, 0x305b, + 0x305c, 0x305d, 0x305e, 0x305f, 0x3060, 0x3061, 0x3062, 0x3063, 0x3064, + 0x3065, 0x3066, 0x3067, 0x3068, 0x3069, 0x306a, 0x306b, 0x306c, 0x306d, + 0x306e, 0x306f, 0x3070, 0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076, + 0x3077, 0x3078, 0x3079, 0x307a, 0x307b, 0x307c, 0x307d, 0x307e, 0x307f, + 0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087, 0x3088, + 0x3089, 0x308a, 0x308b, 0x308c, 0x308d, 0x308e, 0x308f, 0x3090, 0x3091, + 0x3092, 0x3093, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 0x30a1, 0x30a2, 0x30a3, 0x30a4, 0x30a5, + 0x30a6, 0x30a7, 0x30a8, 0x30a9, 0x30aa, 0x30ab, 0x30ac, 0x30ad, 0x30ae, + 0x30af, 0x30b0, 0x30b1, 0x30b2, 0x30b3, 0x30b4, 0x30b5, 0x30b6, 0x30b7, + 0x30b8, 0x30b9, 0x30ba, 0x30bb, 0x30bc, 0x30bd, 0x30be, 0x30bf, 0x30c0, + 0x30c1, 0x30c2, 0x30c3, 0x30c4, 0x30c5, 0x30c6, 0x30c7, 0x30c8, 0x30c9, + 0x30ca, 0x30cb, 0x30cc, 0x30cd, 0x30ce, 0x30cf, 0x30d0, 0x30d1, 0x30d2, + 0x30d3, 0x30d4, 0x30d5, 0x30d6, 0x30d7, 0x30d8, 0x30d9, 0x30da, 0x30db, + 0x30dc, 0x30dd, 0x30de, 0x30df, 0x30e0, 0x30e1, 0x30e2, 0x30e3, 0x30e4, + 0x30e5, 0x30e6, 0x30e7, 0x30e8, 0x30e9, 0x30ea, 0x30eb, 0x30ec, 0x30ed, + 0x30ee, 0x30ef, 0x30f0, 0x30f1, 0x30f2, 0x30f3, 0x30f4, 0x30f5, 0x30f6, + -1, -1, -1, -1, -1, -1, -1, -1, 0x0410, + 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401, 0x0416, 0x0417, 0x0418, + 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f, 0x0420, 0x0421, + 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042a, + 0x042b, 0x042c, 0x042d, 0x042e, 0x042f, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451, + 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, -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, -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, -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, -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, 0x3400, 0x3401, 0x3402, + 0x3403, 0x3404, 0x3405, 0x3406, 0x3407, 0x3408, 0x3409, 0x340a, 0x340b, + 0x340c, 0x340d, 0x340e, 0x340f, 0x3410, 0x3411, 0x3412, 0x3413, 0x3414, + 0x3415, 0x3416, 0x3417, 0x3418, 0x3419, 0x341a, 0x341b, 0x341c, 0x341d, + 0x341e, 0x341f, 0x3420, 0x3421, 0x3422, 0x3423, 0x3424, 0x3425, 0x3426, + 0x3427, 0x3428, 0x3429, 0x342a, 0x342b, 0x342c, 0x342d, 0x342e, 0x342f, + 0x3430, 0x3431, 0x3432, 0x3433, 0x3434, 0x3435, 0x3436, 0x3437, 0x3438, + 0x3439, 0x343a, 0x343b, 0x343c, 0x343d, 0x343e, 0x343f, 0x3440, 0x3441, + 0x3442, 0x3443, 0x3444, 0x3445, 0x3446, 0x3447, 0x3448, 0x3449, 0x344a, + 0x344b, 0x344c, 0x344d, 0x344e, 0x344f, 0x3450, 0x3451, 0x3452, 0x3453, + 0x3454, 0x3455, 0x3456, 0x3457, 0x3458, 0x3459, 0x345a, 0x345b, 0x345c, + 0x345d, 0x345e, 0x345f, 0x3460, 0x3461, 0x3462, 0x3463, 0x3464, 0x3465, + 0x3466, 0x3467, 0x3468, 0x3469, 0x346a, 0x346b, 0x346c, 0x346d, 0x346e, + 0x346f, 0x3470, 0x3471, 0x3472, 0x3473, 0x3474, 0x3475, 0x3476, 0x3477, + 0x3478, 0x3479, 0x347a, 0x347b, 0x347c, 0x347d, 0x347e, 0x347f, 0x3480, + 0x3481, 0x3482, 0x3483, 0x3484, 0x3485, 0x3486, 0x3487, 0x3488, 0x3489, + 0x348a, 0x348b, 0x348c, 0x348d, 0x348e, 0x348f, 0x3490, 0x3491, 0x3492, + 0x3493, 0x3494, 0x3495, 0x3496, 0x3497, 0x3498, 0x3499, 0x349a, 0x349b, + 0x349c, 0x349d, 0x349e, 0x349f, 0x34a0, 0x34a1, 0x34a2, 0x34a3, 0x34a4, + 0x34a5, 0x34a6, 0x34a7, 0x34a8, 0x34a9, 0x34aa, 0x34ab, 0x34ac, 0x34ad, + 0x34ae, 0x34af, 0x34b0, 0x34b1, 0x34b2, 0x34b3, 0x34b4, 0x34b5, 0x34b6, + 0x34b7, 0x34b8, 0x34b9, 0x34ba, 0x34bb, 0x34bc, 0x34bd, 0x34be, 0x34bf, + 0x34c0, 0x34c1, 0x34c2, 0x34c3, 0x34c4, 0x34c5, 0x34c6, 0x34c7, 0x34c8, + 0x34c9, 0x34ca, 0x34cb, 0x34cc, 0x34cd, 0x34ce, 0x34cf, 0x34d0, 0x34d1, + 0x34d2, 0x34d3, 0x34d4, 0x34d5, 0x34d6, 0x34d7, 0x34d8, 0x34d9, 0x34da, + 0x34db, 0x34dc, 0x34dd, 0x34de, 0x34df, 0x34e0, 0x34e1, 0x34e2, 0x34e3, + 0x34e4, 0x34e5, 0x34e6, 0x34e7, 0x34e8, 0x34e9, 0x34ea, 0x34eb, 0x34ec, + 0x34ed, 0x34ee, 0x34ef, 0x34f0, 0x34f1, 0x34f2, 0x34f3, 0x34f4, 0x34f5, + 0x34f6, 0x34f7, 0x34f8, 0x34f9, 0x34fa, 0x34fb, 0x34fc, 0x34fd, 0x34fe, + 0x34ff, 0x3500, 0x3501, 0x3502, 0x3503, 0x3504, 0x3505, 0x3506, 0x3507, + 0x3508, 0x3509, 0x350a, 0x350b, 0x350c, 0x350d, 0x350e, 0x350f, 0x3510, + 0x3511, 0x3512, 0x3513, 0x3514, 0x3515, 0x3516, 0x3517, 0x3518, 0x3519, + 0x351a, 0x351b, 0x351c, 0x351d, 0x351e, 0x351f, 0x3520, 0x3521, 0x3522, + 0x3523, 0x3524, 0x3525, 0x3526, 0x3527, 0x3528, 0x3529, 0x352a, 0x352b, + 0x352c, 0x352d, 0x352e, 0x352f, 0x3530, 0x3531, 0x3532, 0x3533, 0x3534, + 0x3535, 0x3536, 0x3537, 0x3538, 0x3539, 0x353a, 0x353b, 0x353c, 0x353d, + 0x353e, 0x353f, 0x3540, 0x3541, 0x3542, 0x3543, 0x3544, 0x3545, 0x3546, + 0x3547, 0x3548, 0x3549, 0x354a, 0x354b, 0x354c, 0x354d, 0x354e, 0x354f, + 0x3550, 0x3551, 0x3552, 0x3553, 0x3554, 0x3555, 0x3556, 0x3557, 0x3558, + 0x3559, 0x355a, 0x355b, 0x355c, 0x355d, 0x355e, 0x355f, 0x3560, 0x3561, + 0x3562, 0x3563, 0x3564, 0x3565, 0x3566, 0x3567, 0x3568, 0x3569, 0x356a, + 0x356b, 0x356c, 0x356d, 0x356e, 0x356f, 0x3570, 0x3571, 0x3572, 0x3573, + 0x3574, 0x3575, 0x3576, 0x3577, 0x3578, 0x3579, 0x357a, 0x357b, 0x357c, + 0x357d, 0x357e, 0x357f, 0x3580, 0x3581, 0x3582, 0x3583, 0x3584, 0x3585, + 0x3586, 0x3587, 0x3588, 0x3589, 0x358a, 0x358b, 0x358c, 0x358d, 0x358e, + 0x358f, 0x3590, 0x3591, 0x3592, 0x3593, 0x3594, 0x3595, 0x3596, 0x3597, + 0x3598, 0x3599, 0x359a, 0x359b, 0x359c, 0x359d, 0x359e, 0x359f, 0x35a0, + 0x35a1, 0x35a2, 0x35a3, 0x35a4, 0x35a5, 0x35a6, 0x35a7, 0x35a8, 0x35a9, + 0x35aa, 0x35ab, 0x35ac, 0x35ad, 0x35ae, 0x35af, 0x35b0, 0x35b1, 0x35b2, + 0x35b3, 0x35b4, 0x35b5, 0x35b6, 0x35b7, 0x35b8, 0x35b9, 0x35ba, 0x35bb, + 0x35bc, 0x35bd, 0x35be, 0x35bf, 0x35c0, 0x35c1, 0x35c2, 0x35c3, 0x35c4, + 0x35c5, 0x35c6, 0x35c7, 0x35c8, 0x35c9, 0x35ca, 0x35cb, 0x35cc, 0x35cd, + 0x35ce, 0x35cf, 0x35d0, 0x35d1, 0x35d2, 0x35d3, 0x35d4, 0x35d5, 0x35d6, + 0x35d7, 0x35d8, 0x35d9, 0x35da, 0x35db, 0x35dc, 0x35dd, 0x35de, 0x35df, + 0x35e0, 0x35e1, 0x35e2, 0x35e3, 0x35e4, 0x35e5, 0x35e6, 0x35e7, 0x35e8, + 0x35e9, 0x35ea, 0x35eb, 0x35ec, 0x35ed, 0x35ee, 0x35ef, 0x35f0, 0x35f1, + 0x35f2, 0x35f3, 0x35f4, 0x35f5, 0x35f6, 0x35f7, 0x35f8, 0x35f9, 0x35fa, + 0x35fb, 0x35fc, 0x35fd, 0x35fe, 0x35ff, 0x3600, 0x3601, 0x3602, 0x3603, + 0x3604, 0x3605, 0x3606, 0x3607, 0x3608, 0x3609, 0x360a, 0x360b, 0x360c, + 0x360d, 0x360e, 0x360f, 0x3610, 0x3611, 0x3612, 0x3613, 0x3614, 0x3615, + 0x3616, 0x3617, 0x3618, 0x3619, 0x361a, 0x361b, 0x361c, 0x361d, 0x361e, + 0x361f, 0x3620, 0x3621, 0x3622, 0x3623, 0x3624, 0x3625, 0x3626, 0x3627, + 0x3628, 0x3629, 0x362a, 0x362b, 0x362c, 0x362d, 0x362e, 0x362f, 0x3630, + 0x3631, 0x3632, 0x3633, 0x3634, 0x3635, 0x3636, 0x3637, 0x3638, 0x3639, + 0x363a, 0x363b, 0x363c, 0x363d, 0x363e, 0x363f, 0x3640, 0x3641, 0x3642, + 0x3643, 0x3644, 0x3645, 0x3646, 0x3647, 0x3648, 0x3649, 0x364a, 0x364b, + 0x364c, 0x364d, 0x364e, 0x364f, 0x3650, 0x3651, 0x3652, 0x3653, 0x3654, + 0x3655, 0x3656, 0x3657, 0x3658, 0x3659, 0x365a, 0x365b, 0x365c, 0x365d, + 0x365e, 0x365f, 0x3660, 0x3661, 0x3662, 0x3663, 0x3664, 0x3665, 0x3666, + 0x3667, 0x3668, 0x3669, 0x366a, 0x366b, 0x366c, 0x366d, 0x366e, 0x366f, + 0x3670, 0x3671, 0x3672, 0x3673, 0x3674, 0x3675, 0x3676, 0x3677, 0x3678, + 0x3679, 0x367a, 0x367b, 0x367c, 0x367d, 0x367e, 0x367f, 0x3680, 0x3681, + 0x3682, 0x3683, 0x3684, 0x3685, 0x3686, 0x3687, 0x3688, 0x3689, 0x368a, + 0x368b, 0x368c, 0x368d, 0x368e, 0x368f, 0x3690, 0x3691, 0x3692, 0x3693, + 0x3694, 0x3695, 0x3696, 0x3697, 0x3698, 0x3699, 0x369a, 0x369b, 0x369c, + 0x369d, 0x369e, 0x369f, 0x36a0, 0x36a1, 0x36a2, 0x36a3, 0x36a4, 0x36a5, + 0x36a6, 0x36a7, 0x36a8, 0x36a9, 0x36aa, 0x36ab, 0x36ac, 0x36ad, 0x36ae, + 0x36af, 0x36b0, 0x36b1, 0x36b2, 0x36b3, 0x36b4, 0x36b5, 0x36b6, 0x36b7, + 0x36b8, 0x36b9, 0x36ba, 0x36bb, 0x36bc, 0x36bd, 0x36be, 0x36bf, 0x36c0, + 0x36c1, 0x36c2, 0x36c3, 0x36c4, 0x36c5, 0x36c6, 0x36c7, 0x36c8, 0x36c9, + 0x36ca, 0x36cb, 0x36cc, 0x36cd, 0x36ce, 0x36cf, 0x36d0, 0x36d1, 0x36d2, + 0x36d3, 0x36d4, 0x36d5, 0x36d6, 0x36d7, 0x36d8, 0x36d9, 0x36da, 0x36db, + 0x36dc, 0x36dd, 0x36de, 0x36df, 0x36e0, 0x36e1, 0x36e2, 0x36e3, 0x36e4, + 0x36e5, 0x36e6, 0x36e7, 0x36e8, 0x36e9, 0x36ea, 0x36eb, 0x36ec, 0x36ed, + 0x36ee, 0x36ef, 0x36f0, 0x36f1, 0x36f2, 0x36f3, 0x36f4, 0x36f5, 0x36f6, + 0x36f7, 0x36f8, 0x36f9, 0x36fa, 0x36fb, 0x36fc, 0x36fd, 0x36fe, 0x36ff, + 0x3700, 0x3701, 0x3702, 0x3703, 0x3704, 0x3705, 0x3706, 0x3707, 0x3708, + 0x3709, 0x370a, 0x370b, 0x370c, 0x370d, 0x370e, 0x370f, 0x3710, 0x3711, + 0x3712, 0x3713, 0x3714, 0x3715, 0x3716, 0x3717, 0x3718, 0x3719, 0x371a, + 0x371b, 0x371c, 0x371d, 0x371e, 0x371f, 0x3720, 0x3721, 0x3722, 0x3723, + 0x3724, 0x3725, 0x3726, 0x3727, 0x3728, 0x3729, 0x372a, 0x372b, 0x372c, + 0x372d, 0x372e, 0x372f, 0x3730, 0x3731, 0x3732, 0x3733, 0x3734, 0x3735, + 0x3736, 0x3737, 0x3738, 0x3739, 0x373a, 0x373b, 0x373c, 0x373d, 0x373e, + 0x373f, 0x3740, 0x3741, 0x3742, 0x3743, 0x3744, 0x3745, 0x3746, 0x3747, + 0x3748, 0x3749, 0x374a, 0x374b, 0x374c, 0x374d, 0x374e, 0x374f, 0x3750, + 0x3751, 0x3752, 0x3753, 0x3754, 0x3755, 0x3756, 0x3757, 0x3758, 0x3759, + 0x375a, 0x375b, 0x375c, 0x375d, 0x375e, 0x375f, 0x3760, 0x3761, 0x3762, + 0x3763, 0x3764, 0x3765, 0x3766, 0x3767, 0x3768, 0x3769, 0x376a, 0x376b, + 0x376c, 0x376d, 0x376e, 0x376f, 0x3770, 0x3771, 0x3772, 0x3773, 0x3774, + 0x3775, 0x3776, 0x3777, 0x3778, 0x3779, 0x377a, 0x377b, 0x377c, 0x377d, + 0x377e, 0x377f, 0x3780, 0x3781, 0x3782, 0x3783, 0x3784, 0x3785, 0x3786, + 0x3787, 0x3788, 0x3789, 0x378a, 0x378b, 0x378c, 0x378d, 0x378e, 0x378f, + 0x3790, 0x3791, 0x3792, 0x3793, 0x3794, 0x3795, 0x3796, 0x3797, 0x3798, + 0x3799, 0x379a, 0x379b, 0x379c, 0x379d, 0x379e, 0x379f, 0x37a0, 0x37a1, + 0x37a2, 0x37a3, 0x37a4, 0x37a5, 0x37a6, 0x37a7, 0x37a8, 0x37a9, 0x37aa, + 0x37ab, 0x37ac, 0x37ad, 0x37ae, 0x37af, 0x37b0, 0x37b1, 0x37b2, 0x37b3, + 0x37b4, 0x37b5, 0x37b6, 0x37b7, 0x37b8, 0x37b9, 0x37ba, 0x37bb, 0x37bc, + 0x37bd, 0x37be, 0x37bf, 0x37c0, 0x37c1, 0x37c2, 0x37c3, 0x37c4, 0x37c5, + 0x37c6, 0x37c7, 0x37c8, 0x37c9, 0x37ca, 0x37cb, 0x37cc, 0x37cd, 0x37ce, + 0x37cf, 0x37d0, 0x37d1, 0x37d2, 0x37d3, 0x37d4, 0x37d5, 0x37d6, 0x37d7, + 0x37d8, 0x37d9, 0x37da, 0x37db, 0x37dc, 0x37dd, 0x37de, 0x37df, 0x37e0, + 0x37e1, 0x37e2, 0x37e3, 0x37e4, 0x37e5, 0x37e6, 0x37e7, 0x37e8, 0x37e9, + 0x37ea, 0x37eb, 0x37ec, 0x37ed, 0x37ee, 0x37ef, 0x37f0, 0x37f1, 0x37f2, + 0x37f3, 0x37f4, 0x37f5, 0x37f6, 0x37f7, 0x37f8, 0x37f9, 0x37fa, 0x37fb, + 0x37fc, 0x37fd, 0x37fe, 0x37ff, 0x3800, 0x3801, 0x3802, 0x3803, 0x3804, + 0x3805, 0x3806, 0x3807, 0x3808, 0x3809, 0x380a, 0x380b, 0x380c, 0x380d, + 0x380e, 0x380f, 0x3810, 0x3811, 0x3812, 0x3813, 0x3814, 0x3815, 0x3816, + 0x3817, 0x3818, 0x3819, 0x381a, 0x381b, 0x381c, 0x381d, 0x381e, 0x381f, + 0x3820, 0x3821, 0x3822, 0x3823, 0x3824, 0x3825, 0x3826, 0x3827, 0x3828, + 0x3829, 0x382a, 0x382b, 0x382c, 0x382d, 0x382e, 0x382f, 0x3830, 0x3831, + 0x3832, 0x3833, 0x3834, 0x3835, 0x3836, 0x3837, 0x3838, 0x3839, 0x383a, + 0x383b, 0x383c, 0x383d, 0x383e, 0x383f, 0x3840, 0x3841, 0x3842, 0x3843, + 0x3844, 0x3845, 0x3846, 0x3847, 0x3848, 0x3849, 0x384a, 0x384b, 0x384c, + 0x384d, 0x384e, 0x384f, 0x3850, 0x3851, 0x3852, 0x3853, 0x3854, 0x3855, + 0x3856, 0x3857, 0x3858, 0x3859, 0x385a, 0x385b, 0x385c, 0x385d, 0x385e, + 0x385f, 0x3860, 0x3861, 0x3862, 0x3863, 0x3864, 0x3865, 0x3866, 0x3867, + 0x3868, 0x3869, 0x386a, 0x386b, 0x386c, 0x386d, 0x386e, 0x386f, 0x3870, + 0x3871, 0x3872, 0x3873, 0x3874, 0x3875, 0x3876, 0x3877, 0x3878, 0x3879, + 0x387a, 0x387b, 0x387c, 0x387d, 0x387e, 0x387f, 0x3880, 0x3881, 0x3882, + 0x3883, 0x3884, 0x3885, 0x3886, 0x3887, 0x3888, 0x3889, 0x388a, 0x388b, + 0x388c, 0x388d, 0x388e, 0x388f, 0x3890, 0x3891, 0x3892, 0x3893, 0x3894, + 0x3895, 0x3896, 0x3897, 0x3898, 0x3899, 0x389a, 0x389b, 0x389c, 0x389d, + 0x389e, 0x389f, 0x38a0, 0x38a1, 0x38a2, 0x38a3, 0x38a4, 0x38a5, 0x38a6, + 0x38a7, 0x38a8, 0x38a9, 0x38aa, 0x38ab, 0x38ac, 0x38ad, 0x38ae, 0x38af, + 0x38b0, 0x38b1, 0x38b2, 0x38b3, 0x38b4, 0x38b5, 0x38b6, 0x38b7, 0x38b8, + 0x38b9, 0x38ba, 0x38bb, 0x38bc, 0x38bd, 0x38be, 0x38bf, 0x38c0, 0x38c1, + 0x38c2, 0x38c3, 0x38c4, 0x38c5, 0x38c6, 0x38c7, 0x38c8, 0x38c9, 0x38ca, + 0x38cb, 0x38cc, 0x38cd, 0x38ce, 0x38cf, 0x38d0, 0x38d1, 0x38d2, 0x38d3, + 0x38d4, 0x38d5, 0x38d6, 0x38d7, 0x38d8, 0x38d9, 0x38da, 0x38db, 0x38dc, + 0x38dd, 0x38de, 0x38df, 0x38e0, 0x38e1, 0x38e2, 0x38e3, 0x38e4, 0x38e5, + 0x38e6, 0x38e7, 0x38e8, 0x38e9, 0x38ea, 0x38eb, 0x38ec, 0x38ed, 0x38ee, + 0x38ef, 0x38f0, 0x38f1, 0x38f2, 0x38f3, 0x38f4, 0x38f5, 0x38f6, 0x38f7, + 0x38f8, 0x38f9, 0x38fa, 0x38fb, 0x38fc, 0x38fd, 0x38fe, 0x38ff, 0x3900, + 0x3901, 0x3902, 0x3903, 0x3904, 0x3905, 0x3906, 0x3907, 0x3908, 0x3909, + 0x390a, 0x390b, 0x390c, 0x390d, 0x390e, 0x390f, 0x3910, 0x3911, 0x3912, + 0x3913, 0x3914, 0x3915, 0x3916, 0x3917, 0x3918, 0x3919, 0x391a, 0x391b, + 0x391c, 0x391d, 0x391e, 0x391f, 0x3920, 0x3921, 0x3922, 0x3923, 0x3924, + 0x3925, 0x3926, 0x3927, 0x3928, 0x3929, 0x392a, 0x392b, 0x392c, 0x392d, + 0x392e, 0x392f, 0x3930, 0x3931, 0x3932, 0x3933, 0x3934, 0x3935, 0x3936, + 0x3937, 0x3938, 0x3939, 0x393a, 0x393b, 0x393c, 0x393d, 0x393e, 0x393f, + 0x3940, 0x3941, 0x3942, 0x3943, 0x3944, 0x3945, 0x3946, 0x3947, 0x3948, + 0x3949, 0x394a, 0x394b, 0x394c, 0x394d, 0x394e, 0x394f, 0x3950, 0x3951, + 0x3952, 0x3953, 0x3954, 0x3955, 0x3956, 0x3957, 0x3958, 0x3959, 0x395a, + 0x395b, 0x395c, 0x395d, 0x395e, 0x395f, 0x3960, 0x3961, 0x3962, 0x3963, + 0x3964, 0x3965, 0x3966, 0x3967, 0x3968, 0x3969, 0x396a, 0x396b, 0x396c, + 0x396d, 0x396e, 0x396f, 0x3970, 0x3971, 0x3972, 0x3973, 0x3974, 0x3975, + 0x3976, 0x3977, 0x3978, 0x3979, 0x397a, 0x397b, 0x397c, 0x397d, 0x397e, + 0x397f, 0x3980, 0x3981, 0x3982, 0x3983, 0x3984, 0x3985, 0x3986, 0x3987, + 0x3988, 0x3989, 0x398a, 0x398b, 0x398c, 0x398d, 0x398e, 0x398f, 0x3990, + 0x3991, 0x3992, 0x3993, 0x3994, 0x3995, 0x3996, 0x3997, 0x3998, 0x3999, + 0x399a, 0x399b, 0x399c, 0x399d, 0x399e, 0x399f, 0x39a0, 0x39a1, 0x39a2, + 0x39a3, 0x39a4, 0x39a5, 0x39a6, 0x39a7, 0x39a8, 0x39a9, 0x39aa, 0x39ab, + 0x39ac, 0x39ad, 0x39ae, 0x39af, 0x39b0, 0x39b1, 0x39b2, 0x39b3, 0x39b4, + 0x39b5, 0x39b6, 0x39b7, 0x39b8, 0x39b9, 0x39ba, 0x39bb, 0x39bc, 0x39bd, + 0x39be, 0x39bf, 0x39c0, 0x39c1, 0x39c2, 0x39c3, 0x39c4, 0x39c5, 0x39c6, + 0x39c7, 0x39c8, 0x39c9, 0x39ca, 0x39cb, 0x39cc, 0x39cd, 0x39ce, 0x39cf, + 0x39d0, 0x39d1, 0x39d2, 0x39d3, 0x39d4, 0x39d5, 0x39d6, 0x39d7, 0x39d8, + 0x39d9, 0x39da, 0x39db, 0x39dc, 0x39dd, 0x39de, 0x39df, 0x39e0, 0x39e1, + 0x39e2, 0x39e3, 0x39e4, 0x39e5, 0x39e6, 0x39e7, 0x39e8, 0x39e9, 0x39ea, + 0x39eb, 0x39ec, 0x39ed, 0x39ee, 0x39ef, 0x39f0, 0x39f1, 0x39f2, 0x39f3, + 0x39f4, 0x39f5, 0x39f6, 0x39f7, 0x39f8, 0x39f9, 0x39fa, 0x39fb, 0x39fc, + 0x39fd, 0x39fe, 0x39ff, 0x3a00, 0x3a01, 0x3a02, 0x3a03, 0x3a04, 0x3a05, + 0x3a06, 0x3a07, 0x3a08, 0x3a09, 0x3a0a, 0x3a0b, 0x3a0c, 0x3a0d, 0x3a0e, + 0x3a0f, 0x3a10, 0x3a11, 0x3a12, 0x3a13, 0x3a14, 0x3a15, 0x3a16, 0x3a17, + 0x3a18, 0x3a19, 0x3a1a, 0x3a1b, 0x3a1c, 0x3a1d, 0x3a1e, 0x3a1f, 0x3a20, + 0x3a21, 0x3a22, 0x3a23, 0x3a24, 0x3a25, 0x3a26, 0x3a27, 0x3a28, 0x3a29, + 0x3a2a, 0x3a2b, 0x3a2c, 0x3a2d, 0x3a2e, 0x3a2f, 0x3a30, 0x3a31, 0x3a32, + 0x3a33, 0x3a34, 0x3a35, 0x3a36, 0x3a37, 0x3a38, 0x3a39, 0x3a3a, 0x3a3b, + 0x3a3c, 0x3a3d, 0x3a3e, 0x3a3f, 0x3a40, 0x3a41, 0x3a42, 0x3a43, 0x3a44, + 0x3a45, 0x3a46, 0x3a47, 0x3a48, 0x3a49, 0x3a4a, 0x3a4b, 0x3a4c, 0x3a4d, + 0x3a4e, 0x3a4f, 0x3a50, 0x3a51, 0x3a52, 0x3a53, 0x3a54, 0x3a55, 0x3a56, + 0x3a57, 0x3a58, 0x3a59, 0x3a5a, 0x3a5b, 0x3a5c, 0x3a5d, 0x3a5e, 0x3a5f, + 0x3a60, 0x3a61, 0x3a62, 0x3a63, 0x3a64, 0x3a65, 0x3a66, 0x3a67, 0x3a68, + 0x3a69, 0x3a6a, 0x3a6b, 0x3a6c, 0x3a6d, 0x3a6e, 0x3a6f, 0x3a70, 0x3a71, + 0x3a72, 0x3a73, 0x3a74, 0x3a75, 0x3a76, 0x3a77, 0x3a78, 0x3a79, 0x3a7a, + 0x3a7b, 0x3a7c, 0x3a7d, 0x3a7e, 0x3a7f, 0x3a80, 0x3a81, 0x3a82, 0x3a83, + 0x3a84, 0x3a85, 0x3a86, 0x3a87, 0x3a88, 0x3a89, 0x3a8a, 0x3a8b, 0x3a8c, + 0x3a8d, 0x3a8e, 0x3a8f, 0x3a90, 0x3a91, 0x3a92, 0x3a93, 0x3a94, 0x3a95, + 0x3a96, 0x3a97, 0x3a98, 0x3a99, 0x3a9a, 0x3a9b, 0x3a9c, 0x3a9d, 0x3a9e, + 0x3a9f, 0x3aa0, 0x3aa1, 0x3aa2, 0x3aa3, 0x3aa4, 0x3aa5, 0x3aa6, 0x3aa7, + 0x3aa8, 0x3aa9, 0x3aaa, 0x3aab, 0x3aac, 0x3aad, 0x3aae, 0x3aaf, 0x3ab0, + 0x3ab1, 0x3ab2, 0x3ab3, 0x3ab4, 0x3ab5, 0x3ab6, 0x3ab7, 0x3ab8, 0x3ab9, + 0x3aba, 0x3abb, 0x3abc, 0x3abd, 0x3abe, 0x3abf, 0x3ac0, 0x3ac1, 0x3ac2, + 0x3ac3, 0x3ac4, 0x3ac5, 0x3ac6, 0x3ac7, 0x3ac8, 0x3ac9, 0x3aca, 0x3acb, + 0x3acc, 0x3acd, 0x3ace, 0x3acf, 0x3ad0, 0x3ad1, 0x3ad2, 0x3ad3, 0x3ad4, + 0x3ad5, 0x3ad6, 0x3ad7, 0x3ad8, 0x3ad9, 0x3ada, 0x3adb, 0x3adc, 0x3add, + 0x3ade, 0x3adf, 0x3ae0, 0x3ae1, 0x3ae2, 0x3ae3, 0x3ae4, 0x3ae5, 0x3ae6, + 0x3ae7, 0x3ae8, 0x3ae9, 0x3aea, 0x3aeb, 0x3aec, 0x3aed, 0x3aee, 0x3aef, + 0x3af0, 0x3af1, 0x3af2, 0x3af3, 0x3af4, 0x3af5, 0x3af6, 0x3af7, 0x3af8, + 0x3af9, 0x3afa, 0x3afb, 0x3afc, 0x3afd, 0x3afe, 0x3aff, 0x3b00, 0x3b01, + 0x3b02, 0x3b03, 0x3b04, 0x3b05, 0x3b06, 0x3b07, 0x3b08, 0x3b09, 0x3b0a, + 0x3b0b, 0x3b0c, 0x3b0d, 0x3b0e, 0x3b0f, 0x3b10, 0x3b11, 0x3b12, 0x3b13, + 0x3b14, 0x3b15, 0x3b16, 0x3b17, 0x3b18, 0x3b19, 0x3b1a, 0x3b1b, 0x3b1c, + 0x3b1d, 0x3b1e, 0x3b1f, 0x3b20, 0x3b21, 0x3b22, 0x3b23, 0x3b24, 0x3b25, + 0x3b26, 0x3b27, 0x3b28, 0x3b29, 0x3b2a, 0x3b2b, 0x3b2c, 0x3b2d, 0x3b2e, + 0x3b2f, 0x3b30, 0x3b31, 0x3b32, 0x3b33, 0x3b34, 0x3b35, 0x3b36, 0x3b37, + 0x3b38, 0x3b39, 0x3b3a, 0x3b3b, 0x3b3c, 0x3b3d, 0x3b3e, 0x3b3f, 0x3b40, + 0x3b41, 0x3b42, 0x3b43, 0x3b44, 0x3b45, 0x3b46, 0x3b47, 0x3b48, 0x3b49, + 0x3b4a, 0x3b4b, 0x3b4c, 0x3b4d, 0x3b4e, 0x3b4f, 0x3b50, 0x3b51, 0x3b52, + 0x3b53, 0x3b54, 0x3b55, 0x3b56, 0x3b57, 0x3b58, 0x3b59, 0x3b5a, 0x3b5b, + 0x3b5c, 0x3b5d, 0x3b5e, 0x3b5f, 0x3b60, 0x3b61, 0x3b62, 0x3b63, 0x3b64, + 0x3b65, 0x3b66, 0x3b67, 0x3b68, 0x3b69, 0x3b6a, 0x3b6b, 0x3b6c, 0x3b6d, + 0x3b6e, 0x3b6f, 0x3b70, 0x3b71, 0x3b72, 0x3b73, 0x3b74, 0x3b75, 0x3b76, + 0x3b77, 0x3b78, 0x3b79, 0x3b7a, 0x3b7b, 0x3b7c, 0x3b7d, 0x3b7e, 0x3b7f, + 0x3b80, 0x3b81, 0x3b82, 0x3b83, 0x3b84, 0x3b85, 0x3b86, 0x3b87, 0x3b88, + 0x3b89, 0x3b8a, 0x3b8b, 0x3b8c, 0x3b8d, 0x3b8e, 0x3b8f, 0x3b90, 0x3b91, + 0x3b92, 0x3b93, 0x3b94, 0x3b95, 0x3b96, 0x3b97, 0x3b98, 0x3b99, 0x3b9a, + 0x3b9b, 0x3b9c, 0x3b9d, 0x3b9e, 0x3b9f, 0x3ba0, 0x3ba1, 0x3ba2, 0x3ba3, + 0x3ba4, 0x3ba5, 0x3ba6, 0x3ba7, 0x3ba8, 0x3ba9, 0x3baa, 0x3bab, 0x3bac, + 0x3bad, 0x3bae, 0x3baf, 0x3bb0, 0x3bb1, 0x3bb2, 0x3bb3, 0x3bb4, 0x3bb5, + 0x3bb6, 0x3bb7, 0x3bb8, 0x3bb9, 0x3bba, 0x3bbb, 0x3bbc, 0x3bbd, 0x3bbe, + 0x3bbf, 0x3bc0, 0x3bc1, 0x3bc2, 0x3bc3, 0x3bc4, 0x3bc5, 0x3bc6, 0x3bc7, + 0x3bc8, 0x3bc9, 0x3bca, 0x3bcb, 0x3bcc, 0x3bcd, 0x3bce, 0x3bcf, 0x3bd0, + 0x3bd1, 0x3bd2, 0x3bd3, 0x3bd4, 0x3bd5, 0x3bd6, 0x3bd7, 0x3bd8, 0x3bd9, + 0x3bda, 0x3bdb, 0x3bdc, 0x3bdd, 0x3bde, 0x3bdf, 0x3be0, 0x3be1, 0x3be2, + 0x3be3, 0x3be4, 0x3be5, 0x3be6, 0x3be7, 0x3be8, 0x3be9, 0x3bea, 0x3beb, + 0x3bec, 0x3bed, 0x3bee, 0x3bef, 0x3bf0, 0x3bf1, 0x3bf2, 0x3bf3, 0x3bf4, + 0x3bf5, 0x3bf6, 0x3bf7, 0x3bf8, 0x3bf9, 0x3bfa, 0x3bfb, 0x3bfc, 0x3bfd, + 0x3bfe, 0x3bff, 0x3c00, 0x3c01, 0x3c02, 0x3c03, 0x3c04, 0x3c05, 0x3c06, + 0x3c07, 0x3c08, 0x3c09, 0x3c0a, 0x3c0b, 0x3c0c, 0x3c0d, 0x3c0e, 0x3c0f, + 0x3c10, 0x3c11, 0x3c12, 0x3c13, 0x3c14, 0x3c15, 0x3c16, 0x3c17, 0x3c18, + 0x3c19, 0x3c1a, 0x3c1b, 0x3c1c, 0x3c1d, 0x3c1e, 0x3c1f, 0x3c20, 0x3c21, + 0x3c22, 0x3c23, 0x3c24, 0x3c25, 0x3c26, 0x3c27, 0x3c28, 0x3c29, 0x3c2a, + 0x3c2b, 0x3c2c, 0x3c2d, 0x3c2e, 0x3c2f, 0x3c30, 0x3c31, 0x3c32, 0x3c33, + 0x3c34, 0x3c35, 0x3c36, 0x3c37, 0x3c38, 0x3c39, 0x3c3a, 0x3c3b, 0x3c3c, + 0x3c3d, 0x3c3e, 0x3c3f, 0x3c40, 0x3c41, 0x3c42, 0x3c43, 0x3c44, 0x3c45, + 0x3c46, 0x3c47, 0x3c48, 0x3c49, 0x3c4a, 0x3c4b, 0x3c4c, 0x3c4d, 0x3c4e, + 0x3c4f, 0x3c50, 0x3c51, 0x3c52, 0x3c53, 0x3c54, 0x3c55, 0x3c56, 0x3c57, + 0x3c58, 0x3c59, 0x3c5a, 0x3c5b, 0x3c5c, 0x3c5d, 0x3c5e, 0x3c5f, 0x3c60, + 0x3c61, 0x3c62, 0x3c63, 0x3c64, 0x3c65, 0x3c66, 0x3c67, 0x3c68, 0x3c69, + 0x3c6a, 0x3c6b, 0x3c6c, 0x3c6d, 0x3c6e, 0x3c6f, 0x3c70, 0x3c71, 0x3c72, + 0x3c73, 0x3c74, 0x3c75, 0x3c76, 0x3c77, 0x3c78, 0x3c79, 0x3c7a, 0x3c7b, + 0x3c7c, 0x3c7d, 0x3c7e, 0x3c7f, 0x3c80, 0x3c81, 0x3c82, 0x3c83, 0x3c84, + 0x3c85, 0x3c86, 0x3c87, 0x3c88, 0x3c89, 0x3c8a, 0x3c8b, 0x3c8c, 0x3c8d, + 0x3c8e, 0x3c8f, 0x3c90, 0x3c91, 0x3c92, 0x3c93, 0x3c94, 0x3c95, 0x3c96, + 0x3c97, 0x3c98, 0x3c99, 0x3c9a, 0x3c9b, 0x3c9c, 0x3c9d, 0x3c9e, 0x3c9f, + 0x3ca0, 0x3ca1, 0x3ca2, 0x3ca3, 0x3ca4, 0x3ca5, 0x3ca6, 0x3ca7, 0x3ca8, + 0x3ca9, 0x3caa, 0x3cab, 0x3cac, 0x3cad, 0x3cae, 0x3caf, 0x3cb0, 0x3cb1, + 0x3cb2, 0x3cb3, 0x3cb4, 0x3cb5, 0x3cb6, 0x3cb7, 0x3cb8, 0x3cb9, 0x3cba, + 0x3cbb, 0x3cbc, 0x3cbd, 0x3cbe, 0x3cbf, 0x3cc0, 0x3cc1, 0x3cc2, 0x3cc3, + 0x3cc4, 0x3cc5, 0x3cc6, 0x3cc7, 0x3cc8, 0x3cc9, 0x3cca, 0x3ccb, 0x3ccc, + 0x3ccd, 0x3cce, 0x3ccf, 0x3cd0, 0x3cd1, 0x3cd2, 0x3cd3, 0x3cd4, 0x3cd5, + 0x3cd6, 0x3cd7, 0x3cd8, 0x3cd9, 0x3cda, 0x3cdb, 0x3cdc, 0x3cdd, 0x3cde, + 0x3cdf, 0x3ce0, 0x3ce1, 0x3ce2, 0x3ce3, 0x3ce4, 0x3ce5, 0x3ce6, 0x3ce7, + 0x3ce8, 0x3ce9, 0x3cea, 0x3ceb, 0x3cec, 0x3ced, 0x3cee, 0x3cef, 0x3cf0, + 0x3cf1, 0x3cf2, 0x3cf3, 0x3cf4, 0x3cf5, 0x3cf6, 0x3cf7, 0x3cf8, 0x3cf9, + 0x3cfa, 0x3cfb, 0x3cfc, 0x3cfd, 0x3cfe, 0x3cff, 0x3d00, 0x3d01, 0x3d02, + 0x3d03, 0x3d04, 0x3d05, 0x3d06, 0x3d07, 0x3d08, 0x3d09, 0x3d0a, 0x3d0b, + 0x3d0c, 0x3d0d, 0x3d0e, 0x3d0f, 0x3d10, 0x3d11, 0x3d12, 0x3d13, 0x3d14, + 0x3d15, 0x3d16, 0x3d17, 0x3d18, 0x3d19, 0x3d1a, 0x3d1b, 0x3d1c, 0x3d1d, + 0x3d1e, 0x3d1f, 0x3d20, 0x3d21, 0x3d22, 0x3d23, 0x3d24, 0x3d25, 0x3d26, + 0x3d27, 0x3d28, 0x3d29, 0x3d2a, 0x3d2b, 0x3d2c, 0x3d2d, -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, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 0x4f3d, 0x4f73, 0x5047, 0x50f9, 0x52a0, 0x53ef, 0x5475, + 0x54e5, 0x5609, 0x5ac1, 0x5bb6, 0x6687, 0x67b6, 0x67b7, 0x67ef, 0x6b4c, + 0x73c2, 0x75c2, 0x7a3c, 0x82db, 0x8304, 0x8857, 0x8888, 0x8a36, 0x8cc8, + 0x8dcf, 0x8efb, 0x8fe6, 0x99d5, 0x523b, 0x5374, 0x5404, 0x606a, 0x6164, + 0x6bbc, 0x73cf, 0x811a, 0x89ba, 0x89d2, 0x95a3, 0x4f83, 0x520a, 0x58be, + 0x5978, 0x59e6, 0x5e72, 0x5e79, 0x61c7, 0x63c0, 0x6746, 0x67ec, 0x687f, + 0x6f97, 0x764e, 0x770b, 0x78f5, 0x7a08, 0x7aff, 0x7c21, 0x809d, 0x826e, + 0x8271, 0x8aeb, 0x9593, 0x4e6b, 0x559d, 0x66f7, 0x6e34, 0x78a3, 0x7aed, + 0x845b, 0x8910, 0x874e, 0x97a8, 0x52d8, 0x574e, 0x582a, 0x5d4c, 0x611f, + 0x61be, 0x6221, 0x6562, 0x67d1, 0x6a44, 0x6e1b, 0x7518, 0x75b3, 0x76e3, + 0x77b0, 0x7d3a, 0x90af, 0x9451, 0x9452, 0x9f95, 0x5323, 0x5cac, 0x7532, + 0x80db, 0x9240, 0x9598, 0x525b, 0x5808, 0x59dc, 0x5ca1, 0x5d17, 0x5eb7, + 0x5f3a, 0x5f4a, 0x6177, 0x6c5f, 0x757a, 0x7586, 0x7ce0, 0x7d73, 0x7db1, + 0x7f8c, 0x8154, 0x8221, 0x8591, 0x8941, 0x8b1b, 0x92fc, 0x964d, 0x9c47, + 0x4ecb, 0x4ef7, 0x500b, 0x51f1, 0x584f, 0x6137, 0x613e, 0x6168, 0x6539, + 0x69ea, 0x6f11, 0x75a5, 0x7686, 0x76d6, 0x7b87, 0x82a5, 0x84cb, 0xf900, + 0x93a7, 0x958b, 0x5580, 0x5ba2, 0x5751, 0xf901, 0x7cb3, 0x7fb9, 0x91b5, + 0x5028, 0x53bb, 0x5c45, 0x5de8, 0x62d2, 0x636e, 0x64da, 0x64e7, 0x6e20, + 0x70ac, 0x795b, 0x8ddd, 0x8e1e, 0xf902, 0x907d, 0x9245, 0x92f8, 0x4e7e, + 0x4ef6, 0x5065, 0x5dfe, 0x5efa, 0x6106, 0x6957, 0x8171, 0x8654, 0x8e47, + 0x9375, 0x9a2b, 0x4e5e, 0x5091, 0x6770, 0x6840, 0x5109, 0x528d, 0x5292, + 0x6aa2, 0x77bc, 0x9210, 0x9ed4, 0x52ab, 0x602f, 0x8ff2, 0x5048, 0x61a9, + 0x63ed, 0x64ca, 0x683c, 0x6a84, 0x6fc0, 0x8188, 0x89a1, 0x9694, 0x5805, + 0x727d, 0x72ac, 0x7504, 0x7d79, 0x7e6d, 0x80a9, 0x898b, 0x8b74, 0x9063, + 0x9d51, 0x6289, 0x6c7a, 0x6f54, 0x7d50, 0x7f3a, 0x8a23, 0x517c, 0x614a, + 0x7b9d, 0x8b19, 0x9257, 0x938c, 0x4eac, 0x4fd3, 0x501e, 0x50be, 0x5106, + 0x52c1, 0x52cd, 0x537f, 0x5770, 0x5883, 0x5e9a, 0x5f91, 0x6176, 0x61ac, + 0x64ce, 0x656c, 0x666f, 0x66bb, 0x66f4, 0x6897, 0x6d87, 0x7085, 0x70f1, + 0x749f, 0x74a5, 0x74ca, 0x75d9, 0x786c, 0x78ec, 0x7adf, 0x7af6, 0x7d45, + 0x7d93, 0x8015, 0x803f, 0x811b, 0x8396, 0x8b66, 0x8f15, 0x9015, 0x93e1, + 0x9803, 0x9838, 0x9a5a, 0x9be8, 0x4fc2, 0x5553, 0x583a, 0x5951, 0x5b63, + 0x5c46, 0x60b8, 0x6212, 0x6842, 0x68b0, 0x68e8, 0x6eaa, 0x754c, 0x7678, + 0x78ce, 0x7a3d, 0x7cfb, 0x7e6b, 0x7e7c, 0x8a08, 0x8aa1, 0x8c3f, 0x968e, + 0x9dc4, 0x53e4, 0x53e9, 0x544a, 0x5471, 0x56fa, 0x59d1, 0x5b64, 0x5c3b, + 0x5eab, 0x62f7, 0x6537, 0x6545, 0x6572, 0x66a0, 0x67af, 0x69c1, 0x6cbd, + 0x75fc, 0x7690, 0x777e, 0x7a3f, 0x7f94, 0x8003, 0x80a1, 0x818f, 0x82e6, + 0x82fd, 0x83f0, 0x85c1, 0x8831, 0x88b4, 0x8aa5, 0xf903, 0x8f9c, 0x932e, + 0x96c7, 0x9867, 0x9ad8, 0x9f13, 0x54ed, 0x659b, 0x66f2, 0x688f, 0x7a40, + 0x8c37, 0x9d60, 0x56f0, 0x5764, 0x5d11, 0x6606, 0x68b1, 0x68cd, 0x6efe, + 0x7428, 0x889e, 0x9be4, 0x6c68, 0xf904, 0x9aa8, 0x4f9b, 0x516c, 0x5171, + 0x529f, 0x5b54, 0x5de5, 0x6050, 0x606d, 0x62f1, 0x63a7, 0x653b, 0x73d9, + 0x7a7a, 0x86a3, 0x8ca2, 0x978f, 0x4e32, 0x5be1, 0x6208, 0x679c, 0x74dc, + 0x79d1, 0x83d3, 0x8a87, 0x8ab2, 0x8de8, 0x904e, 0x934b, 0x9846, 0x5ed3, + 0x69e8, 0x85ff, 0x90ed, 0xf905, 0x51a0, 0x5b98, 0x5bec, 0x6163, 0x68fa, + 0x6b3e, 0x704c, 0x742f, 0x74d8, 0x7ba1, 0x7f50, 0x83c5, 0x89c0, 0x8cab, + 0x95dc, 0x9928, 0x522e, 0x605d, 0x62ec, 0x9002, 0x4f8a, 0x5149, 0x5321, + 0x58d9, 0x5ee3, 0x66e0, 0x6d38, 0x709a, 0x72c2, 0x73d6, 0x7b50, 0x80f1, + 0x945b, 0x5366, 0x639b, 0x7f6b, 0x4e56, 0x5080, 0x584a, 0x58de, 0x602a, + 0x6127, 0x62d0, 0x69d0, 0x9b41, 0x5b8f, 0x7d18, 0x80b1, 0x8f5f, 0x4ea4, + 0x50d1, 0x54ac, 0x55ac, 0x5b0c, 0x5da0, 0x5de7, 0x652a, 0x654e, 0x6821, + 0x6a4b, 0x72e1, 0x768e, 0x77ef, 0x7d5e, 0x7ff9, 0x81a0, 0x854e, 0x86df, + 0x8f03, 0x8f4e, 0x90ca, 0x9903, 0x9a55, 0x9bab, 0x4e18, 0x4e45, 0x4e5d, + 0x4ec7, 0x4ff1, 0x5177, 0x52fe, 0x5340, 0x53e3, 0x53e5, 0x548e, 0x5614, + 0x5775, 0x57a2, 0x5bc7, 0x5d87, 0x5ed0, 0x61fc, 0x62d8, 0x6551, 0x67b8, + 0x67e9, 0x69cb, 0x6b50, 0x6bc6, 0x6bec, 0x6c42, 0x6e9d, 0x7078, 0x72d7, + 0x7396, 0x7403, 0x77bf, 0x77e9, 0x7a76, 0x7d7f, 0x8009, 0x81fc, 0x8205, + 0x820a, 0x82df, 0x8862, 0x8b33, 0x8cfc, 0x8ec0, 0x9011, 0x90b1, 0x9264, + 0x92b6, 0x99d2, 0x9a45, 0x9ce9, 0x9dd7, 0x9f9c, 0x570b, 0x5c40, 0x83ca, + 0x97a0, 0x97ab, 0x9eb4, 0x541b, 0x7a98, 0x7fa4, 0x88d9, 0x8ecd, 0x90e1, + 0x5800, 0x5c48, 0x6398, 0x7a9f, 0x5bae, 0x5f13, 0x7a79, 0x7aae, 0x828e, + 0x8eac, 0x5026, 0x5238, 0x52f8, 0x5377, 0x5708, 0x62f3, 0x6372, 0x6b0a, + 0x6dc3, 0x7737, 0x53a5, 0x7357, 0x8568, 0x8e76, 0x95d5, 0x673a, 0x6ac3, + 0x6f70, 0x8a6d, 0x8ecc, 0x994b, 0xf906, 0x6677, 0x6b78, 0x8cb4, 0x9b3c, + 0xf907, 0x53eb, 0x572d, 0x594e, 0x63c6, 0x69fb, 0x73ea, 0x7845, 0x7aba, + 0x7ac5, 0x7cfe, 0x8475, 0x898f, 0x8d73, 0x9035, 0x95a8, 0x52fb, 0x5747, + 0x7547, 0x7b60, 0x83cc, 0x921e, 0xf908, 0x6a58, 0x514b, 0x524b, 0x5287, + 0x621f, 0x68d8, 0x6975, 0x9699, 0x50c5, 0x52a4, 0x52e4, 0x61c3, 0x65a4, + 0x6839, 0x69ff, 0x747e, 0x7b4b, 0x82b9, 0x83eb, 0x89b2, 0x8b39, 0x8fd1, + 0x9949, 0xf909, 0x4eca, 0x5997, 0x64d2, 0x6611, 0x6a8e, 0x7434, 0x7981, + 0x79bd, 0x82a9, 0x887e, 0x887f, 0x895f, 0xf90a, 0x9326, 0x4f0b, 0x53ca, + 0x6025, 0x6271, 0x6c72, 0x7d1a, 0x7d66, 0x4e98, 0x5162, 0x77dc, 0x80af, + 0x4f01, 0x4f0e, 0x5176, 0x5180, 0x55dc, 0x5668, 0x573b, 0x57fa, 0x57fc, + 0x5914, 0x5947, 0x5993, 0x5bc4, 0x5c90, 0x5d0e, 0x5df1, 0x5e7e, 0x5fcc, + 0x6280, 0x65d7, 0x65e3, 0x671e, 0x671f, 0x675e, 0x68cb, 0x68c4, 0x6a5f, + 0x6b3a, 0x6c23, 0x6c7d, 0x6c82, 0x6dc7, 0x7398, 0x7426, 0x742a, 0x7482, + 0x74a3, 0x7578, 0x757f, 0x7881, 0x78ef, 0x7941, 0x7947, 0x7948, 0x797a, + 0x7b95, 0x7d00, 0x7dba, 0x7f88, 0x8006, 0x802d, 0x808c, 0x8a18, 0x8b4f, + 0x8c48, 0x8d77, 0x9321, 0x9324, 0x98e2, 0x9951, 0x9a0e, 0x9a0f, 0x9a65, + 0x9e92, 0x7dca, 0x4f76, 0x5409, 0x62ee, 0x6854, 0x91d1, 0x55ab, 0x513a, + 0xf90b, 0xf90c, 0x5a1c, 0x61e6, 0xf90d, 0x62cf, 0x62ff, 0xf90e, 0xf90f, + 0xf910, 0xf911, 0xf912, 0xf913, 0x90a3, 0xf914, 0xf915, 0xf916, 0xf917, + 0xf918, 0x8afe, 0xf919, 0xf91a, 0xf91b, 0xf91c, 0x6696, 0xf91d, 0x7156, + 0xf91e, 0xf91f, 0x96e3, 0xf920, 0x634f, 0x637a, 0x5357, 0xf921, 0x678f, + 0x6960, 0x6e73, 0xf922, 0x7537, 0xf923, 0xf924, 0xf925, 0x7d0d, 0xf926, + 0xf927, 0x8872, 0x56ca, 0x5a18, 0xf928, 0xf929, 0xf92a, 0xf92b, 0xf92c, + 0x4e43, 0xf92d, 0x5167, 0x5948, 0x67f0, 0x8010, 0xf92e, 0x5973, 0x5e74, + 0x649a, 0x79ca, 0x5ff5, 0x606c, 0x62c8, 0x637b, 0x5be7, 0x5bd7, 0x52aa, + 0xf92f, 0x5974, 0x5f29, 0x6012, 0xf930, 0xf931, 0xf932, 0x7459, 0xf933, + 0xf934, 0xf935, 0xf936, 0xf937, 0xf938, 0x99d1, 0xf939, 0xf93a, 0xf93b, + 0xf93c, 0xf93d, 0xf93e, 0xf93f, 0xf940, 0xf941, 0xf942, 0xf943, 0x6fc3, + 0xf944, 0xf945, 0x81bf, 0x8fb2, 0x60f1, 0xf946, 0xf947, 0x8166, 0xf948, + 0xf949, 0x5c3f, 0xf94a, 0xf94b, 0xf94c, 0xf94d, 0xf94e, 0xf94f, 0xf950, + 0xf951, 0x5ae9, 0x8a25, 0x677b, 0x7d10, 0xf952, 0xf953, 0xf954, 0xf955, + 0xf956, 0xf957, 0x80fd, 0xf958, 0xf959, 0x5c3c, 0x6ce5, 0x533f, 0x6eba, + 0x591a, 0x8336, 0x4e39, 0x4eb6, 0x4f46, 0x55ae, 0x5718, 0x58c7, 0x5f56, + 0x65b7, 0x65e6, 0x6a80, 0x6bb5, 0x6e4d, 0x77ed, 0x7aef, 0x7c1e, 0x7dde, + 0x86cb, 0x8892, 0x9132, 0x935b, 0x64bb, 0x6fbe, 0x737a, 0x75b8, 0x9054, + 0x5556, 0x574d, 0x61ba, 0x64d4, 0x66c7, 0x6de1, 0x6e5b, 0x6f6d, 0x6fb9, + 0x75f0, 0x8043, 0x81bd, 0x8541, 0x8983, 0x8ac7, 0x8b5a, 0x931f, 0x6c93, + 0x7553, 0x7b54, 0x8e0f, 0x905d, 0x5510, 0x5802, 0x5858, 0x5e62, 0x6207, + 0x649e, 0x68e0, 0x7576, 0x7cd6, 0x87b3, 0x9ee8, 0x4ee3, 0x5788, 0x576e, + 0x5927, 0x5c0d, 0x5cb1, 0x5e36, 0x5f85, 0x6234, 0x64e1, 0x73b3, 0x81fa, + 0x888b, 0x8cb8, 0x968a, 0x9edb, 0x5b85, 0x5fb7, 0x60b3, 0x5012, 0x5200, + 0x5230, 0x5716, 0x5835, 0x5857, 0x5c0e, 0x5c60, 0x5cf6, 0x5d8b, 0x5ea6, + 0x5f92, 0x60bc, 0x6311, 0x6389, 0x6417, 0x6843, 0x68f9, 0x6ac2, 0x6dd8, + 0x6e21, 0x6ed4, 0x6fe4, 0x71fe, 0x76dc, 0x7779, 0x79b1, 0x7a3b, 0x8404, + 0x89a9, 0x8ced, 0x8df3, 0x8e48, 0x9003, 0x9014, 0x9053, 0x90fd, 0x934d, + 0x9676, 0x97dc, 0x6bd2, 0x7006, 0x7258, 0x72a2, 0x7368, 0x7763, 0x79bf, + 0x7be4, 0x7e9b, 0x8b80, 0x58a9, 0x60c7, 0x6566, 0x65fd, 0x66be, 0x6c8c, + 0x711e, 0x71c9, 0x8c5a, 0x9813, 0x4e6d, 0x7a81, 0x4edd, 0x51ac, 0x51cd, + 0x52d5, 0x540c, 0x61a7, 0x6771, 0x6850, 0x68df, 0x6d1e, 0x6f7c, 0x75bc, + 0x77b3, 0x7ae5, 0x80f4, 0x8463, 0x9285, 0x515c, 0x6597, 0x675c, 0x6793, + 0x75d8, 0x7ac7, 0x8373, 0xf95a, 0x8c46, 0x9017, 0x982d, 0x5c6f, 0x81c0, + 0x829a, 0x9041, 0x906f, 0x920d, 0x5f97, 0x5d9d, 0x6a59, 0x71c8, 0x767b, + 0x7b49, 0x85e4, 0x8b04, 0x9127, 0x9a30, 0x5587, 0x61f6, 0xf95b, 0x7669, + 0x7f85, 0x863f, 0x87ba, 0x88f8, 0x908f, 0xf95c, 0x6d1b, 0x70d9, 0x73de, + 0x7d61, 0x843d, 0xf95d, 0x916a, 0x99f1, 0xf95e, 0x4e82, 0x5375, 0x6b04, + 0x6b12, 0x703e, 0x721b, 0x862d, 0x9e1e, 0x524c, 0x8fa3, 0x5d50, 0x64e5, + 0x652c, 0x6b16, 0x6feb, 0x7c43, 0x7e9c, 0x85cd, 0x8964, 0x89bd, 0x62c9, + 0x81d8, 0x881f, 0x5eca, 0x6717, 0x6d6a, 0x72fc, 0x7405, 0x746f, 0x8782, + 0x90de, 0x4f86, 0x5d0d, 0x5fa0, 0x840a, 0x51b7, 0x63a0, 0x7565, 0x4eae, + 0x5006, 0x5169, 0x51c9, 0x6881, 0x6a11, 0x7cae, 0x7cb1, 0x7ce7, 0x826f, + 0x8ad2, 0x8f1b, 0x91cf, 0x4fb6, 0x5137, 0x52f5, 0x5442, 0x5eec, 0x616e, + 0x623e, 0x65c5, 0x6ada, 0x6ffe, 0x792a, 0x85dc, 0x8823, 0x95ad, 0x9a62, + 0x9a6a, 0x9e97, 0x9ece, 0x529b, 0x66c6, 0x6b77, 0x701d, 0x792b, 0x8f62, + 0x9742, 0x6190, 0x6200, 0x6523, 0x6f23, 0x7149, 0x7489, 0x7df4, 0x806f, + 0x84ee, 0x8f26, 0x9023, 0x934a, 0x51bd, 0x5217, 0x52a3, 0x6d0c, 0x70c8, + 0x88c2, 0x5ec9, 0x6582, 0x6bae, 0x6fc2, 0x7c3e, 0x7375, 0x4ee4, 0x4f36, + 0x56f9, 0xf95f, 0x5cba, 0x5dba, 0x601c, 0x73b2, 0x7b2d, 0x7f9a, 0x7fce, + 0x8046, 0x901e, 0x9234, 0x96f6, 0x9748, 0x9818, 0x9f61, 0x4f8b, 0x6fa7, + 0x79ae, 0x91b4, 0x96b7, 0x52de, 0xf960, 0x6488, 0x64c4, 0x6ad3, 0x6f5e, + 0x7018, 0x7210, 0x76e7, 0x8001, 0x8606, 0x865c, 0x8def, 0x8f05, 0x9732, + 0x9b6f, 0x9dfa, 0x9e75, 0x788c, 0x797f, 0x7da0, 0x83c9, 0x9304, 0x9e7f, + 0x9e93, 0x8ad6, 0x58df, 0x5f04, 0x6727, 0x7027, 0x74cf, 0x7c60, 0x807e, + 0x5121, 0x7028, 0x7262, 0x78ca, 0x8cc2, 0x8cda, 0x8cf4, 0x96f7, 0x4e86, + 0x50da, 0x5bee, 0x5ed6, 0x6599, 0x71ce, 0x7642, 0x77ad, 0x804a, 0x84fc, + 0x907c, 0x9b27, 0x9f8d, 0x58d8, 0x5a41, 0x5c62, 0x6a13, 0x6dda, 0x6f0f, + 0x763b, 0x7d2f, 0x7e37, 0x851e, 0x8938, 0x93e4, 0x964b, 0x5289, 0x65d2, + 0x67f3, 0x69b4, 0x6d41, 0x6e9c, 0x700f, 0x7409, 0x7460, 0x7559, 0x7624, + 0x786b, 0x8b2c, 0x985e, 0x516d, 0x622e, 0x9678, 0x4f96, 0x502b, 0x5d19, + 0x6dea, 0x7db8, 0x8f2a, 0x5f8b, 0x6144, 0x6817, 0xf961, 0x9686, 0x52d2, + 0x808b, 0x51dc, 0x51cc, 0x695e, 0x7a1c, 0x7dbe, 0x83f1, 0x9675, 0x4fda, + 0x5229, 0x5398, 0x540f, 0x550e, 0x5c65, 0x60a7, 0x674e, 0x68a8, 0x6d6c, + 0x7281, 0x72f8, 0x7406, 0x7483, 0xf962, 0x75e2, 0x7c6c, 0x7f79, 0x7fb8, + 0x8389, 0x88cf, 0x88e1, 0x91cc, 0x91d0, 0x96e2, 0x9bc9, 0x541d, 0x6f7e, + 0x71d0, 0x7498, 0x85fa, 0x8eaa, 0x96a3, 0x9c57, 0x9e9f, 0x6797, 0x6dcb, + 0x7433, 0x81e8, 0x9716, 0x782c, 0x7acb, 0x7b20, 0x7c92, 0x6469, 0x746a, + 0x75f2, 0x78bc, 0x78e8, 0x99ac, 0x9b54, 0x9ebb, 0x5bde, 0x5e55, 0x6f20, + 0x819c, 0x83ab, 0x9088, 0x4e07, 0x534d, 0x5a29, 0x5dd2, 0x5f4e, 0x6162, + 0x633d, 0x6669, 0x66fc, 0x6eff, 0x6f2b, 0x7063, 0x779e, 0x842c, 0x8513, + 0x883b, 0x8f13, 0x9945, 0x9c3b, 0x551c, 0x62b9, 0x672b, 0x6cab, 0x8309, + 0x896a, 0x977a, 0x4ea1, 0x5984, 0x5fd8, 0x5fd9, 0x671b, 0x7db2, 0x7f54, + 0x8292, 0x832b, 0x83bd, 0x8f1e, 0x9099, 0x57cb, 0x59b9, 0x5a92, 0x5bd0, + 0x6627, 0x679a, 0x6885, 0x6bcf, 0x7164, 0x7f75, 0x8cb7, 0x8ce3, 0x9081, + 0x9b45, 0x8108, 0x8c8a, 0x964c, 0x9a40, 0x9ea5, 0x5b5f, 0x6c13, 0x731b, + 0x76f2, 0x76df, 0x840c, 0x51aa, 0x8993, 0x514d, 0x5195, 0x52c9, 0x68c9, + 0x6c94, 0x7704, 0x7720, 0x7dbf, 0x7dec, 0x9762, 0x9eb5, 0x6ec5, 0x8511, + 0x51a5, 0x540d, 0x547d, 0x660e, 0x669d, 0x6927, 0x6e9f, 0x76bf, 0x7791, + 0x8317, 0x84c2, 0x879f, 0x9169, 0x9298, 0x9cf4, 0x8882, 0x4fae, 0x5192, + 0x52df, 0x59c6, 0x5e3d, 0x6155, 0x6478, 0x6479, 0x66ae, 0x67d0, 0x6a21, + 0x6bcd, 0x6bdb, 0x725f, 0x7261, 0x7441, 0x7738, 0x77db, 0x8017, 0x82bc, + 0x8305, 0x8b00, 0x8b28, 0x8c8c, 0x6728, 0x6c90, 0x7267, 0x76ee, 0x7766, + 0x7a46, 0x9da9, 0x6b7f, 0x6c92, 0x5922, 0x6726, 0x8499, 0x536f, 0x5893, + 0x5999, 0x5edf, 0x63cf, 0x6634, 0x6773, 0x6e3a, 0x732b, 0x7ad7, 0x82d7, + 0x9328, 0x52d9, 0x5deb, 0x61ae, 0x61cb, 0x620a, 0x62c7, 0x64ab, 0x65e0, + 0x6959, 0x6b66, 0x6bcb, 0x7121, 0x73f7, 0x755d, 0x7e46, 0x821e, 0x8302, + 0x856a, 0x8aa3, 0x8cbf, 0x9727, 0x9d61, 0x58a8, 0x9ed8, 0x5011, 0x520e, + 0x543b, 0x554f, 0x6587, 0x6c76, 0x7d0a, 0x7d0b, 0x805e, 0x868a, 0x9580, + 0x96ef, 0x52ff, 0x6c95, 0x7269, 0x5473, 0x5a9a, 0x5c3e, 0x5d4b, 0x5f4c, + 0x5fae, 0x672a, 0x68b6, 0x6963, 0x6e3c, 0x6e44, 0x7709, 0x7c73, 0x7f8e, + 0x8587, 0x8b0e, 0x8ff7, 0x9761, 0x9ef4, 0x5cb7, 0x60b6, 0x610d, 0x61ab, + 0x654f, 0x65fb, 0x65fc, 0x6c11, 0x6cef, 0x739f, 0x73c9, 0x7de1, 0x9594, + 0x5bc6, 0x871c, 0x8b10, 0x525d, 0x535a, 0x62cd, 0x640f, 0x64b2, 0x6734, + 0x6a38, 0x6cca, 0x73c0, 0x749e, 0x7b94, 0x7c95, 0x7e1b, 0x818a, 0x8236, + 0x8584, 0x8feb, 0x96f9, 0x99c1, 0x4f34, 0x534a, 0x53cd, 0x53db, 0x62cc, + 0x642c, 0x6500, 0x6591, 0x69c3, 0x6cee, 0x6f58, 0x73ed, 0x7554, 0x7622, + 0x76e4, 0x76fc, 0x78d0, 0x78fb, 0x792c, 0x7d46, 0x822c, 0x87e0, 0x8fd4, + 0x9812, 0x98ef, 0x52c3, 0x62d4, 0x64a5, 0x6e24, 0x6f51, 0x767c, 0x8dcb, + 0x91b1, 0x9262, 0x9aee, 0x9b43, 0x5023, 0x508d, 0x574a, 0x59a8, 0x5c28, + 0x5e47, 0x5f77, 0x623f, 0x653e, 0x65b9, 0x65c1, 0x6609, 0x678b, 0x699c, + 0x6ec2, 0x78c5, 0x7d21, 0x80aa, 0x8180, 0x822b, 0x82b3, 0x84a1, 0x868c, + 0x8a2a, 0x8b17, 0x90a6, 0x9632, 0x9f90, 0x500d, 0x4ff3, 0xf963, 0x57f9, + 0x5f98, 0x62dc, 0x6392, 0x676f, 0x6e43, 0x7119, 0x76c3, 0x80cc, 0x80da, + 0x88f4, 0x88f5, 0x8919, 0x8ce0, 0x8f29, 0x914d, 0x966a, 0x4f2f, 0x4f70, + 0x5e1b, 0x67cf, 0x6822, 0x767d, 0x767e, 0x9b44, 0x5e61, 0x6a0a, 0x7169, + 0x71d4, 0x756a, 0xf964, 0x7e41, 0x8543, 0x85e9, 0x98dc, 0x4f10, 0x7b4f, + 0x7f70, 0x95a5, 0x51e1, 0x5e06, 0x68b5, 0x6c3e, 0x6c4e, 0x6cdb, 0x72af, + 0x7bc4, 0x8303, 0x6cd5, 0x743a, 0x50fb, 0x5288, 0x58c1, 0x64d8, 0x6a97, + 0x74a7, 0x7656, 0x78a7, 0x8617, 0x95e2, 0x9739, 0xf965, 0x535e, 0x5f01, + 0x8b8a, 0x8fa8, 0x8faf, 0x908a, 0x5225, 0x77a5, 0x9c49, 0x9f08, 0x4e19, + 0x5002, 0x5175, 0x5c5b, 0x5e77, 0x661e, 0x663a, 0x67c4, 0x68c5, 0x70b3, + 0x7501, 0x75c5, 0x79c9, 0x7add, 0x8f27, 0x9920, 0x9a08, 0x4fdd, 0x5821, + 0x5831, 0x5bf6, 0x666e, 0x6b65, 0x6d11, 0x6e7a, 0x6f7d, 0x73e4, 0x752b, + 0x83e9, 0x88dc, 0x8913, 0x8b5c, 0x8f14, 0x4f0f, 0x50d5, 0x5310, 0x535c, + 0x5b93, 0x5fa9, 0x670d, 0x798f, 0x8179, 0x832f, 0x8514, 0x8907, 0x8986, + 0x8f39, 0x8f3b, 0x99a5, 0x9c12, 0x672c, 0x4e76, 0x4ff8, 0x5949, 0x5c01, + 0x5cef, 0x5cf0, 0x6367, 0x68d2, 0x70fd, 0x71a2, 0x742b, 0x7e2b, 0x84ec, + 0x8702, 0x9022, 0x92d2, 0x9cf3, 0x4e0d, 0x4ed8, 0x4fef, 0x5085, 0x5256, + 0x526f, 0x5426, 0x5490, 0x57e0, 0x592b, 0x5a66, 0x5b5a, 0x5b75, 0x5bcc, + 0x5e9c, 0xf966, 0x6276, 0x6577, 0x65a7, 0x6d6e, 0x6ea5, 0x7236, 0x7b26, + 0x7c3f, 0x7f36, 0x8150, 0x8151, 0x819a, 0x8240, 0x8299, 0x83a9, 0x8a03, + 0x8ca0, 0x8ce6, 0x8cfb, 0x8d74, 0x8dba, 0x90e8, 0x91dc, 0x961c, 0x9644, + 0x99d9, 0x9ce7, 0x5317, 0x5206, 0x5429, 0x5674, 0x58b3, 0x5954, 0x596e, + 0x5fff, 0x61a4, 0x626e, 0x6610, 0x6c7e, 0x711a, 0x76c6, 0x7c89, 0x7cde, + 0x7d1b, 0x82ac, 0x8cc1, 0x96f0, 0xf967, 0x4f5b, 0x5f17, 0x5f7f, 0x62c2, + 0x5d29, 0x670b, 0x68da, 0x787c, 0x7e43, 0x9d6c, 0x4e15, 0x5099, 0x5315, + 0x532a, 0x5351, 0x5983, 0x5a62, 0x5e87, 0x60b2, 0x618a, 0x6249, 0x6279, + 0x6590, 0x6787, 0x69a7, 0x6bd4, 0x6bd6, 0x6bd7, 0x6bd8, 0x6cb8, 0xf968, + 0x7435, 0x75fa, 0x7812, 0x7891, 0x79d5, 0x79d8, 0x7c83, 0x7dcb, 0x7fe1, + 0x80a5, 0x813e, 0x81c2, 0x83f2, 0x871a, 0x88e8, 0x8ab9, 0x8b6c, 0x8cbb, + 0x9119, 0x975e, 0x98db, 0x9f3b, 0x56ac, 0x5b2a, 0x5f6c, 0x658c, 0x6ab3, + 0x6baf, 0x6d5c, 0x6ff1, 0x7015, 0x725d, 0x73ad, 0x8ca7, 0x8cd3, 0x983b, + 0x6191, 0x6c37, 0x8058, 0x9a01, 0x4e4d, 0x4e8b, 0x4e9b, 0x4ed5, 0x4f3a, + 0x4f3c, 0x4f7f, 0x4fdf, 0x50ff, 0x53f2, 0x53f8, 0x5506, 0x55e3, 0x56db, + 0x58eb, 0x5962, 0x5a11, 0x5beb, 0x5bfa, 0x5c04, 0x5df3, 0x5e2b, 0x5f99, + 0x601d, 0x6368, 0x659c, 0x65af, 0x67f6, 0x67fb, 0x68ad, 0x6b7b, 0x6c99, + 0x6cd7, 0x6e23, 0x7009, 0x7345, 0x7802, 0x793e, 0x7940, 0x7960, 0x79c1, + 0x7be9, 0x7d17, 0x7d72, 0x8086, 0x820d, 0x838e, 0x84d1, 0x86c7, 0x88df, + 0x8a50, 0x8a5e, 0x8b1d, 0x8cdc, 0x8d66, 0x8fad, 0x90aa, 0x98fc, 0x99df, + 0x9e9d, 0x524a, 0xf969, 0x6714, 0xf96a, 0x5098, 0x522a, 0x5c71, 0x6563, + 0x6c55, 0x73ca, 0x7523, 0x759d, 0x7b97, 0x849c, 0x9178, 0x9730, 0x4e77, + 0x6492, 0x6bba, 0x715e, 0x85a9, 0x4e09, 0xf96b, 0x6749, 0x68ee, 0x6e17, + 0x829f, 0x8518, 0x886b, 0x63f7, 0x6f81, 0x9212, 0x98af, 0x4e0a, 0x50b7, + 0x50cf, 0x511f, 0x5546, 0x55aa, 0x5617, 0x5b40, 0x5c19, 0x5ce0, 0x5e38, + 0x5e8a, 0x5ea0, 0x5ec2, 0x60f3, 0x6851, 0x6a61, 0x6e58, 0x723d, 0x7240, + 0x72c0, 0x76f8, 0x7965, 0x7bb1, 0x7fd4, 0x88f3, 0x89f4, 0x8a73, 0x8c61, + 0x8cde, 0x971c, 0x585e, 0x74bd, 0x8cfd, 0x55c7, 0xf96c, 0x7a61, 0x7d22, + 0x8272, 0x7272, 0x751f, 0x7525, 0xf96d, 0x7b19, 0x5885, 0x58fb, 0x5dbc, + 0x5e8f, 0x5eb6, 0x5f90, 0x6055, 0x6292, 0x637f, 0x654d, 0x6691, 0x66d9, + 0x66f8, 0x6816, 0x68f2, 0x7280, 0x745e, 0x7b6e, 0x7d6e, 0x7dd6, 0x7f72, + 0x80e5, 0x8212, 0x85af, 0x897f, 0x8a93, 0x901d, 0x92e4, 0x9ecd, 0x9f20, + 0x5915, 0x596d, 0x5e2d, 0x60dc, 0x6614, 0x6673, 0x6790, 0x6c50, 0x6dc5, + 0x6f5f, 0x77f3, 0x78a9, 0x84c6, 0x91cb, 0x932b, 0x4ed9, 0x50ca, 0x5148, + 0x5584, 0x5b0b, 0x5ba3, 0x6247, 0x657e, 0x65cb, 0x6e32, 0x717d, 0x7401, + 0x7444, 0x7487, 0x74bf, 0x766c, 0x79aa, 0x7dda, 0x7e55, 0x7fa8, 0x817a, + 0x81b3, 0x8239, 0x861a, 0x87ec, 0x8a75, 0x8de3, 0x9078, 0x9291, 0x9425, + 0x994d, 0x9bae, 0x5368, 0x5c51, 0x6954, 0x6cc4, 0x6d29, 0x6e2b, 0x820c, + 0x859b, 0x893b, 0x8a2d, 0x8aaa, 0x96ea, 0x9f67, 0x5261, 0x66b9, 0x6bb2, + 0x7e96, 0x87fe, 0x8d0d, 0x9583, 0x965d, 0x651d, 0x6d89, 0x71ee, 0xf96e, + 0x57ce, 0x59d3, 0x5bac, 0x6027, 0x60fa, 0x6210, 0x661f, 0x665f, 0x7329, + 0x73f9, 0x76db, 0x7701, 0x7b6c, 0x8056, 0x8072, 0x8165, 0x8aa0, 0x9192, + 0x4e16, 0x52e2, 0x6b72, 0x6d17, 0x7a05, 0x7b39, 0x7d30, 0xf96f, 0x8cb0, + 0x53ec, 0x562f, 0x5851, 0x5bb5, 0x5c0f, 0x5c11, 0x5de2, 0x6240, 0x6383, + 0x6414, 0x662d, 0x68b3, 0x6cbc, 0x6d88, 0x6eaf, 0x701f, 0x70a4, 0x71d2, + 0x7526, 0x758f, 0x758e, 0x7619, 0x7b11, 0x7be0, 0x7c2b, 0x7d20, 0x7d39, + 0x852c, 0x856d, 0x8607, 0x8a34, 0x900d, 0x9061, 0x90b5, 0x92b7, 0x97f6, + 0x9a37, 0x4fd7, 0x5c6c, 0x675f, 0x6d91, 0x7c9f, 0x7e8c, 0x8b16, 0x8d16, + 0x901f, 0x5b6b, 0x5dfd, 0x640d, 0x84c0, 0x905c, 0x98e1, 0x7387, 0x5b8b, + 0x609a, 0x677e, 0x6dde, 0x8a1f, 0x8aa6, 0x9001, 0x980c, 0x5237, 0xf970, + 0x7051, 0x788e, 0x9396, 0x8870, 0x91d7, 0x4fee, 0x53d7, 0x55fd, 0x56da, + 0x5782, 0x58fd, 0x5ac2, 0x5b88, 0x5cab, 0x5cc0, 0x5e25, 0x6101, 0x620d, + 0x624b, 0x6388, 0x641c, 0x6536, 0x6578, 0x6a39, 0x6b8a, 0x6c34, 0x6d19, + 0x6f31, 0x71e7, 0x72e9, 0x7378, 0x7407, 0x74b2, 0x7626, 0x7761, 0x79c0, + 0x7a57, 0x7aea, 0x7cb9, 0x7d8f, 0x7dac, 0x7e61, 0x7f9e, 0x8129, 0x8331, + 0x8490, 0x84da, 0x85ea, 0x8896, 0x8ab0, 0x8b90, 0x8f38, 0x9042, 0x9083, + 0x916c, 0x9296, 0x92b9, 0x968b, 0x96a7, 0x96a8, 0x96d6, 0x9700, 0x9808, + 0x9996, 0x9ad3, 0x9b1a, 0x53d4, 0x587e, 0x5919, 0x5b70, 0x5bbf, 0x6dd1, + 0x6f5a, 0x719f, 0x7421, 0x74b9, 0x8085, 0x83fd, 0x5de1, 0x5f87, 0x5faa, + 0x6042, 0x65ec, 0x6812, 0x696f, 0x6a53, 0x6b89, 0x6d35, 0x6df3, 0x73e3, + 0x76fe, 0x77ac, 0x7b4d, 0x7d14, 0x8123, 0x821c, 0x8340, 0x84f4, 0x8563, + 0x8a62, 0x8ac4, 0x9187, 0x931e, 0x9806, 0x99b4, 0x620c, 0x8853, 0x8ff0, + 0x9265, 0x5d07, 0x5d27, 0x5d69, 0x745f, 0x819d, 0x8768, 0x6fd5, 0x62fe, + 0x7fd2, 0x8936, 0x8972, 0x4e1e, 0x4e58, 0x50e7, 0x52dd, 0x5347, 0x627f, + 0x6607, 0x7e69, 0x8805, 0x965e, 0x4f8d, 0x5319, 0x5636, 0x59cb, 0x5aa4, + 0x5c38, 0x5c4e, 0x5c4d, 0x5e02, 0x5f11, 0x6043, 0x65bd, 0x662f, 0x6642, + 0x67be, 0x67f4, 0x731c, 0x77e2, 0x793a, 0x7fc5, 0x8494, 0x84cd, 0x8996, + 0x8a66, 0x8a69, 0x8ae1, 0x8c55, 0x8c7a, 0x57f4, 0x5bd4, 0x5f0f, 0x606f, + 0x62ed, 0x690d, 0x6b96, 0x6e5c, 0x7184, 0x7bd2, 0x8755, 0x8b58, 0x8efe, + 0x98df, 0x98fe, 0x4f38, 0x4f81, 0x4fe1, 0x547b, 0x5a20, 0x5bb8, 0x613c, + 0x65b0, 0x6668, 0x71fc, 0x7533, 0x795e, 0x7d33, 0x814e, 0x81e3, 0x8398, + 0x85aa, 0x85ce, 0x8703, 0x8a0a, 0x8eab, 0x8f9b, 0xf971, 0x8fc5, 0x5931, + 0x5ba4, 0x5be6, 0x6089, 0x5be9, 0x5c0b, 0x5fc3, 0x6c81, 0xf972, 0x6df1, + 0x700b, 0x751a, 0x82af, 0x8af6, 0x4ec0, 0x5341, 0xf973, 0x96d9, 0x6c0f, + 0x4e9e, 0x4fc4, 0x5152, 0x555e, 0x5a25, 0x5ce8, 0x6211, 0x7259, 0x82bd, + 0x83aa, 0x86fe, 0x8859, 0x8a1d, 0x963f, 0x96c5, 0x9913, 0x9d09, 0x9d5d, + 0x580a, 0x5cb3, 0x5dbd, 0x5e44, 0x60e1, 0x6115, 0x63e1, 0x6a02, 0x6e25, + 0x9102, 0x9354, 0x984e, 0x9c10, 0x9f77, 0x5b89, 0x5cb8, 0x6309, 0x664f, + 0x6848, 0x773c, 0x96c1, 0x978d, 0x9854, 0x9b9f, 0x65a1, 0x8b01, 0x8ecb, + 0x95bc, 0x5535, 0x5ca9, 0x5dd6, 0x5eb5, 0x6697, 0x764c, 0x83f4, 0x95c7, + 0x58d3, 0x62bc, 0x72ce, 0x9d28, 0x4ef0, 0x592e, 0x600f, 0x663b, 0x6b83, + 0x79e7, 0x9d26, 0x5393, 0x54c0, 0x57c3, 0x5d16, 0x611b, 0x66d6, 0x6daf, + 0x788d, 0x827e, 0x9698, 0x9744, 0x5384, 0x627c, 0x6396, 0x6db2, 0x7e0a, + 0x814b, 0x984d, 0x6afb, 0x7f4c, 0x9daf, 0x9e1a, 0x4e5f, 0x503b, 0x51b6, + 0x591c, 0x60f9, 0x63f6, 0x6930, 0x723a, 0x8036, 0xf974, 0x91ce, 0x5f31, + 0xf975, 0xf976, 0x7d04, 0x82e5, 0x846f, 0x84bb, 0x85e5, 0x8e8d, 0xf977, + 0x4f6f, 0xf978, 0xf979, 0x58e4, 0x5b43, 0x6059, 0x63da, 0x6518, 0x656d, + 0x6698, 0xf97a, 0x694a, 0x6a23, 0x6d0b, 0x7001, 0x716c, 0x75d2, 0x760d, + 0x79b3, 0x7a70, 0xf97b, 0x7f8a, 0xf97c, 0x8944, 0xf97d, 0x8b93, 0x91c0, + 0x967d, 0xf97e, 0x990a, 0x5704, 0x5fa1, 0x65bc, 0x6f01, 0x7600, 0x79a6, + 0x8a9e, 0x99ad, 0x9b5a, 0x9f6c, 0x5104, 0x61b6, 0x6291, 0x6a8d, 0x81c6, + 0x5043, 0x5830, 0x5f66, 0x7109, 0x8a00, 0x8afa, 0x5b7c, 0x8616, 0x4ffa, + 0x513c, 0x56b4, 0x5944, 0x63a9, 0x6df9, 0x5daa, 0x696d, 0x5186, 0x4e88, + 0x4f59, 0xf97f, 0xf980, 0xf981, 0x5982, 0xf982, 0xf983, 0x6b5f, 0x6c5d, + 0xf984, 0x74b5, 0x7916, 0xf985, 0x8207, 0x8245, 0x8339, 0x8f3f, 0x8f5d, + 0xf986, 0x9918, 0xf987, 0xf988, 0xf989, 0x4ea6, 0xf98a, 0x57df, 0x5f79, + 0x6613, 0xf98b, 0xf98c, 0x75ab, 0x7e79, 0x8b6f, 0xf98d, 0x9006, 0x9a5b, + 0x56a5, 0x5827, 0x59f8, 0x5a1f, 0x5bb4, 0xf98e, 0x5ef6, 0xf98f, 0xf990, + 0x6350, 0x633b, 0xf991, 0x693d, 0x6c87, 0x6cbf, 0x6d8e, 0x6d93, 0x6df5, + 0x6f14, 0xf992, 0x70df, 0x7136, 0x7159, 0xf993, 0x71c3, 0x71d5, 0xf994, + 0x784f, 0x786f, 0xf995, 0x7b75, 0x7de3, 0xf996, 0x7e2f, 0xf997, 0x884d, + 0x8edf, 0xf998, 0xf999, 0xf99a, 0x925b, 0xf99b, 0x9cf6, 0xf99c, 0xf99d, + 0xf99e, 0x6085, 0x6d85, 0xf99f, 0x71b1, 0xf9a0, 0xf9a1, 0x95b1, 0x53ad, + 0xf9a2, 0xf9a3, 0xf9a4, 0x67d3, 0xf9a5, 0x708e, 0x7130, 0x7430, 0x8276, + 0x82d2, 0xf9a6, 0x95bb, 0x9ae5, 0x9e7d, 0x66c4, 0xf9a7, 0x71c1, 0x8449, + 0xf9a8, 0xf9a9, 0x584b, 0xf9aa, 0xf9ab, 0x5db8, 0x5f71, 0xf9ac, 0x6620, + 0x668e, 0x6979, 0x69ae, 0x6c38, 0x6cf3, 0x6e36, 0x6f41, 0x6fda, 0x701b, + 0x702f, 0x7150, 0x71df, 0x7370, 0xf9ad, 0x745b, 0xf9ae, 0x74d4, 0x76c8, + 0x7a4e, 0x7e93, 0xf9af, 0xf9b0, 0x82f1, 0x8a60, 0x8fce, 0xf9b1, 0x9348, + 0xf9b2, 0x9719, 0xf9b3, 0xf9b4, 0x4e42, 0x502a, 0xf9b5, 0x5208, 0x53e1, + 0x66f3, 0x6c6d, 0x6fca, 0x730a, 0x777f, 0x7a62, 0x82ae, 0x85dd, 0x8602, + 0xf9b6, 0x88d4, 0x8a63, 0x8b7d, 0x8c6b, 0xf9b7, 0x92b3, 0xf9b8, 0x9713, + 0x9810, 0x4e94, 0x4f0d, 0x4fc9, 0x50b2, 0x5348, 0x543e, 0x5433, 0x55da, + 0x5862, 0x58ba, 0x5967, 0x5a1b, 0x5be4, 0x609f, 0xf9b9, 0x61ca, 0x6556, + 0x65ff, 0x6664, 0x68a7, 0x6c5a, 0x6fb3, 0x70cf, 0x71ac, 0x7352, 0x7b7d, + 0x8708, 0x8aa4, 0x9c32, 0x9f07, 0x5c4b, 0x6c83, 0x7344, 0x7389, 0x923a, + 0x6eab, 0x7465, 0x761f, 0x7a69, 0x7e15, 0x860a, 0x5140, 0x58c5, 0x64c1, + 0x74ee, 0x7515, 0x7670, 0x7fc1, 0x9095, 0x96cd, 0x9954, 0x6e26, 0x74e6, + 0x7aa9, 0x7aaa, 0x81e5, 0x86d9, 0x8778, 0x8a1b, 0x5a49, 0x5b8c, 0x5b9b, + 0x68a1, 0x6900, 0x6d63, 0x73a9, 0x7413, 0x742c, 0x7897, 0x7de9, 0x7feb, + 0x8118, 0x8155, 0x839e, 0x8c4c, 0x962e, 0x9811, 0x66f0, 0x5f80, 0x65fa, + 0x6789, 0x6c6a, 0x738b, 0x502d, 0x5a03, 0x6b6a, 0x77ee, 0x5916, 0x5d6c, + 0x5dcd, 0x7325, 0x754f, 0xf9ba, 0xf9bb, 0x50e5, 0x51f9, 0x582f, 0x592d, + 0x5996, 0x59da, 0x5be5, 0xf9bc, 0xf9bd, 0x5da2, 0x62d7, 0x6416, 0x6493, + 0x64fe, 0xf9be, 0x66dc, 0xf9bf, 0x6a48, 0xf9c0, 0x71ff, 0x7464, 0xf9c1, + 0x7a88, 0x7aaf, 0x7e47, 0x7e5e, 0x8000, 0x8170, 0xf9c2, 0x87ef, 0x8981, + 0x8b20, 0x9059, 0xf9c3, 0x9080, 0x9952, 0x617e, 0x6b32, 0x6d74, 0x7e1f, + 0x8925, 0x8fb1, 0x4fd1, 0x50ad, 0x5197, 0x52c7, 0x57c7, 0x5889, 0x5bb9, + 0x5eb8, 0x6142, 0x6995, 0x6d8c, 0x6e67, 0x6eb6, 0x7194, 0x7462, 0x7528, + 0x752c, 0x8073, 0x8338, 0x84c9, 0x8e0a, 0x9394, 0x93de, 0xf9c4, 0x4e8e, + 0x4f51, 0x5076, 0x512a, 0x53c8, 0x53cb, 0x53f3, 0x5b87, 0x5bd3, 0x5c24, + 0x611a, 0x6182, 0x65f4, 0x725b, 0x7397, 0x7440, 0x76c2, 0x7950, 0x7991, + 0x79b9, 0x7d06, 0x7fbd, 0x828b, 0x85d5, 0x865e, 0x8fc2, 0x9047, 0x90f5, + 0x91ea, 0x9685, 0x96e8, 0x96e9, 0x52d6, 0x5f67, 0x65ed, 0x6631, 0x682f, + 0x715c, 0x7a36, 0x90c1, 0x980a, 0x4e91, 0xf9c5, 0x6a52, 0x6b9e, 0x6f90, + 0x7189, 0x8018, 0x82b8, 0x8553, 0x904b, 0x9695, 0x96f2, 0x97fb, 0x851a, + 0x9b31, 0x4e90, 0x718a, 0x96c4, 0x5143, 0x539f, 0x54e1, 0x5713, 0x5712, + 0x57a3, 0x5a9b, 0x5ac4, 0x5bc3, 0x6028, 0x613f, 0x63f4, 0x6c85, 0x6d39, + 0x6e72, 0x6e90, 0x7230, 0x733f, 0x7457, 0x82d1, 0x8881, 0x8f45, 0x9060, + 0xf9c6, 0x9662, 0x9858, 0x9d1b, 0x6708, 0x8d8a, 0x925e, 0x4f4d, 0x5049, + 0x50de, 0x5371, 0x570d, 0x59d4, 0x5a01, 0x5c09, 0x6170, 0x6690, 0x6e2d, + 0x7232, 0x744b, 0x7def, 0x80c3, 0x840e, 0x8466, 0x853f, 0x875f, 0x885b, + 0x8918, 0x8b02, 0x9055, 0x97cb, 0x9b4f, 0x4e73, 0x4f91, 0x5112, 0x516a, + 0xf9c7, 0x552f, 0x55a9, 0x5b7a, 0x5ba5, 0x5e7c, 0x5e7d, 0x5ebe, 0x60a0, + 0x60df, 0x6108, 0x6109, 0x63c4, 0x6538, 0x6709, 0xf9c8, 0x67d4, 0x67da, + 0xf9c9, 0x6961, 0x6962, 0x6cb9, 0x6d27, 0xf9ca, 0x6e38, 0xf9cb, 0x6fe1, + 0x7336, 0x7337, 0xf9cc, 0x745c, 0x7531, 0xf9cd, 0x7652, 0xf9ce, 0xf9cf, + 0x7dad, 0x81fe, 0x8438, 0x88d5, 0x8a98, 0x8adb, 0x8aed, 0x8e30, 0x8e42, + 0x904a, 0x903e, 0x907a, 0x9149, 0x91c9, 0x936e, 0xf9d0, 0xf9d1, 0x5809, + 0xf9d2, 0x6bd3, 0x8089, 0x80b2, 0xf9d3, 0xf9d4, 0x5141, 0x596b, 0x5c39, + 0xf9d5, 0xf9d6, 0x6f64, 0x73a7, 0x80e4, 0x8d07, 0xf9d7, 0x9217, 0x958f, + 0xf9d8, 0xf9d9, 0xf9da, 0xf9db, 0x807f, 0x620e, 0x701c, 0x7d68, 0x878d, + 0xf9dc, 0x57a0, 0x6069, 0x6147, 0x6bb7, 0x8abe, 0x9280, 0x96b1, 0x4e59, + 0x541f, 0x6deb, 0x852d, 0x9670, 0x97f3, 0x98ee, 0x63d6, 0x6ce3, 0x9091, + 0x51dd, 0x61c9, 0x81ba, 0x9df9, 0x4f9d, 0x501a, 0x5100, 0x5b9c, 0x610f, + 0x61ff, 0x64ec, 0x6905, 0x6bc5, 0x7591, 0x77e3, 0x7fa9, 0x8264, 0x858f, + 0x87fb, 0x8863, 0x8abc, 0x8b70, 0x91ab, 0x4e8c, 0x4ee5, 0x4f0a, 0xf9dd, + 0xf9de, 0x5937, 0x59e8, 0xf9df, 0x5df2, 0x5f1b, 0x5f5b, 0x6021, 0xf9e0, + 0xf9e1, 0xf9e2, 0xf9e3, 0x723e, 0x73e5, 0xf9e4, 0x7570, 0x75cd, 0xf9e5, + 0x79fb, 0xf9e6, 0x800c, 0x8033, 0x8084, 0x82e1, 0x8351, 0xf9e7, 0xf9e8, + 0x8cbd, 0x8cb3, 0x9087, 0xf9e9, 0xf9ea, 0x98f4, 0x990c, 0xf9eb, 0xf9ec, + 0x7037, 0x76ca, 0x7fca, 0x7fcc, 0x7ffc, 0x8b1a, 0x4eba, 0x4ec1, 0x5203, + 0x5370, 0xf9ed, 0x54bd, 0x56e0, 0x59fb, 0x5bc5, 0x5f15, 0x5fcd, 0x6e6e, + 0xf9ee, 0xf9ef, 0x7d6a, 0x8335, 0xf9f0, 0x8693, 0x8a8d, 0xf9f1, 0x976d, + 0x9777, 0xf9f2, 0xf9f3, 0x4e00, 0x4f5a, 0x4f7e, 0x58f9, 0x65e5, 0x6ea2, + 0x9038, 0x93b0, 0x99b9, 0x4efb, 0x58ec, 0x598a, 0x59d9, 0x6041, 0xf9f4, + 0xf9f5, 0x7a14, 0xf9f6, 0x834f, 0x8cc3, 0x5165, 0x5344, 0xf9f7, 0xf9f8, + 0xf9f9, 0x4ecd, 0x5269, 0x5b55, 0x82bf, 0x4ed4, 0x523a, 0x54a8, 0x59c9, + 0x59ff, 0x5b50, 0x5b57, 0x5b5c, 0x6063, 0x6148, 0x6ecb, 0x7099, 0x716e, + 0x7386, 0x74f7, 0x75b5, 0x78c1, 0x7d2b, 0x8005, 0x81ea, 0x8328, 0x8517, + 0x85c9, 0x8aee, 0x8cc7, 0x96cc, 0x4f5c, 0x52fa, 0x56bc, 0x65ab, 0x6628, + 0x707c, 0x70b8, 0x7235, 0x7dbd, 0x828d, 0x914c, 0x96c0, 0x9d72, 0x5b71, + 0x68e7, 0x6b98, 0x6f7a, 0x76de, 0x5c91, 0x66ab, 0x6f5b, 0x7bb4, 0x7c2a, + 0x8836, 0x96dc, 0x4e08, 0x4ed7, 0x5320, 0x5834, 0x58bb, 0x58ef, 0x596c, + 0x5c07, 0x5e33, 0x5e84, 0x5f35, 0x638c, 0x66b2, 0x6756, 0x6a1f, 0x6aa3, + 0x6b0c, 0x6f3f, 0x7246, 0xf9fa, 0x7350, 0x748b, 0x7ae0, 0x7ca7, 0x8178, + 0x81df, 0x81e7, 0x838a, 0x846c, 0x8523, 0x8594, 0x85cf, 0x88dd, 0x8d13, + 0x91ac, 0x9577, 0x969c, 0x518d, 0x54c9, 0x5728, 0x5bb0, 0x624d, 0x6750, + 0x683d, 0x6893, 0x6e3d, 0x6ed3, 0x707d, 0x7e21, 0x88c1, 0x8ca1, 0x8f09, + 0x9f4b, 0x9f4e, 0x722d, 0x7b8f, 0x8acd, 0x931a, 0x4f47, 0x4f4e, 0x5132, + 0x5480, 0x59d0, 0x5e95, 0x62b5, 0x6775, 0x696e, 0x6a17, 0x6cae, 0x6e1a, + 0x72d9, 0x732a, 0x75bd, 0x7bb8, 0x7d35, 0x82e7, 0x83f9, 0x8457, 0x85f7, + 0x8a5b, 0x8caf, 0x8e87, 0x9019, 0x90b8, 0x96ce, 0x9f5f, 0x52e3, 0x540a, + 0x5ae1, 0x5bc2, 0x6458, 0x6575, 0x6ef4, 0x72c4, 0xf9fb, 0x7684, 0x7a4d, + 0x7b1b, 0x7c4d, 0x7e3e, 0x7fdf, 0x837b, 0x8b2b, 0x8cca, 0x8d64, 0x8de1, + 0x8e5f, 0x8fea, 0x8ff9, 0x9069, 0x93d1, 0x4f43, 0x4f7a, 0x50b3, 0x5168, + 0x5178, 0x524d, 0x526a, 0x5861, 0x587c, 0x5960, 0x5c08, 0x5c55, 0x5edb, + 0x609b, 0x6230, 0x6813, 0x6bbf, 0x6c08, 0x6fb1, 0x714e, 0x7420, 0x7530, + 0x7538, 0x7551, 0x7672, 0x7b4c, 0x7b8b, 0x7bad, 0x7bc6, 0x7e8f, 0x8a6e, + 0x8f3e, 0x8f49, 0x923f, 0x9293, 0x9322, 0x942b, 0x96fb, 0x985a, 0x986b, + 0x991e, 0x5207, 0x622a, 0x6298, 0x6d59, 0x7664, 0x7aca, 0x7bc0, 0x7d76, + 0x5360, 0x5cbe, 0x5e97, 0x6f38, 0x70b9, 0x7c98, 0x9711, 0x9b8e, 0x9ede, + 0x63a5, 0x647a, 0x8776, 0x4e01, 0x4e95, 0x4ead, 0x505c, 0x5075, 0x5448, + 0x59c3, 0x5b9a, 0x5e40, 0x5ead, 0x5ef7, 0x5f81, 0x60c5, 0x633a, 0x653f, + 0x6574, 0x65cc, 0x6676, 0x6678, 0x67fe, 0x6968, 0x6a89, 0x6b63, 0x6c40, + 0x6dc0, 0x6de8, 0x6e1f, 0x6e5e, 0x701e, 0x70a1, 0x738e, 0x73fd, 0x753a, + 0x775b, 0x7887, 0x798e, 0x7a0b, 0x7a7d, 0x7cbe, 0x7d8e, 0x8247, 0x8a02, + 0x8aea, 0x8c9e, 0x912d, 0x914a, 0x91d8, 0x9266, 0x92cc, 0x9320, 0x9706, + 0x9756, 0x975c, 0x9802, 0x9f0e, 0x5236, 0x5291, 0x557c, 0x5824, 0x5e1d, + 0x5f1f, 0x608c, 0x63d0, 0x68af, 0x6fdf, 0x796d, 0x7b2c, 0x81cd, 0x85ba, + 0x88fd, 0x8af8, 0x8e44, 0x918d, 0x9664, 0x969b, 0x973d, 0x984c, 0x9f4a, + 0x4fce, 0x5146, 0x51cb, 0x52a9, 0x5632, 0x5f14, 0x5f6b, 0x63aa, 0x64cd, + 0x65e9, 0x6641, 0x66fa, 0x66f9, 0x671d, 0x689d, 0x68d7, 0x69fd, 0x6f15, + 0x6f6e, 0x7167, 0x71e5, 0x722a, 0x74aa, 0x773a, 0x7956, 0x795a, 0x79df, + 0x7a20, 0x7a95, 0x7c97, 0x7cdf, 0x7d44, 0x7e70, 0x8087, 0x85fb, 0x86a4, + 0x8a54, 0x8abf, 0x8d99, 0x8e81, 0x9020, 0x906d, 0x91e3, 0x963b, 0x96d5, + 0x9ce5, 0x65cf, 0x7c07, 0x8db3, 0x93c3, 0x5b58, 0x5c0a, 0x5352, 0x62d9, + 0x731d, 0x5027, 0x5b97, 0x5f9e, 0x60b0, 0x616b, 0x68d5, 0x6dd9, 0x742e, + 0x7a2e, 0x7d42, 0x7d9c, 0x7e31, 0x816b, 0x8e2a, 0x8e35, 0x937e, 0x9418, + 0x4f50, 0x5750, 0x5de6, 0x5ea7, 0x632b, 0x7f6a, 0x4e3b, 0x4f4f, 0x4f8f, + 0x505a, 0x59dd, 0x80c4, 0x546a, 0x5468, 0x55fe, 0x594f, 0x5b99, 0x5dde, + 0x5eda, 0x665d, 0x6731, 0x67f1, 0x682a, 0x6ce8, 0x6d32, 0x6e4a, 0x6f8d, + 0x70b7, 0x73e0, 0x7587, 0x7c4c, 0x7d02, 0x7d2c, 0x7da2, 0x821f, 0x86db, + 0x8a3b, 0x8a85, 0x8d70, 0x8e8a, 0x8f33, 0x9031, 0x914e, 0x9152, 0x9444, + 0x99d0, 0x7af9, 0x7ca5, 0x4fca, 0x5101, 0x51c6, 0x57c8, 0x5bef, 0x5cfb, + 0x6659, 0x6a3d, 0x6d5a, 0x6e96, 0x6fec, 0x710c, 0x756f, 0x7ae3, 0x8822, + 0x9021, 0x9075, 0x96cb, 0x99ff, 0x8301, 0x4e2d, 0x4ef2, 0x8846, 0x91cd, + 0x537d, 0x6adb, 0x696b, 0x6c41, 0x847a, 0x589e, 0x618e, 0x66fe, 0x62ef, + 0x70dd, 0x7511, 0x75c7, 0x7e52, 0x84b8, 0x8b49, 0x8d08, 0x4e4b, 0x53ea, + 0x54ab, 0x5730, 0x5740, 0x5fd7, 0x6301, 0x6307, 0x646f, 0x652f, 0x65e8, + 0x667a, 0x679d, 0x67b3, 0x6b62, 0x6c60, 0x6c9a, 0x6f2c, 0x77e5, 0x7825, + 0x7949, 0x7957, 0x7d19, 0x80a2, 0x8102, 0x81f3, 0x829d, 0x82b7, 0x8718, + 0x8a8c, 0xf9fc, 0x8d04, 0x8dbe, 0x9072, 0x76f4, 0x7a19, 0x7a37, 0x7e54, + 0x8077, 0x5507, 0x55d4, 0x5875, 0x632f, 0x6422, 0x6649, 0x664b, 0x686d, + 0x699b, 0x6b84, 0x6d25, 0x6eb1, 0x73cd, 0x7468, 0x74a1, 0x755b, 0x75b9, + 0x76e1, 0x771e, 0x778b, 0x79e6, 0x7e09, 0x7e1d, 0x81fb, 0x852f, 0x8897, + 0x8a3a, 0x8cd1, 0x8eeb, 0x8fb0, 0x9032, 0x93ad, 0x9663, 0x9673, 0x9707, + 0x4f84, 0x53f1, 0x59ea, 0x5ac9, 0x5e19, 0x684e, 0x74c6, 0x75be, 0x79e9, + 0x7a92, 0x81a3, 0x86ed, 0x8cea, 0x8dcc, 0x8fed, 0x659f, 0x6715, 0xf9fd, + 0x57f7, 0x6f57, 0x7ddd, 0x8f2f, 0x93f6, 0x96c6, 0x5fb5, 0x61f2, 0x6f84, + 0x4e14, 0x4f98, 0x501f, 0x53c9, 0x55df, 0x5d6f, 0x5dee, 0x6b21, 0x6b64, + 0x78cb, 0x7b9a, 0xf9fe, 0x8e49, 0x8eca, 0x906e, 0x6349, 0x643e, 0x7740, + 0x7a84, 0x932f, 0x947f, 0x9f6a, 0x64b0, 0x6faf, 0x71e6, 0x74a8, 0x74da, + 0x7ac4, 0x7c12, 0x7e82, 0x7cb2, 0x7e98, 0x8b9a, 0x8d0a, 0x947d, 0x9910, + 0x994c, 0x5239, 0x5bdf, 0x64e6, 0x672d, 0x7d2e, 0x50ed, 0x53c3, 0x5879, + 0x6158, 0x6159, 0x61fa, 0x65ac, 0x7ad9, 0x8b92, 0x8b96, 0x5009, 0x5021, + 0x5275, 0x5531, 0x5a3c, 0x5ee0, 0x5f70, 0x6134, 0x655e, 0x660c, 0x6636, + 0x66a2, 0x69cd, 0x6ec4, 0x6f32, 0x7316, 0x7621, 0x7a93, 0x8139, 0x8259, + 0x83d6, 0x84bc, 0x50b5, 0x57f0, 0x5bc0, 0x5be8, 0x5f69, 0x63a1, 0x7826, + 0x7db5, 0x83dc, 0x8521, 0x91c7, 0x91f5, 0x518a, 0x67f5, 0x7b56, 0x8cac, + 0x51c4, 0x59bb, 0x60bd, 0x8655, 0x501c, 0xf9ff, 0x5254, 0x5c3a, 0x617d, + 0x621a, 0x62d3, 0x64f2, 0x65a5, 0x6ecc, 0x7620, 0x810a, 0x8e60, 0x965f, + 0x96bb, 0x4edf, 0x5343, 0x5598, 0x5929, 0x5ddd, 0x64c5, 0x6cc9, 0x6dfa, + 0x7394, 0x7a7f, 0x821b, 0x85a6, 0x8ce4, 0x8e10, 0x9077, 0x91e7, 0x95e1, + 0x9621, 0x97c6, 0x51f8, 0x54f2, 0x5586, 0x5fb9, 0x64a4, 0x6f88, 0x7db4, + 0x8f1f, 0x8f4d, 0x9435, 0x50c9, 0x5c16, 0x6cbe, 0x6dfb, 0x751b, 0x77bb, + 0x7c3d, 0x7c64, 0x8a79, 0x8ac2, 0x581e, 0x59be, 0x5e16, 0x6377, 0x7252, + 0x758a, 0x776b, 0x8adc, 0x8cbc, 0x8f12, 0x5ef3, 0x6674, 0x6df8, 0x807d, + 0x83c1, 0x8acb, 0x9751, 0x9bd6, 0xfa00, 0x5243, 0x66ff, 0x6d95, 0x6eef, + 0x7de0, 0x8ae6, 0x902e, 0x905e, 0x9ad4, 0x521d, 0x527f, 0x54e8, 0x6194, + 0x6284, 0x62db, 0x68a2, 0x6912, 0x695a, 0x6a35, 0x7092, 0x7126, 0x785d, + 0x7901, 0x790e, 0x79d2, 0x7a0d, 0x8096, 0x8278, 0x82d5, 0x8349, 0x8549, + 0x8c82, 0x8d85, 0x9162, 0x918b, 0x91ae, 0x4fc3, 0x56d1, 0x71ed, 0x77d7, + 0x8700, 0x89f8, 0x5bf8, 0x5fd6, 0x6751, 0x90a8, 0x53e2, 0x585a, 0x5bf5, + 0x60a4, 0x6181, 0x6460, 0x7e3d, 0x8070, 0x8525, 0x9283, 0x64ae, 0x50ac, + 0x5d14, 0x6700, 0x589c, 0x62bd, 0x63a8, 0x690e, 0x6978, 0x6a1e, 0x6e6b, + 0x76ba, 0x79cb, 0x82bb, 0x8429, 0x8acf, 0x8da8, 0x8ffd, 0x9112, 0x914b, + 0x919c, 0x9310, 0x9318, 0x939a, 0x96db, 0x9a36, 0x9c0d, 0x4e11, 0x755c, + 0x795d, 0x7afa, 0x7b51, 0x7bc9, 0x7e2e, 0x84c4, 0x8e59, 0x8e74, 0x8ef8, + 0x9010, 0x6625, 0x693f, 0x7443, 0x51fa, 0x672e, 0x9edc, 0x5145, 0x5fe0, + 0x6c96, 0x87f2, 0x885d, 0x8877, 0x60b4, 0x81b5, 0x8403, 0x8d05, 0x53d6, + 0x5439, 0x5634, 0x5a36, 0x5c31, 0x708a, 0x7fe0, 0x805a, 0x8106, 0x81ed, + 0x8da3, 0x9189, 0x9a5f, 0x9df2, 0x5074, 0x4ec4, 0x53a0, 0x60fb, 0x6e2c, + 0x5c64, 0x4f88, 0x5024, 0x55e4, 0x5cd9, 0x5e5f, 0x6065, 0x6894, 0x6cbb, + 0x6dc4, 0x71be, 0x75d4, 0x75f4, 0x7661, 0x7a1a, 0x7a49, 0x7dc7, 0x7dfb, + 0x7f6e, 0x81f4, 0x86a9, 0x8f1c, 0x96c9, 0x99b3, 0x9f52, 0x5247, 0x52c5, + 0x98ed, 0x89aa, 0x4e03, 0x67d2, 0x6f06, 0x4fb5, 0x5be2, 0x6795, 0x6c88, + 0x6d78, 0x741b, 0x7827, 0x91dd, 0x937c, 0x87c4, 0x79e4, 0x7a31, 0x5feb, + 0x4ed6, 0x54a4, 0x553e, 0x58ae, 0x59a5, 0x60f0, 0x6253, 0x62d6, 0x6736, + 0x6955, 0x8235, 0x9640, 0x99b1, 0x99dd, 0x502c, 0x5353, 0x5544, 0x577c, + 0xfa01, 0x6258, 0xfa02, 0x64e2, 0x666b, 0x67dd, 0x6fc1, 0x6fef, 0x7422, + 0x7438, 0x8a17, 0x9438, 0x5451, 0x5606, 0x5766, 0x5f48, 0x619a, 0x6b4e, + 0x7058, 0x70ad, 0x7dbb, 0x8a95, 0x596a, 0x812b, 0x63a2, 0x7708, 0x803d, + 0x8caa, 0x5854, 0x642d, 0x69bb, 0x5b95, 0x5e11, 0x6e6f, 0xfa03, 0x8569, + 0x514c, 0x53f0, 0x592a, 0x6020, 0x614b, 0x6b86, 0x6c70, 0x6cf0, 0x7b1e, + 0x80ce, 0x82d4, 0x8dc6, 0x90b0, 0x98b1, 0xfa04, 0x64c7, 0x6fa4, 0x6491, + 0x6504, 0x514e, 0x5410, 0x571f, 0x8a0e, 0x615f, 0x6876, 0xfa05, 0x75db, + 0x7b52, 0x7d71, 0x901a, 0x5806, 0x69cc, 0x817f, 0x892a, 0x9000, 0x9839, + 0x5078, 0x5957, 0x59ac, 0x6295, 0x900f, 0x9b2a, 0x615d, 0x7279, 0x95d6, + 0x5761, 0x5a46, 0x5df4, 0x628a, 0x64ad, 0x64fa, 0x6777, 0x6ce2, 0x6d3e, + 0x722c, 0x7436, 0x7834, 0x7f77, 0x82ad, 0x8ddb, 0x9817, 0x5224, 0x5742, + 0x677f, 0x7248, 0x74e3, 0x8ca9, 0x8fa6, 0x9211, 0x962a, 0x516b, 0x53ed, + 0x634c, 0x4f69, 0x5504, 0x6096, 0x6557, 0x6c9b, 0x6d7f, 0x724c, 0x72fd, + 0x7a17, 0x8987, 0x8c9d, 0x5f6d, 0x6f8e, 0x70f9, 0x81a8, 0x610e, 0x4fbf, + 0x504f, 0x6241, 0x7247, 0x7bc7, 0x7de8, 0x7fe9, 0x904d, 0x97ad, 0x9a19, + 0x8cb6, 0x576a, 0x5e73, 0x67b0, 0x840d, 0x8a55, 0x5420, 0x5b16, 0x5e63, + 0x5ee2, 0x5f0a, 0x6583, 0x80ba, 0x853d, 0x9589, 0x965b, 0x4f48, 0x5305, + 0x530d, 0x530f, 0x5486, 0x54fa, 0x5703, 0x5e03, 0x6016, 0x629b, 0x62b1, + 0x6355, 0xfa06, 0x6ce1, 0x6d66, 0x75b1, 0x7832, 0x80de, 0x812f, 0x82de, + 0x8461, 0x84b2, 0x888d, 0x8912, 0x900b, 0x92ea, 0x98fd, 0x9b91, 0x5e45, + 0x66b4, 0x66dd, 0x7011, 0x7206, 0xfa07, 0x4ff5, 0x527d, 0x5f6a, 0x6153, + 0x6753, 0x6a19, 0x6f02, 0x74e2, 0x7968, 0x8868, 0x8c79, 0x98c7, 0x98c4, + 0x9a43, 0x54c1, 0x7a1f, 0x6953, 0x8af7, 0x8c4a, 0x98a8, 0x99ae, 0x5f7c, + 0x62ab, 0x75b2, 0x76ae, 0x88ab, 0x907f, 0x9642, 0x5339, 0x5f3c, 0x5fc5, + 0x6ccc, 0x73cc, 0x7562, 0x758b, 0x7b46, 0x82fe, 0x999d, 0x4e4f, 0x903c, + 0x4e0b, 0x4f55, 0x53a6, 0x590f, 0x5ec8, 0x6630, 0x6cb3, 0x7455, 0x8377, + 0x8766, 0x8cc0, 0x9050, 0x971e, 0x9c15, 0x58d1, 0x5b78, 0x8650, 0x8b14, + 0x9db4, 0x5bd2, 0x6068, 0x608d, 0x65f1, 0x6c57, 0x6f22, 0x6fa3, 0x701a, + 0x7f55, 0x7ff0, 0x9591, 0x9592, 0x9650, 0x97d3, 0x5272, 0x8f44, 0x51fd, + 0x542b, 0x54b8, 0x5563, 0x558a, 0x6abb, 0x6db5, 0x7dd8, 0x8266, 0x929c, + 0x9677, 0x9e79, 0x5408, 0x54c8, 0x76d2, 0x86e4, 0x95a4, 0x95d4, 0x965c, + 0x4ea2, 0x4f09, 0x59ee, 0x5ae6, 0x5df7, 0x6052, 0x6297, 0x676d, 0x6841, + 0x6c86, 0x6e2f, 0x7f38, 0x809b, 0x822a, 0xfa08, 0xfa09, 0x9805, 0x4ea5, + 0x5055, 0x54b3, 0x5793, 0x595a, 0x5b69, 0x5bb3, 0x61c8, 0x6977, 0x6d77, + 0x7023, 0x87f9, 0x89e3, 0x8a72, 0x8ae7, 0x9082, 0x99ed, 0x9ab8, 0x52be, + 0x6838, 0x5016, 0x5e78, 0x674f, 0x8347, 0x884c, 0x4eab, 0x5411, 0x56ae, + 0x73e6, 0x9115, 0x97ff, 0x9909, 0x9957, 0x9999, 0x5653, 0x589f, 0x865b, + 0x8a31, 0x61b2, 0x6af6, 0x737b, 0x8ed2, 0x6b47, 0x96aa, 0x9a57, 0x5955, + 0x7200, 0x8d6b, 0x9769, 0x4fd4, 0x5cf4, 0x5f26, 0x61f8, 0x665b, 0x6ceb, + 0x70ab, 0x7384, 0x73b9, 0x73fe, 0x7729, 0x774d, 0x7d43, 0x7d62, 0x7e23, + 0x8237, 0x8852, 0xfa0a, 0x8ce2, 0x9249, 0x986f, 0x5b51, 0x7a74, 0x8840, + 0x9801, 0x5acc, 0x4fe0, 0x5354, 0x593e, 0x5cfd, 0x633e, 0x6d79, 0x72f9, + 0x8105, 0x8107, 0x83a2, 0x92cf, 0x9830, 0x4ea8, 0x5144, 0x5211, 0x578b, + 0x5f62, 0x6cc2, 0x6ece, 0x7005, 0x7050, 0x70af, 0x7192, 0x73e9, 0x7469, + 0x834a, 0x87a2, 0x8861, 0x9008, 0x90a2, 0x93a3, 0x99a8, 0x516e, 0x5f57, + 0x60e0, 0x6167, 0x66b3, 0x8559, 0x8e4a, 0x91af, 0x978b, 0x4e4e, 0x4e92, + 0x547c, 0x58d5, 0x58fa, 0x597d, 0x5cb5, 0x5f27, 0x6236, 0x6248, 0x660a, + 0x6667, 0x6beb, 0x6d69, 0x6dcf, 0x6e56, 0x6ef8, 0x6f94, 0x6fe0, 0x6fe9, + 0x705d, 0x72d0, 0x7425, 0x745a, 0x74e0, 0x7693, 0x795c, 0x7cca, 0x7e1e, + 0x80e1, 0x82a6, 0x846b, 0x84bf, 0x864e, 0x865f, 0x8774, 0x8b77, 0x8c6a, + 0x93ac, 0x9800, 0x9865, 0x60d1, 0x6216, 0x9177, 0x5a5a, 0x660f, 0x6df7, + 0x6e3e, 0x743f, 0x9b42, 0x5ffd, 0x60da, 0x7b0f, 0x54c4, 0x5f18, 0x6c5e, + 0x6cd3, 0x6d2a, 0x70d8, 0x7d05, 0x8679, 0x8a0c, 0x9d3b, 0x5316, 0x548c, + 0x5b05, 0x6a3a, 0x706b, 0x7575, 0x798d, 0x79be, 0x82b1, 0x83ef, 0x8a71, + 0x8b41, 0x8ca8, 0x9774, 0xfa0b, 0x64f4, 0x652b, 0x78ba, 0x78bb, 0x7a6b, + 0x4e38, 0x559a, 0x5950, 0x5ba6, 0x5e7b, 0x60a3, 0x63db, 0x6b61, 0x6665, + 0x6853, 0x6e19, 0x7165, 0x74b0, 0x7d08, 0x9084, 0x9a69, 0x9c25, 0x6d3b, + 0x6ed1, 0x733e, 0x8c41, 0x95ca, 0x51f0, 0x5e4c, 0x5fa8, 0x604d, 0x60f6, + 0x6130, 0x614c, 0x6643, 0x6644, 0x69a5, 0x6cc1, 0x6e5f, 0x6ec9, 0x6f62, + 0x714c, 0x749c, 0x7687, 0x7bc1, 0x7c27, 0x8352, 0x8757, 0x9051, 0x968d, + 0x9ec3, 0x532f, 0x56de, 0x5efb, 0x5f8a, 0x6062, 0x6094, 0x61f7, 0x6666, + 0x6703, 0x6a9c, 0x6dee, 0x6fae, 0x7070, 0x736a, 0x7e6a, 0x81be, 0x8334, + 0x86d4, 0x8aa8, 0x8cc4, 0x5283, 0x7372, 0x5b96, 0x6a6b, 0x9404, 0x54ee, + 0x5686, 0x5b5d, 0x6548, 0x6585, 0x66c9, 0x689f, 0x6d8d, 0x6dc6, 0x723b, + 0x80b4, 0x9175, 0x9a4d, 0x4faf, 0x5019, 0x539a, 0x540e, 0x543c, 0x5589, + 0x55c5, 0x5e3f, 0x5f8c, 0x673d, 0x7166, 0x73dd, 0x9005, 0x52db, 0x52f3, + 0x5864, 0x58ce, 0x7104, 0x718f, 0x71fb, 0x85b0, 0x8a13, 0x6688, 0x85a8, + 0x55a7, 0x6684, 0x714a, 0x8431, 0x5349, 0x5599, 0x6bc1, 0x5f59, 0x5fbd, + 0x63ee, 0x6689, 0x7147, 0x8af1, 0x8f1d, 0x9ebe, 0x4f11, 0x643a, 0x70cb, + 0x7566, 0x8667, 0x6064, 0x8b4e, 0x9df8, 0x5147, 0x51f6, 0x5308, 0x6d36, + 0x80f8, 0x9ed1, 0x6615, 0x6b23, 0x7098, 0x75d5, 0x5403, 0x5c79, 0x7d07, + 0x8a16, 0x6b20, 0x6b3d, 0x6b46, 0x5438, 0x6070, 0x6d3d, 0x7fd5, 0x8208, + 0x50d6, 0x51de, 0x559c, 0x566b, 0x56cd, 0x59ec, 0x5b09, 0x5e0c, 0x6199, + 0x6198, 0x6231, 0x665e, 0x66e6, 0x7199, 0x71b9, 0x71ba, 0x72a7, 0x79a7, + 0x7a00, 0x7fb2, 0x8a70, 0/* End of table; # of entries=8741(0x2225)+1 */ }; diff --git a/src/cmd/tcs/misc.h b/src/cmd/tcs/misc.h index cb223dae..5afa316a 100644 --- a/src/cmd/tcs/misc.h +++ b/src/cmd/tcs/misc.h @@ -16,14 +16,14 @@ long tabatari[256] = /* from jhelling@cs.ruu.nl (Jeroen Hellingman) */ 0x00bf, 0x2310, 0x00ac, 0x00bd, 0x00bc, 0x00a1, 0x00ab, 0x00bb, 0x00e3, 0x00f5, 0x00d8, 0x00f8, 0x0153, 0x0152, 0x00c0, 0x00c3, 0x00d5, 0x00a8, 0x00b4, 0x2020, 0x00b6, 0x00a9, 0x00ae, 0x2122, -0x0133, 0x0132, +0x0133, 0x0132, 0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, /* hebrew */ 0x05d6, 0x05d7, 0x05d8, 0x05d9, 0x05db, 0x05dc, 0x05de, 0x05e0, 0x05e1, 0x05e2, 0x05e4, 0x05e6, 0x05e7, 0x05e8, 0x05e9, 0x05ea, -0x05df, 0x05da, 0x05dd, 0x05e3, 0x05e5, +0x05df, 0x05da, 0x05dd, 0x05e3, 0x05e5, 0x00a7, 0x2038, 0x221e, /* math */ 0x03b1, 0x03b2, 0x0393, 0x03c0, 0x03a3, 0x03c3, 0x00b5, 0x03c4, /* greek */ -0x03a6, 0x03b8, 0x2126, 0x03b4, +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 @@ -141,7 +141,7 @@ long tabps2[256] = /* from jhelling@cs.ruu.nl (Jeroen Hellingman) */ 0x00a9, 0x2563, 0x2551, 0x2557, 0x255d, 0x00a2, 0x00a5, 0x2510, 0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x00e3, 0x00c3, 0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x00a4, -0x00f0, 0x00d0, 0x00ca, 0x00cb, 0x00c8, 0x0131, 0x00cd, 0x00ce, +0x00f0, 0x00d0, 0x00ca, 0x00cb, 0x00c8, 0x0131, 0x00cd, 0x00ce, 0x00cf, 0x2518, 0x250c, 0x2588, 0x2584, 0x00a6, 0x00cc, 0x2580, 0x00d3, 0x00df, 0x00d4, 0x00d2, 0x00f5, 0x00d5, 0x00b5, 0x00fe, 0x00de, 0x00da, 0x00db, 0x00d9, 0x00fd, 0x00dd, 0x00af, 0x00b4, diff --git a/src/cmd/tcs/ms.h b/src/cmd/tcs/ms.h index 617dd198..90ecfec5 100644 --- a/src/cmd/tcs/ms.h +++ b/src/cmd/tcs/ms.h @@ -5,10 +5,10 @@ for(i in $*){ j=`{echo $i | sed 's;.*./;cp;'} echo long tab$j'[256] = {' - hget http://www.microsoft.com/globaldev/reference/$i.mspx | htmlfmt | + hget http://www.microsoft.com/globaldev/reference/$i.mspx | htmlfmt | 9 grep '^.. = U\+....:' | 9 sed 's/= U\+/ 0x/; s/:.*.//' | awk ' { t[$1] = $2 } - END { + END { for(i=0; i<256; i++) { s = sprintf("%.2X", i); if(s in t) diff --git a/src/cmd/tcs/tcs.c b/src/cmd/tcs/tcs.c index 6722bb6b..d796ba63 100644 --- a/src/cmd/tcs/tcs.c +++ b/src/cmd/tcs/tcs.c @@ -55,7 +55,7 @@ main(int argc, char **argv) break; case 'f': from = EARGF(usage()); - break; + break; case 'l': listem = 1; break; @@ -454,7 +454,7 @@ long tabmsdos[256] = /* from jhelling@cs.ruu.nl (Jeroen Hellingman) */ 0x2555, 0x2563, 0x2551, 0x2557, 0x255d, 0x255c, 0x255b, 0x2510, 0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x255e, 0x255f, 0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x2567, -0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b, +0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b, 0x256a, 0x2518, 0x250c, 0x2588, 0x2584, 0x258c, 0x2590, 0x2580, 0x03b1, 0x00df, 0x0393, 0x03c0, 0x03a3, 0x03c3, 0x00b5, 0x03c4, /* greek */ 0x03a6, 0x0398, 0x2126, 0x03b4, 0x221e, 0x2205, 0x2208, 0x2229, @@ -483,7 +483,7 @@ long tabmsdos2[256] = /* from jhelling@cs.ruu.nl (Jeroen Hellingman) */ 0x2555, 0x2563, 0x2551, 0x2557, 0x255d, 0x255c, 0x255b, 0x2510, 0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x255e, 0x255f, 0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x2567, -0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b, +0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b, 0x256a, 0x2518, 0x250c, 0x2588, 0x2584, 0x258c, 0x2590, 0x2580, 0x03b1, 0x00df, 0x0393, 0x03c0, 0x03a3, 0x03c3, 0x00b5, 0x03c4, /* greek */ 0x03a6, 0x0398, 0x2126, 0x03b4, 0x221e, 0x2205, 0x2208, 0x2229, diff --git a/src/cmd/tcs/tune.c b/src/cmd/tcs/tune.c index 1046b779..5542008d 100644 --- a/src/cmd/tcs/tune.c +++ b/src/cmd/tcs/tune.c @@ -30,7 +30,7 @@ static Tmap t1[] = static Rune t2[] = { - 0x0bcd/*்*/, + 0x0bcd/*்*/, 0x0bcd/*்*/, // filler 0x0bbe/*ா*/, 0x0bbf/*ி*/, @@ -112,7 +112,7 @@ tune_in(int fd, long *x, struct convert *out) Rune rbuf[N]; Rune *r, *er, tr; int c, i; - + USED(x); r = rbuf; er = rbuf+N-3; @@ -159,7 +159,7 @@ tune_in(int fd, long *x, struct convert *out) case 0xe38d/**/: *r++ = 0x0bb6/*ஶ*/; *r++ = 0x0bcd/*்*/; *r++ = 0x0bb0/*ர*/; *r++ = 0x0bc0/*ீ*/; break; - default: + default: if(c >= 0xe200 && c <= 0xe3ff){ if(squawk) EPR "%s: rune 0x%x not in output cs\n", argv0, c); diff --git a/src/cmd/touch.c b/src/cmd/touch.c index 6688293e..471e2b17 100644 --- a/src/cmd/touch.c +++ b/src/cmd/touch.c @@ -27,7 +27,7 @@ main(int argc, char **argv) case 'c': nocreate = 1; break; - default: + default: usage(); }ARGEND diff --git a/src/cmd/tpic/arcgen.c b/src/cmd/tpic/arcgen.c index 9c98d197..de43dcd2 100644 --- a/src/cmd/tpic/arcgen.c +++ b/src/cmd/tpic/arcgen.c @@ -211,4 +211,3 @@ quadrant(double x, double y) else if( x> 0.0 && y<=0.0) return(4); else return 0; /* shut up lint */ } - diff --git a/src/cmd/tpic/linegen.c b/src/cmd/tpic/linegen.c index 8a7e08be..639cdb47 100644 --- a/src/cmd/tpic/linegen.c +++ b/src/cmd/tpic/linegen.c @@ -197,7 +197,7 @@ linegen(int type) extreme(ex, ey); nx = xi; ny = yi; } - + } p->o_ddval = ddval; if (dbg) { diff --git a/src/cmd/tpic/pic.h b/src/cmd/tpic/pic.h index 438e71a6..a11c7478 100644 --- a/src/cmd/tpic/pic.h +++ b/src/cmd/tpic/pic.h @@ -285,4 +285,3 @@ void yyerror(char *s); int yyparse(void); #include "tex.h" - diff --git a/src/cmd/tpic/tex.c b/src/cmd/tpic/tex.c index ade5df6b..678dba60 100644 --- a/src/cmd/tpic/tex.c +++ b/src/cmd/tpic/tex.c @@ -20,7 +20,7 @@ devarc(double x1, double y1, double x2, double y2, double xc, double yc, int r) } void -box(double x0, double y0, double x1, double y1) +box(double x0, double y0, double x1, double y1) { fprintf(TEXFILE," \\special{pa %d %d}",TRX(x0),TRY(y0)); fprintf(TEXFILE,"\\special{pa %d %d}",TRX(x1),TRY(y0)); @@ -104,16 +104,16 @@ frame(double xs, double ys, double xf, double yf) } void -line(double x0, double y0, double x1, double y1) +line(double x0, double y0, double x1, double y1) { move(x0, y0); vec(x1, y1); } void -move(double xx, double yy) +move(double xx, double yy) { - e1->copyx = xx; + e1->copyx = xx; e1->copyy = yy; } @@ -136,7 +136,7 @@ FILE *TEXFILE; void openpl(void) -{ +{ TEXFILE = stdout; space(xmin, ymin, xmax, ymax); @@ -152,7 +152,7 @@ openpl(void) } void -range(double x0, double y0, double x1, double y1) +range(double x0, double y0, double x1, double y1) { e1->xmin = x0; e1->ymin = y0; @@ -165,30 +165,30 @@ range(double x0, double y0, double x1, double y1) } void -rmove(double xx, double yy) +rmove(double xx, double yy) { e1->copyx += xx; e1->copyy += yy; } void -rvec(double xx, double yy) +rvec(double xx, double yy) { vec(xx+e1->copyx, yy+e1->copyy); } void -sbox(double x0, double y0, double x1, double y1) +sbox(double x0, double y0, double x1, double y1) { fprintf(TEXFILE," \\special{bk}%%\n"); box(x0, y0, x1, y1); } void -vec(double xx, double yy) +vec(double xx, double yy) { fprintf(TEXFILE," \\special{pa %d %d}",TRX(e1->copyx),TRY(e1->copyy)); - e1->copyx = xx; + e1->copyx = xx; e1->copyy = yy; fprintf(TEXFILE,"\\special{pa %d %d}",TRX(xx),TRY(yy)); switch(e1->pen){ diff --git a/src/cmd/tr.c b/src/cmd/tr.c index 036967d6..3b20c49b 100644 --- a/src/cmd/tr.c +++ b/src/cmd/tr.c @@ -139,7 +139,7 @@ complement(void) writerune(1, (Rune) from); } } - + } else { while (readrune(0, &from) > 0){ if (from > high) @@ -191,7 +191,7 @@ translit(void) writerune(1, (Rune) from); } } - + } else { while (readrune(0, &from) > 0) { if (from <= high) diff --git a/src/cmd/troff/dwbinit.c b/src/cmd/troff/dwbinit.c index 064a0b02..5ecad041 100644 --- a/src/cmd/troff/dwbinit.c +++ b/src/cmd/troff/dwbinit.c @@ -55,7 +55,7 @@ * NULL, xyzzy, sizeof(xyzzy), * NULL, NULL, 0 * }; - * + * * The last element must have NULL entries for the address and * value fields. The main() routine would then do, * @@ -300,7 +300,7 @@ void DWBprefix( char *prog, char *path, int length) * not great, but should be good enough for now. Also probably should * have DWBhome() only do the lookup once, and remember the value if * called again. - * + * */ if ( strncmp(path, DWBPREFIX, len) == 0 ) { @@ -315,4 +315,3 @@ void DWBprefix( char *prog, char *path, int length) } /* End of DWBprefix */ /*****************************************************************************/ - diff --git a/src/cmd/troff/ext.h b/src/cmd/troff/ext.h index 8df12f2c..4c2fcf9d 100644 --- a/src/cmd/troff/ext.h +++ b/src/cmd/troff/ext.h @@ -184,4 +184,3 @@ extern int c_isalnum; extern char *DWBfontdir; extern char *DWBntermdir; extern char *DWBalthyphens; - diff --git a/src/cmd/troff/mbwc.c b/src/cmd/troff/mbwc.c index c97b036c..39763508 100644 --- a/src/cmd/troff/mbwc.c +++ b/src/cmd/troff/mbwc.c @@ -162,4 +162,3 @@ wcstombs(char *s, const wchar_t *pwcs, size_t n) } return p-s; } - diff --git a/src/cmd/troff/n1.c b/src/cmd/troff/n1.c index c65898ce..adda8c4b 100644 --- a/src/cmd/troff/n1.c +++ b/src/cmd/troff/n1.c @@ -148,7 +148,7 @@ main(int argc, char *argv[]) save_tty(); break; case 'V': - fprintf(stdout, "%croff: DWB %s\n", + fprintf(stdout, "%croff: DWB %s\n", TROFF ? 't' : 'n', DWBVERSION); exit(0); case 't': @@ -436,12 +436,12 @@ g0: return(k); } if (k == FLSS) { - copyf++; + copyf++; raw++; i = getch0(); if (!fi) flss = i; - copyf--; + copyf--; raw--; goto g0; } @@ -456,8 +456,8 @@ g0: } if (k == fc || k == tabch || k == ldrch) { if ((i = setfield(k)) == 0) - goto g0; - else + goto g0; + else return(i); } if (k == '\b') { diff --git a/src/cmd/troff/n10.c b/src/cmd/troff/n10.c index b6be4c51..6f41dae2 100644 --- a/src/cmd/troff/n10.c +++ b/src/cmd/troff/n10.c @@ -319,7 +319,7 @@ void ptout1(void) j = -j; if (isvmot(i)) lead += j; - else + else esc += j; continue; } @@ -432,13 +432,13 @@ char *plot(char *x) } else if (*k & 0200) { if (*k & 0100) { if (*k & 040) - j = t.up; - else + j = t.up; + else j = t.down; } else { if (*k & 040) - j = t.left; - else + j = t.left; + else j = t.right; } if ((i = *k & 037) == 0) { /* 2nd 0200 turns it off */ @@ -447,7 +447,7 @@ char *plot(char *x) } while (i--) oputs(j); - } else + } else oput(*k); } oputs(t.plotoff); @@ -464,8 +464,8 @@ void move(void) iesct = esct; if (esct += esc) - i = "\0"; - else + i = "\0"; + else i = "\n\0"; j = t.hlf; p = t.right; @@ -492,10 +492,10 @@ void move(void) } else { /* no half-line forward, not at line begining */ k = lead / t.Newline; lead = lead % t.Newline; - if (k > 0) + if (k > 0) esc = esct; i = "\n"; - while (k--) + while (k--) oputs(i); } } diff --git a/src/cmd/troff/n2.c b/src/cmd/troff/n2.c index 2943e553..41b2ec1e 100644 --- a/src/cmd/troff/n2.c +++ b/src/cmd/troff/n2.c @@ -53,7 +53,7 @@ int pchar(Tchar i) return 0; } if (ismot(i)) { - pchar1(i); + pchar1(i); return 0; } switch (j = cbits(i)) { @@ -213,7 +213,7 @@ void caseex(void) } -void done(int x) +void done(int x) { int i; @@ -249,7 +249,7 @@ void done(int x) } -void done1(int x) +void done1(int x) { error |= x; if (numtabp[NL].val) { @@ -263,7 +263,7 @@ void done1(int x) } -void done2(int x) +void done2(int x) { ptlead(); if (TROFF && !ascii) @@ -272,7 +272,7 @@ void done2(int x) done3(x); } -void done3(int x) +void done3(int x) { error |= x; flusho(); @@ -284,7 +284,7 @@ void done3(int x) } -void edone(int x) +void edone(int x) { frame = stk; nxf = frame + 1; diff --git a/src/cmd/troff/n3.c b/src/cmd/troff/n3.c index 8279d748..1c7c574f 100644 --- a/src/cmd/troff/n3.c +++ b/src/cmd/troff/n3.c @@ -1,6 +1,6 @@ /* * troff3.c - * + * * macro and string routines, storage allocation */ @@ -137,7 +137,7 @@ void maddhash(Contab *rp) } void munhash(Contab *mp) -{ +{ Contab *p; Contab **lp; @@ -326,7 +326,7 @@ Offset finds(int mn) if (contabp[i].rq == 0) break; } - if (i == nm) + if (i == nm) growcontab(); freeslot = i + 1; if ((nextb = alloc()) == -1) { @@ -531,7 +531,7 @@ Tchar rbf(void) /* return next char from blist[] block */ else return(popi()); } - + i = rbf0(ip); if (i == 0) { if (!app) @@ -596,9 +596,9 @@ Offset pushi(Offset newip, int mname) lastpbp = pbp; pendt = ch = 0; frame = nxf; - if (nxf->nargs == 0) + if (nxf->nargs == 0) nxf += 1; - else + else nxf = (Stack *)argtop; return(ip = newip); } @@ -624,7 +624,7 @@ int getsn(void) return(0); if (i == '(') return(getrq()); - else + else return(i); } @@ -698,7 +698,7 @@ void collect(void) quote = 0; if (cbits(i = getch()) == '"') quote++; - else + else ch = i; while (1) { i = getch(); @@ -850,7 +850,7 @@ void casetl(void) if (ismot(delim = getch())) { ch = delim; delim = '\''; - } else + } else delim = cbits(delim); tp = buf; numtabp[HP].val = 0; @@ -932,7 +932,7 @@ void casepm(void) tcnt++; j = contabp[i].mx; for (k = 1; (j = blist[bindex(j)].nextoff) != -1; ) - k++; + k++; cnt++; kk += k; if (!tot) diff --git a/src/cmd/troff/n4.c b/src/cmd/troff/n4.c index a1abe943..08e06ad3 100644 --- a/src/cmd/troff/n4.c +++ b/src/cmd/troff/n4.c @@ -123,7 +123,7 @@ void setn(void) i = ls; break; case 'R': /* maximal # of regs that can be addressed */ - i = 255*256 - regcnt; + i = 255*256 - regcnt; break; case 'z': p = unpair(dip->curd); @@ -137,7 +137,7 @@ void setn(void) cpushback(cfname[ifi]); return; case 'S': - buf[0] = j = 0; + buf[0] = j = 0; for( i = 0; tabtab[i] != 0 && i < NTAB; i++) { if (i > 0) buf[j++] = ' '; diff --git a/src/cmd/troff/n5.c b/src/cmd/troff/n5.c index 72664327..eab395fe 100644 --- a/src/cmd/troff/n5.c +++ b/src/cmd/troff/n5.c @@ -1,6 +1,6 @@ /* * troff5.c - * + * * misc processing requests */ @@ -30,16 +30,16 @@ void casead(void) case 'c': /*centered adj*/ admod = 1; break; - case 'b': + case 'b': case 'n': admod = 0; break; - case '0': - case '2': + case '0': + case '2': case '4': ad = 0; - case '1': - case '3': + case '1': + case '3': case '5': admod = (i - '0') / 2; } @@ -87,7 +87,7 @@ chget(int c) if (skip() || ismot(i = getch()) || cbits(i) == ' ' || cbits(i) == '\n') { ch = i; return(c); - } else + } else return cbits(i); /* was (i & BYTEMASK) */ } @@ -148,7 +148,7 @@ max(int aa, int bb) { if (aa > bb) return(aa); - else + else return(bb); } @@ -278,7 +278,7 @@ void casepl(void) skip(); if ((i = vnumb(&pl)) == 0) pl = 11 * INCH; /*11in*/ - else + else pl = i; if (numtabp[NL].val > pl) numtabp[NL].val = pl; @@ -321,7 +321,7 @@ void casech(void) skip(); if (!(j = getrq())) return; - else + else for (k = 0; k < NTRAP; k++) if (mlist[k] == j) break; @@ -399,7 +399,7 @@ void casefm(void) ERROR "fm: missing filename" WARN; return; } - + for (i = 0; i < 15 && fcache[i].fp != NULL; i++) { if (strcmp(nextf, fcache[i].name) == 0) break; @@ -418,7 +418,7 @@ void casefm(void) casetm1(0, fcache[i].fp); } -void casetm1(int ab, FILE *out) +void casetm1(int ab, FILE *out) { int i, j, c; char *p; @@ -444,7 +444,7 @@ void casetm1(int ab, FILE *out) trace = savtrac; } } else - skip(); + skip(); for (i = 0; i < NTM - 2; ) { if ((c = cbits(getch())) == '\n' || c == RIGHT) break; @@ -517,7 +517,7 @@ void casesp1(int a) j = vnumb((int *)0); if (nonumb) j = lss; - } else + } else j = a; if (j == 0) return; @@ -525,8 +525,8 @@ void casesp1(int a) j = i; savlss = lss; if (dip != d) - i = dip->dnl; - else + i = dip->dnl; + else i = numtabp[NL].val; if ((i + j) < 0) j = -i; @@ -542,8 +542,8 @@ void casert(void) skip(); if (dip != d) - p = &dip->dnl; - else + p = &dip->dnl; + else p = &numtabp[NL].val; a = vnumb(p); if (nonumb) @@ -594,7 +594,7 @@ e0: ERROR "cannot do .ev %d", nxev WARN; if (error) done2(040); - else + else edone(040); return; } @@ -840,7 +840,7 @@ rdtty(void) if (read(0, &onechar, 1) == 1) { if (onechar == '\n') tty++; - else + else tty = 1; if (tty != 3) return(onechar); @@ -878,7 +878,7 @@ void caseta(void) j = TABMASK; } tabtab[i] = j & TABMASK; - if (!nonumb) + if (!nonumb) switch (cbits(ch)) { case 'C': tabtab[i] |= CTAB; @@ -976,7 +976,7 @@ void caseuf(void) if (skip() || !(i = getrq()) || i == 'S' || (j = findft(i)) == -1) ulfont = ULFONT; /*default underline position*/ - else + else ulfont = j; if (NROFF && ulfont == FT) ulfont = ULFONT; @@ -1022,8 +1022,8 @@ void casemk(void) int i, j; if (dip != d) - j = dip->dnl; - else + j = dip->dnl; + else j = numtabp[NL].val; if (skip()) { dip->mkline = j; diff --git a/src/cmd/troff/n6.c b/src/cmd/troff/n6.c index 69d48f2e..d44e67da 100644 --- a/src/cmd/troff/n6.c +++ b/src/cmd/troff/n6.c @@ -139,7 +139,7 @@ void n_setfont(int a) if (a) i = getrq(); - else + else i = getsn(); if (!i || i == 'P') { j = font1; @@ -188,7 +188,7 @@ void n_setwd(void) k = -k; base -= k; emsz = 0; - } else + } else continue; if (base < numtabp[SB].val) numtabp[SB].val = base; @@ -300,7 +300,7 @@ bd0: if (skip() || !(i = getrq()) || (j = findft(i)) == -1) { if (k) goto bd1; - else + else return; } if (j == smnt) { diff --git a/src/cmd/troff/n7.c b/src/cmd/troff/n7.c index 15bcfd5b..414563c0 100644 --- a/src/cmd/troff/n7.c +++ b/src/cmd/troff/n7.c @@ -15,7 +15,7 @@ Tchar gettch(void); /* * troff7.c - * + * * text */ @@ -73,8 +73,8 @@ void tbreak(void) horiz(un); if (NROFF) { if (adrem % t.Adj) - resol = t.Hor; - else + resol = t.Hor; + else resol = t.Adj; } else resol = HOR; @@ -113,7 +113,7 @@ void tbreak(void) } if (icf) icf++; - else + else ic = 0; ne = nwd = 0; un = in; @@ -168,7 +168,7 @@ void text(void) nflush++; numtabp[HP].val = 0; if ((dip == d) && (numtabp[NL].val == -1)) { - newline(1); + newline(1); return; } setnel(); @@ -180,8 +180,8 @@ void text(void) goto t4; if (pendt) if (spcnt) - goto t2; - else + goto t2; + else goto t3; pendt++; if (spcnt) @@ -226,8 +226,8 @@ t5: adsp = adrem = 0; if (ad) { if (nwd == 1) - adsp = nel; - else + adsp = nel; + else adsp = nel / (nwd - 1); adsp = (adsp / HOR) * HOR; adrem = nel - adsp*(nwd-1); @@ -300,8 +300,8 @@ void callsp(void) int i; if (flss) - i = flss; - else + i = flss; + else i = lss; flss = 0; casesp1(i); @@ -379,7 +379,7 @@ void newline(int a) } if (dip->ditrap && !dip->ditf && dip->dnl >= dip->ditrap && dip->dimac) if (control(dip->dimac, 0)) { - trap++; + trap++; dip->ditf++; } return; @@ -514,7 +514,7 @@ findt1(void) if (dip != d) i = dip->dnl; - else + else i = numtabp[NL].val; return(findt(i)); } @@ -529,7 +529,7 @@ void eject(Stack *a) ejf++; if (a) ejl = a; - else + else ejl = frame; if (trap) return; diff --git a/src/cmd/troff/n8.c b/src/cmd/troff/n8.c index 9ff2ebce..92c42724 100644 --- a/src/cmd/troff/n8.c +++ b/src/cmd/troff/n8.c @@ -11,7 +11,7 @@ /* * troff8.c - * + * * hyphenation */ @@ -59,7 +59,7 @@ void hyphen(Tchar *wp) /* this appears to sort hyphenation points into increasing order */ *hyp++ = 0; - if (*hyptr) + if (*hyptr) for (j = 1; j; ) { j = 0; for (hyp = hyptr + 1; *hyp != 0; hyp++) { @@ -194,7 +194,7 @@ int exword(void) return(0); w = wdstart; while (*e && w <= hyend && (*e & 0177) == maplow(cbits(*w))) { - e++; + e++; w++; } if (!*e) { @@ -209,10 +209,10 @@ int exword(void) } return(1); } else { - e++; + e++; continue; } - } else + } else while (*e++) ; } @@ -249,7 +249,7 @@ again: } s = s0 + i - 1; w = hyend; - if (*s0 & HY_BIT) + if (*s0 & HY_BIT) goto mark; while (s > s0) { w--; @@ -273,7 +273,7 @@ mark: int maplow(int i) { - if (isupper(i)) + if (isupper(i)) i = tolower(i); return(i); } @@ -327,7 +327,7 @@ again: val *= dilook('a', cbits(*w), bxh); else if (w == wdstart + 1) val *= dilook(cbits(*(w-1)), cbits(*w), bxxh); - else + else val *= dilook(cbits(*(w-1)), cbits(*w), xxh); val *= dilook(cbits(*w), cbits(*(w+1)), xhx); val *= dilook(cbits(*(w+1)), cbits(*(w+2)), hxx); diff --git a/src/cmd/troff/n9.c b/src/cmd/troff/n9.c index 3e3ad97f..7c09de02 100644 --- a/src/cmd/troff/n9.c +++ b/src/cmd/troff/n9.c @@ -4,7 +4,7 @@ /* * troff9.c - * + * * misc functions */ @@ -115,7 +115,7 @@ void setov(void) } } } - else + else return; *pbp++ = makem(w[0] / 2); for (k = 0; o[k]; k++) @@ -187,7 +187,7 @@ void setvline(void) } if ((cbits(c = getch())) == delim) { c = BOXRULE | chbits; /*default box rule*/ - } else + } else getch(); c |= ZBIT; neg = 0; @@ -342,9 +342,9 @@ Tchar setfield(int x) static Tchar wbuf[] = { WORDSP, 0}; rchar = 0; - if (x == tabch) + if (x == tabch) rchar = tabc | chbits; - else if (x == ldrch) + else if (x == ldrch) rchar = dotc | chbits; temp = npad = ws = 0; savfc = fc; @@ -381,7 +381,7 @@ Tchar setfield(int x) if (pp > padptr + NPP - 1) break; goto s1; - } else if (j == savfc) + } else if (j == savfc) break; else if (j == '\n') { temp = j; @@ -435,7 +435,7 @@ s1: } if (length) jj = length | MOT; - else + else jj = getch0(); if (savepos > 0) pushback(wbuf); @@ -448,14 +448,14 @@ s1: numtabp[HP].val += jj; widthp = jj; *fp++ = ii; - if (fp > fbuf + FBUFSZ - 3) + if (fp > fbuf + FBUFSZ - 3) break; } *fp++ = ii; *fp = 0; if (type == RTAB) length -= ws; - else + else length -= ws / 2; /*CTAB*/ pushback(fbuf); if ((j = width(rchar)) != 0 && length > 0) { diff --git a/src/cmd/troff/ni.c b/src/cmd/troff/ni.c index ee09ed4a..e12a3a08 100644 --- a/src/cmd/troff/ni.c +++ b/src/cmd/troff/ni.c @@ -387,4 +387,3 @@ void (*ptpause)(void); void (*setfont)(int a); void (*setps)(void); void (*setwd)(void); - diff --git a/src/cmd/troff/t10.c b/src/cmd/troff/t10.c index b037bdda..0c772524 100644 --- a/src/cmd/troff/t10.c +++ b/src/cmd/troff/t10.c @@ -4,7 +4,7 @@ /* * troff10.c - * + * * typesetter interface */ @@ -169,7 +169,7 @@ int ptout0(Tchar *pi) j = -j; if (isvmot(i)) lead += j; - else + else esc += j; return(outsize); } @@ -191,7 +191,7 @@ int ptout0(Tchar *pi) if (sfbits(i) == oldbits) { xfont = pfont; xpts = ppts; - } else + } else xbits(i, 2); if (k == XON) { extern int xon; @@ -232,8 +232,8 @@ int ptout0(Tchar *pi) } if (iszbit(i)) { if (cs) - w = -j; - else + w = -j; + else w = 0; z = 1; } diff --git a/src/cmd/troff/t11.c b/src/cmd/troff/t11.c index f930d8b1..9cd831c9 100644 --- a/src/cmd/troff/t11.c +++ b/src/cmd/troff/t11.c @@ -50,7 +50,7 @@ getdesc(char *name) chadd(s, Troffchar, Install); break; } - /* else + /* else just skip anything else */ skipline(fin); } @@ -83,7 +83,7 @@ static int checkfont(char *name) } fclose(fp); return status; - + } int diff --git a/src/cmd/troff/t6.c b/src/cmd/troff/t6.c index 4a2bd024..1e0dc968 100644 --- a/src/cmd/troff/t6.c +++ b/src/cmd/troff/t6.c @@ -1,6 +1,6 @@ /* * t6.c - * + * * width functions, sizes and fonts */ @@ -46,7 +46,7 @@ t_width(Tchar j) if (sfbits(j) == oldbits) { xfont = pfont; xpts = ppts; - } else + } else xbits(j, 0); if (i < nchnames + ALPHABET && widcache[i].fontpts == (xfont<<8) + xpts && !setwdf) k = widcache[i].width; @@ -129,7 +129,7 @@ getcw(int i) if (setwdf) numtabp[CT].val |= fp->wp[n].kern; } else if (n == -2) { /* \N with default width */ - + k = fp->defaultwidth; } else { /* not on current font */ nocache = 1; @@ -153,8 +153,8 @@ getcw(int i) if (cs = cstab[xfont]) { nocache = 1; if (ccs = ccstab[xfont]) - x = ccs; - else + x = ccs; + else x = xpts; cs = (cs * EMPTS(x)) / 36; } @@ -247,7 +247,7 @@ Tchar t_setch(int c) return j | chbits; } else return chadd(temp, Troffchar, Install) | chbits; /* add name even if haven't seen it */ - + #endif /*UNICODE*/ } @@ -488,7 +488,7 @@ void t_setfont(int a) if (a) i = getrq(); - else + else i = getsn(); if (!i || i == 'P') { j = font1; @@ -538,7 +538,7 @@ void t_setwd(void) k = -k; base -= k; emsz = 0; - } else + } else continue; if (base < numtabp[SB].val) numtabp[SB].val = base; @@ -654,7 +654,7 @@ Tchar getlg(Tchar i) *pbp++ = k; j = LIG_FF; } - } else + } else j = LIG_FF; } else { *pbp++ = j; @@ -694,7 +694,7 @@ void casefp(void) if (i <= 0 || i > nfonts) ERROR "fp: bad font position %d", i WARN; else if (skip() || !(j = getrq())) - ERROR "fp: no font name" WARN; + ERROR "fp: no font name" WARN; else if (skip() || !getname()) setfp(i, j, (char*) 0, 1); else /* 3rd argument = filename */ @@ -745,8 +745,8 @@ setfp(int pos, int f, char *truename, int print) /* mount font f at position pos ptfont(); } if (pos == smnt) { - smnt = 0; - sbold = 0; + smnt = 0; + sbold = 0; } fontlab[pos] = f; if (smnt == 0 && fonts[pos].specfont) @@ -801,7 +801,7 @@ bd0: if (skip() || !(i = getrq()) || (j = findft(i)) == -1) { if (k) goto bd1; - else + else return; } if (j == smnt) { @@ -836,7 +836,7 @@ void casevs(void) i = inumb(&lss); if (nonumb) i = lss1; - if (i < VERT) + if (i < VERT) i = VERT; lss1 = lss; lss = i; diff --git a/src/cmd/troff/tdef.h b/src/cmd/troff/tdef.h index 25c9270c..4e6a4976 100644 --- a/src/cmd/troff/tdef.h +++ b/src/cmd/troff/tdef.h @@ -102,7 +102,7 @@ extern char errbuf[]; /* 0 and 040 don't have any graphic or other function. /* The few that do have a purpose (e.g., \n, \b, \t, ... /* are avoided by the ad hoc choices here. -/* See ifilt[] in n1.c for others -- 1, 2, 3, 5, 6, 7, 010, 011, 012 +/* See ifilt[] in n1.c for others -- 1, 2, 3, 5, 6, 7, 010, 011, 012 */ #define LEADER 001 @@ -189,7 +189,7 @@ extern char errbuf[]; /* 128 for parochial USA 7-bit ascii, */ /* 256 for "European" mode with e.g., Latin-1 */ - /* NCHARS must be greater than + /* NCHARS must be greater than ALPHABET (ascii stuff) + total number of distinct char names from all fonts that will be run in this job (including unnamed ones and \N's) @@ -303,13 +303,13 @@ extern Spnames spnames[]; error. In this version, the array is represented by a list of blocks, pointed to by blist[].bp. Each block is of size BLK Tchars, and BLK MUST be a power of 2 for the macros below to work. - + The blocks associated with a particular string or macro are chained together in the array blist[]. Each blist[i].nextoff contains the Offset associated with the next block in the giant array, or -1 if this is the last block in the chain. If .nextoff is 0, the block is free. - + To find the right index in blist for an Offset, divide by BLK. */ diff --git a/src/cmd/troff2html/troff2html.c b/src/cmd/troff2html/troff2html.c index 9f43946c..d3e30db5 100644 --- a/src/cmd/troff2html/troff2html.c +++ b/src/cmd/troff2html/troff2html.c @@ -299,7 +299,7 @@ emit(Rune r) { emitul(r | attr, 0); /* - * Close man page references early, so that + * Close man page references early, so that * .IR proof (1), * doesn't make the comma part of the link. */ diff --git a/src/cmd/uniq.c b/src/cmd/uniq.c index 88fb9286..152975e0 100644 --- a/src/cmd/uniq.c +++ b/src/cmd/uniq.c @@ -160,10 +160,10 @@ skip(char *s) while(nf++ < fields) { while(*s == ' ' || *s == '\t') s++; - while(!(*s == ' ' || *s == '\t' || *s == 0) ) + while(!(*s == ' ' || *s == '\t' || *s == 0) ) s++; } - while(nl++ < letters && *s != 0) + while(nl++ < letters && *s != 0) s++; return s; } diff --git a/src/cmd/unutf.c b/src/cmd/unutf.c index 0be7aa8e..001a5aa3 100644 --- a/src/cmd/unutf.c +++ b/src/cmd/unutf.c @@ -1,5 +1,5 @@ /* - * stupid little program to pipe unicode chars through + * stupid little program to pipe unicode chars through * when converting to non-utf compilers. */ #include <u.h> diff --git a/src/cmd/upas/bayes/addhash.c b/src/cmd/upas/bayes/addhash.c index 6be960ff..3679b318 100644 --- a/src/cmd/upas/bayes/addhash.c +++ b/src/cmd/upas/bayes/addhash.c @@ -57,10 +57,9 @@ main(int argc, char **argv) if(fd < 0) sysfatal("could not open %s: %r\n", out); } - + Binit(&bout, fd, OWRITE); Bwritehash(&bout, &hash); Bterm(&bout); exits(0); } - diff --git a/src/cmd/upas/bayes/dfa.c b/src/cmd/upas/bayes/dfa.c index ce4dc58a..b038343b 100644 --- a/src/cmd/upas/bayes/dfa.c +++ b/src/cmd/upas/bayes/dfa.c @@ -268,7 +268,7 @@ set(Deter *d, u32int **tab, Rune r) } /* - * Compute the list of important characters. + * Compute the list of important characters. * Other characters behave like the ones that surround them. */ static void @@ -672,7 +672,7 @@ main(int argc, char **argv) dp = dregcvt(p); print("=== dfa\n"); dump(dp); - + for(i=2; i<argc; i++) print("match %d\n", dregexec(dp, argv[i], 0)); exits(0); diff --git a/src/cmd/upas/bayes/dfa.h b/src/cmd/upas/bayes/dfa.h index 28c43dbc..429f04e5 100644 --- a/src/cmd/upas/bayes/dfa.h +++ b/src/cmd/upas/bayes/dfa.h @@ -30,4 +30,3 @@ Dreprog* dregcvt(Reprog*); int dregexec(Dreprog*, char*, int); Dreprog* Breaddfa(Biobuf *b); void Bprintdfa(Biobuf*, Dreprog*); - diff --git a/src/cmd/upas/bayes/dump.c b/src/cmd/upas/bayes/dump.c index 404538c1..c753fb2c 100644 --- a/src/cmd/upas/bayes/dump.c +++ b/src/cmd/upas/bayes/dump.c @@ -60,7 +60,7 @@ main(int argc, char **argv) dp = dregcvt(p); print("=== dfa\n"); dump(dp); - + for(i=2; i<argc; i++) print("match %d\n", dregexec(dp, argv[i], 1)); exits(0); diff --git a/src/cmd/upas/bayes/msgclass.c b/src/cmd/upas/bayes/msgclass.c index 999ba50c..2e80202a 100644 --- a/src/cmd/upas/bayes/msgclass.c +++ b/src/cmd/upas/bayes/msgclass.c @@ -293,4 +293,3 @@ lockfile(char *s) close(fd); atexit(killtickle); } - diff --git a/src/cmd/upas/bayes/msgtok.c b/src/cmd/upas/bayes/msgtok.c index 122e0c64..fe147961 100644 --- a/src/cmd/upas/bayes/msgtok.c +++ b/src/cmd/upas/bayes/msgtok.c @@ -1,6 +1,6 @@ /* * RFC822 message tokenizer (really feature generator) for spam filter. - * + * * See Paul Graham's musings on spam filtering for theory. */ @@ -138,7 +138,7 @@ fprint(2, "«%s» %.2ux", p, p[0]); p[i] += 'a' - 'A'; */ if(tag){ - i = strlen(tag); + i = strlen(tag); memmove(buf, tag, i); memmove(buf+i, p, m[1]); buf[i+m[1]] = 0; @@ -242,5 +242,4 @@ trim(char *s) return 0; } return -1; -} - +} diff --git a/src/cmd/upas/bayes/regcomp.c b/src/cmd/upas/bayes/regcomp.c index 8afaf215..96fa2e6e 100644 --- a/src/cmd/upas/bayes/regcomp.c +++ b/src/cmd/upas/bayes/regcomp.c @@ -110,7 +110,7 @@ regerr2(char *s, int c) while(*s) *cp++ = *s++; *cp++ = c; - *cp = '\0'; + *cp = '\0'; rcerror(buf); } diff --git a/src/cmd/upas/bayes/regen.c b/src/cmd/upas/bayes/regen.c index cddf034a..d5f14cb5 100644 --- a/src/cmd/upas/bayes/regen.c +++ b/src/cmd/upas/bayes/regen.c @@ -8,7 +8,7 @@ * Regular expression for matching. */ -char *ignore[] = +char *ignore[] = { /* HTML that isn't A, IMG, or FONT */ /* Must have a space somewhere to avoid catching <email@address> */ @@ -122,7 +122,7 @@ buildre(Dreprog *re[3]) static char buf[16384], *s; re[0] = dregcomp("^From "); - + s = buf; for(i=0; i<nelem(keywords); i++){ if(i != 0) @@ -172,5 +172,3 @@ main(int argc, char **argv) Bprintdfa(&b, re[2]); exits(0); } - -
\ No newline at end of file diff --git a/src/cmd/upas/common/common.h b/src/cmd/upas/common/common.h index 7a26dea1..0fae80f8 100644 --- a/src/cmd/upas/common/common.h +++ b/src/cmd/upas/common/common.h @@ -18,7 +18,7 @@ enum Elemlen= 28, Errlen= 128, Pathlen= 256, - + RetryCode = 2 }; @@ -76,5 +76,3 @@ extern process *proc_start(char*, stream*, stream*, stream*, int, char*); extern int proc_wait(process*); extern int proc_free(process*); extern int proc_kill(process*); - - diff --git a/src/cmd/upas/common/config.c b/src/cmd/upas/common/config.c index 8d1e7a02..97ce9cc2 100644 --- a/src/cmd/upas/common/config.c +++ b/src/cmd/upas/common/config.c @@ -14,7 +14,7 @@ void upasconfig(void) { static int did; - + if(did) return; did = 1; diff --git a/src/cmd/upas/common/libsys.c b/src/cmd/upas/common/libsys.c index b439cfde..2ed19494 100644 --- a/src/cmd/upas/common/libsys.c +++ b/src/cmd/upas/common/libsys.c @@ -198,7 +198,7 @@ trylock(char *path) free(l); return 0; } - + /* fork process to keep lock alive */ switch(l->pid = rfork(RFPROC)){ default: @@ -470,7 +470,7 @@ sysnames_read(void) for(p=h->h_aliases; *p; p++) ; - + namev = malloc((2+p-h->h_aliases)*sizeof namev[0]); if(namev == 0) return 0; @@ -709,7 +709,7 @@ mboxpath(char *path, char *user, String *to, int dot) { char *dir; String *s; - + if (dot || *path=='/' || strncmp(path, "./", 2) == 0 || strncmp(path, "../", 3) == 0) { to = s_append(to, path); @@ -801,7 +801,7 @@ remoteaddr(int fd, char *dir) { char *raddr; NetConnInfo *nci; - + if((nci = getnetconninfo(dir, fd)) == nil) return nil; raddr = strdup(nci->raddr); diff --git a/src/cmd/upas/common/process.c b/src/cmd/upas/common/process.c index 56725a88..f593d551 100644 --- a/src/cmd/upas/common/process.c +++ b/src/cmd/upas/common/process.c @@ -18,7 +18,7 @@ instream(void) return 0; } rv->fp = &rv->bb; - rv->fd = pfd[0]; + rv->fd = pfd[0]; return rv; } diff --git a/src/cmd/upas/filterkit/list.c b/src/cmd/upas/filterkit/list.c index 1913c6de..51a50e98 100644 --- a/src/cmd/upas/filterkit/list.c +++ b/src/cmd/upas/filterkit/list.c @@ -286,7 +286,7 @@ add(char *pp, int argc, char **argv) s_free(s); } close(fd); - return nil; + return nil; } void diff --git a/src/cmd/upas/filterkit/readaddrs.c b/src/cmd/upas/filterkit/readaddrs.c index 9aadc1ab..6ab9ed95 100644 --- a/src/cmd/upas/filterkit/readaddrs.c +++ b/src/cmd/upas/filterkit/readaddrs.c @@ -32,7 +32,7 @@ tokenize822(char *str, char **args, int max) int intok = 0, inquote = 0; if(max <= 0) - return 0; + return 0; for(na=0; ;str++) switch(*str) { case ' ': diff --git a/src/cmd/upas/filterkit/token.c b/src/cmd/upas/filterkit/token.c index 4e91e261..86564c2b 100644 --- a/src/cmd/upas/filterkit/token.c +++ b/src/cmd/upas/filterkit/token.c @@ -18,7 +18,7 @@ mktoken(char *key, long thetime) uchar digest[SHA1dlen]; char token[64]; String *s; - + now = ctime(thetime); memset(now+11, ':', 8); hmac_sha1((uchar*)now, strlen(now), (uchar*)key, strlen(key), digest, nil); @@ -45,7 +45,7 @@ check_token(char *key, char *file) if(i < 0) return "no match"; buf[i] = 0; - + now = time(0); for(i = 0; i < 14; i++){ diff --git a/src/cmd/upas/fs/dat.h b/src/cmd/upas/fs/dat.h index 14208ed6..6264822d 100644 --- a/src/cmd/upas/fs/dat.h +++ b/src/cmd/upas/fs/dat.h @@ -218,4 +218,3 @@ void henter(ulong, char*, Qid, Message*, Mailbox*); void hfree(ulong, char*); ulong msgallocd, msgfreed; - diff --git a/src/cmd/upas/fs/fs.c b/src/cmd/upas/fs/fs.c index 9fa433d8..dc6ff3ba 100644 --- a/src/cmd/upas/fs/fs.c +++ b/src/cmd/upas/fs/fs.c @@ -760,7 +760,7 @@ rwalk(Fid *f) for(i = 0; i < thdr.nwname; i++){ rv = dowalk(f, thdr.wname[i]); if(rv != nil){ - if(nf != nil) + if(nf != nil) rclunk(nf); break; } @@ -827,7 +827,7 @@ readtopdir(Fid* dummy, uchar *buf, long off, int cnt, int blen) cnt -= m; } pos += m; - + for(mb = mbl; mb != nil; mb = mb->next){ mkstat(&d, mb, nil, Qmbox); m = convD2M(&d, &buf[n], blen-n); @@ -872,7 +872,7 @@ readmboxdir(Fid *f, uchar *buf, long off, int cnt, int blen) } else { msg = f->mb->root->part; pos = 0; - } + } for(; cnt > 0 && msg != nil; msg = msg->next){ /* act like deleted files aren't there */ @@ -1301,7 +1301,7 @@ struct Ignorance Ignorance *ignorance; /* - * read the file of headers to ignore + * read the file of headers to ignore */ void readignore(void) diff --git a/src/cmd/upas/fs/imap4.c b/src/cmd/upas/fs/imap4.c index 48119fa7..7fcc51b5 100644 --- a/src/cmd/upas/fs/imap4.c +++ b/src/cmd/upas/fs/imap4.c @@ -136,7 +136,7 @@ imapgrow(Imap *imap, int n) int i; if(imap->data == nil){ - imap->base = emalloc(n+1); + imap->base = emalloc(n+1); imap->data = imap->base; imap->size = n+1; } @@ -165,7 +165,7 @@ imap4resp(Imap *imap) ep = p+Blinelen(&imap->bin); while(ep > p && (ep[-1]=='\n' || ep[-1]=='\r')) *--ep = '\0'; - + if(imap->debug) fprint(2, "<- %s\n", p); strupr(p); @@ -186,7 +186,7 @@ imap4resp(Imap *imap) if(*p==' ') p++; verb = p; - + if(p = strchr(verb, ' ')) p++; else @@ -221,7 +221,7 @@ imap4resp(Imap *imap) /* <3031 bytes of data> */ /* ) */ if(strstr(p, "RFC822.SIZE") && strstr(p, "BODY[]")){ - if((q = strchr(p, '{')) + if((q = strchr(p, '{')) && (n=strtol(q+1, &en, 0), *en=='}')){ if(imap->data == nil || n >= imap->size) imapgrow(imap, n); @@ -268,7 +268,7 @@ imap4resp(Imap *imap) /* ) */ /* * 1 FETCH (UID 1 RFC822.HEADER "data") */ if(strstr(p, "RFC822.HEADER") || strstr(p, "RFC822.TEXT")){ - if((q = strchr(p, '{')) + if((q = strchr(p, '{')) && (n=strtol(q+1, &en, 0), *en=='}')){ if(imap->data == nil || n >= imap->size) imapgrow(imap, n); diff --git a/src/cmd/upas/fs/mbox.c b/src/cmd/upas/fs/mbox.c index 2f483747..b77306d6 100644 --- a/src/cmd/upas/fs/mbox.c +++ b/src/cmd/upas/fs/mbox.c @@ -721,7 +721,7 @@ ctype(Message *m, Header *h, char *p) p = skipwhite(p); p = getstring(p, m->type, 1); - + while(*p){ if(isattribute(&p, "boundary")){ s = s_new(); @@ -741,7 +741,7 @@ ctype(Message *m, Header *h, char *p) } else if(isattribute(&p, "charset")){ p = getstring(p, s_reset(m->charset), 0); } - + p = skiptosemi(p); } } @@ -1598,4 +1598,3 @@ date822tounix(char *s) *q = '\0'; return s_copy(p); } - diff --git a/src/cmd/upas/fs/pop3.c b/src/cmd/upas/fs/pop3.c index da8021dd..d41d2b48 100644 --- a/src/cmd/upas/fs/pop3.c +++ b/src/cmd/upas/fs/pop3.c @@ -506,7 +506,7 @@ pop3read(Pop *pop, Mailbox *mb, int doplumb) (Qid){PATH(mb->id, Qmbox), mb->vers, QTDIR}, nil, mb); } - return nil; + return nil; } /* */ @@ -695,4 +695,3 @@ pop3mbox(Mailbox *mb, char *path) return nil; } - diff --git a/src/cmd/upas/fs/strtotm.c b/src/cmd/upas/fs/strtotm.c index bcf0bcee..09a7914d 100644 --- a/src/cmd/upas/fs/strtotm.c +++ b/src/cmd/upas/fs/strtotm.c @@ -20,7 +20,7 @@ skipwhite(char *q) static char* months[] = { "jan", "feb", "mar", "apr", - "may", "jun", "jul", "aug", + "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec" }; @@ -81,7 +81,7 @@ strtotm(char *p, Tm *tmp) continue; /* look for time zone [A-Z][A-Z]T */ - if(q-p==3 && 'A' <= p[0] && p[0] <= 'Z' + if(q-p==3 && 'A' <= p[0] && p[0] <= 'Z' && 'A' <= p[1] && p[1] <= 'Z' && p[2] == 'T'){ strecpy(tm.zone, tm.zone+4, p); continue; diff --git a/src/cmd/upas/fs/tester.c b/src/cmd/upas/fs/tester.c index 3d24012e..30c15b31 100644 --- a/src/cmd/upas/fs/tester.c +++ b/src/cmd/upas/fs/tester.c @@ -51,7 +51,7 @@ info(int indent, int mno, Message *m) info(indent+1, i++, nm); } } - + void main(int argc, char **argv) diff --git a/src/cmd/upas/marshal/marshal.c b/src/cmd/upas/marshal/marshal.c index 8ebd3957..e83328e9 100644 --- a/src/cmd/upas/marshal/marshal.c +++ b/src/cmd/upas/marshal/marshal.c @@ -334,7 +334,7 @@ threadmain(int argc, char **argv) close(fd); threadexitsall(waitforsubprocs()); } - + if(Binit(&out, fd, OWRITE) < 0) fatal("can't Binit 1: %r"); @@ -689,7 +689,7 @@ attachment(Attach *a, Biobuf *out) free(f); return; } - + /* if it's not already mime encoded ... */ if(strcmp(a->type, "text/plain") != 0) Bprint(out, "Content-Type: %s\n", a->type); @@ -822,7 +822,7 @@ int mopen(char *file, int mode) { int fd; - + if((fd = open(file, mode)) >= 0) return fd; if(strncmp(file, "Mail/", 5) == 0 && mountmail() >= 0 && (fd = fsopenfd(mailfs, file+5, mode)) >= 0) @@ -890,7 +890,7 @@ mkattach(char *file, char *type, int inline) a->type = "application/octet-stream"; /* safest default */ if(pipe(pfd) < 0) return a; - + xfd[0] = mopen(file, OREAD); xfd[1] = pfd[0]; xfd[2] = dup(2, -1); @@ -955,7 +955,7 @@ static void teeproc(void *v) { int *a; - + a = v; tee(a[0], a[1], a[2]); write(a[2], "\n", 1); @@ -1094,7 +1094,7 @@ sendmail(Addr *to, Addr *cc, int *pid, char *rcvr) if(pipe(pfd) < 0) fatal("pipe: %r"); - + xfd[0] = pfd[0]; xfd[1] = dup(1, -1); xfd[2] = dup(2, -1); @@ -1122,7 +1122,7 @@ sendmail(Addr *to, Addr *cc, int *pid, char *rcvr) proccreate(teeproc, targ, STACK); sfd = pfd[1]; } - + return sfd; } @@ -1348,7 +1348,7 @@ readaliases(void) addr->next = 0; *al = addr; al = &addr->next; - } + } if(a->addr == nil || a->addr->next == nil){ freealias(a); continue; @@ -1592,7 +1592,7 @@ get822token(String **tok, char *p, char **pp) type = Twords; quoting = 0; for(; *p && (quoting || (!ISWHITE(*p) && *p != '>' && *p != '<' && *p != ',')); p++) { - if(*p == '"') + if(*p == '"') quoting = !quoting; if(*p == '\\') { if(*(p+1) == '\0') { @@ -1609,7 +1609,7 @@ get822token(String **tok, char *p, char **pp) *pp = p; *tok = s_copyn(op, p-op); return type; -} +} /* expand local aliases in an RFC822 mail line */ /* add list of expanded addresses to to. */ @@ -1717,7 +1717,7 @@ expandline(String **s, Addr *to) nto = nil; werrstr("rfc822 syntax error"); rfc822syntaxerror = 1; - goto Break2; + goto Break2; } } Break2: @@ -1893,7 +1893,7 @@ hard: fmtprint(fmt, "=%.2uX", (uchar)*p); else fmtrune(fmt, (uchar)*p); - } + } fmtprint(fmt, "?="); return 0; } diff --git a/src/cmd/upas/misc/mail.c b/src/cmd/upas/misc/mail.c index 20cf2397..bf2cff56 100644 --- a/src/cmd/upas/misc/mail.c +++ b/src/cmd/upas/misc/mail.c @@ -48,4 +48,3 @@ main (argc, argv) perror (realprog); exit (1); } - diff --git a/src/cmd/upas/ml/common.c b/src/cmd/upas/ml/common.c index 307a4925..c389d639 100644 --- a/src/cmd/upas/ml/common.c +++ b/src/cmd/upas/ml/common.c @@ -185,7 +185,7 @@ sendnotification(char *addr, char *listname, int rem) fprint(pfd[1], "the word 'remove' in the subject or body.\n"); } close(pfd[1]); - + /* wait for mailer to end */ while(w = wait()){ if(w->msg != nil && w->msg[0]) diff --git a/src/cmd/upas/ml/ml.c b/src/cmd/upas/ml/ml.c index 8dad0517..a135b051 100644 --- a/src/cmd/upas/ml/ml.c +++ b/src/cmd/upas/ml/ml.c @@ -56,7 +56,7 @@ main(int argc, char **argv) if(s_read_line(&in, firstline) == nil) sysfatal("reading input: %r"); - /* read up to the first 128k of the message. more is redculous. + /* read up to the first 128k of the message. more is redculous. Not if word documents are distributed. Upped it to 2MB (pb) */ if(s_read(&in, msg, 2*1024*1024) <= 0) sysfatal("reading input: %r"); diff --git a/src/cmd/upas/ned/nedmail.c b/src/cmd/upas/ned/nedmail.c index ef0f731c..6acd73e4 100644 --- a/src/cmd/upas/ned/nedmail.c +++ b/src/cmd/upas/ned/nedmail.c @@ -212,7 +212,7 @@ plural(int n) if (n == 1) return ""; - return "s"; + return "s"; } void @@ -366,7 +366,7 @@ mkaddrs(char *t) int i, nf, inquote; char **f, *s; Fmt fmt; - + inquote = 0; nf = 2; for(s=t; *s; s++){ @@ -402,7 +402,7 @@ file2message(Message *parent, char *name) String *path; char *f[30], *s, *t; int i, nf; - + m = mallocz(sizeof(Message), 1); if(m == nil) return nil; @@ -425,7 +425,7 @@ file2message(Message *parent, char *name) if(t == nil) continue; *t++ = 0; - + if(strcmp(s, "from") == 0) m->from = mkaddrs(t); else if(strcmp(s, "to") == 0) @@ -475,7 +475,7 @@ dir2message(Message *parent, int reverse) { int i, n, highest, newmsgs; CFid *fd; - + Dir *d; Message *first, *last, *m; @@ -972,7 +972,7 @@ parseaddr(char **pp, Message *first, Message *cur, Message *unspec, Message **mp goto number; } *mp = unspec; - break; + break; case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': n = strtoul(p, pp, 10); @@ -1191,7 +1191,7 @@ parsecmd(char *p, Cmd *cmd, Message *first, Message *cur) free(prog); } } else { - + /* parse an address */ s = e = nil; err = parseaddr(&p, first, cur, cur, &s); @@ -1207,7 +1207,7 @@ parsecmd(char *p, Cmd *cmd, Message *first, Message *cur) err = parseaddr(&p, first, cur, last, &e); if(err != nil) return err; - + /* select all messages in the range */ for(; s != nil; s = s->next){ *l = s; @@ -1258,7 +1258,7 @@ parsecmd(char *p, Cmd *cmd, Message *first, Message *cur) } cmd->f = cmdtab[i].f; } - return nil; + return nil; } /* inefficient read from standard input */ @@ -1511,7 +1511,7 @@ pcmd(Cmd *x, Message *m) Bprint(&out, "\n!--- using plumber to display message of type %s\n", m->type); else Bprint(&out, "\n!--- cannot display messages of type %s\n", m->type); - + return m; } @@ -1684,7 +1684,7 @@ Message* ycmd(Cmd *x, Message *m) { USED(x); - + doflush = 1; return icmd(nil, m); @@ -1839,7 +1839,7 @@ tokenize822(char *str, char **args, int max) int intok = 0, inquote = 0; if(max <= 0) - return 0; + return 0; for(na=0; ;str++) switch(*str) { case ' ': @@ -2452,9 +2452,9 @@ switchmb(char *file, char *singleton) fd = open("/mail/fs/ctl", ORDWR); if(fd < 0) sysfatal("can't open /mail/fs/ctl: %r"); - + path = s_new(); - + /* get an absolute path to the mail box */ if(strncmp(file, "./", 2) == 0){ /* resolve path here since upas/fs doesn't know */ @@ -2468,7 +2468,7 @@ switchmb(char *file, char *singleton) } else { mboxpath(file, user, path, 0); } - + /* make up a handle to use when talking to fs */ p = strrchr(file, '/'); if(p == nil){ diff --git a/src/cmd/upas/nfs/box.c b/src/cmd/upas/nfs/box.c index 202111f8..a3525f0f 100644 --- a/src/cmd/upas/nfs/box.c +++ b/src/cmd/upas/nfs/box.c @@ -30,7 +30,7 @@ Box* subbox(Box *b, char *elem) { int i; - + for(i=0; i<b->nsub; i++) if(b->sub[i] && strcmp(b->sub[i]->elem, elem) == 0) return b->sub[i]; @@ -41,7 +41,7 @@ Box* boxbyid(uint id) { int i; - + /* LATER: replace with binary search */ for(i=0; i<nboxes; i++) if(boxes[i] && boxes[i]->id == id) @@ -54,10 +54,10 @@ boxcreate(char *name) { char *p; Box *b, *bb; - + if((b = boxbyname(name)) != nil) return b; - + b = emalloc(sizeof *b); b->id = ++boxid; b->time = time(0); @@ -87,7 +87,7 @@ void boxfree(Box *b) { int i; - + if(b == nil) return; for(i=0; i<b->nmsg; i++) @@ -100,12 +100,12 @@ Part* partcreate(Msg *m, Part *pp) { Part *p; - + if(m->npart%PartChunk == 0) m->part = erealloc(m->part, (m->npart+PartChunk)*sizeof m->part[0]); p = emalloc(sizeof *p); p->msg = m; - p->ix = m->npart; + p->ix = m->npart; m->part[m->npart++] = p; if(pp){ if(pp->nsub%PartSubChunk == 0) @@ -121,7 +121,7 @@ void partfree(Part *p) { int i; - + if(p == nil) return; for(i=0; i<p->nsub; i++) @@ -145,7 +145,7 @@ void msgfree(Msg *m) { int i; - + if(m == nil) return; for(i=0; i<m->npart; i++) @@ -162,7 +162,7 @@ msgplumb(Msg *m, int delete) Plumbattr a[10]; char buf[256], date[40]; int ai; - + if(m == nil || m->npart < 1 || m->part[0]->hdr == nil) return; if(m->box && strcmp(m->box->name, "mbox") != 0) @@ -176,7 +176,7 @@ msgplumb(Msg *m, int delete) ai = 0; a[ai].name = "filetype"; a[ai].value = "mail"; - + a[++ai].name = "mailtype"; a[ai].value = delete?"delete":"new"; a[ai-1].next = &a[ai]; @@ -198,15 +198,15 @@ msgplumb(Msg *m, int delete) a[ai].value = m->part[0]->hdr->digest; a[ai-1].next = &a[ai]; } - + strcpy(date, ctime(m->date)); date[strlen(date)-1] = 0; /* newline */ a[++ai].name = "date"; a[ai].value = date; a[ai-1].next = &a[ai]; - + a[ai].next = nil; - + p.attr = a; #ifdef PLAN9PORT snprint(buf, sizeof buf, "Mail/%s/%ud", m->box->name, m->id); @@ -215,7 +215,7 @@ msgplumb(Msg *m, int delete) #endif p.ndata = strlen(buf); p.data = buf; - + if(fd < 0) fd = plumbopen("send", OWRITE); if(fd < 0) @@ -229,7 +229,7 @@ Msg* msgcreate(Box *box) { Msg *m; - + m = emalloc(sizeof *m); m->box = box; partcreate(m, nil); @@ -319,4 +319,3 @@ boxinit(void) rootbox->name = estrdup(""); rootbox->time = time(0); } - diff --git a/src/cmd/upas/nfs/box.h b/src/cmd/upas/nfs/box.h index 9ca3b8f9..bbb3851e 100644 --- a/src/cmd/upas/nfs/box.h +++ b/src/cmd/upas/nfs/box.h @@ -31,7 +31,7 @@ struct Box Msg** msg; /* array of messages (can have nils) */ uint nmsg; - + char* imapname; /* name on IMAP server */ u32int validity; /* IMAP validity number */ uint uidnext; /* IMAP expected next uid */ @@ -73,7 +73,7 @@ struct Msg uint flags; /* FlagDeleted etc. */ uint date; /* smtp envelope date */ uint size; - + Part** part; /* message subparts - part[0] is root */ uint npart; }; @@ -132,4 +132,3 @@ extern Box** boxes; extern uint nboxes; extern Box* rootbox; - diff --git a/src/cmd/upas/nfs/decode.c b/src/cmd/upas/nfs/decode.c index 3f8c4c68..0ad78ec4 100644 --- a/src/cmd/upas/nfs/decode.c +++ b/src/cmd/upas/nfs/decode.c @@ -25,7 +25,7 @@ _decqp(uchar *out, int lim, char *in, int n, int underscores) { char *p, *ep; uchar *eout, *out0; - + out0 = out; eout = out+lim; for(p=in, ep=in+n; p<ep && out<eout; ){ @@ -73,7 +73,7 @@ decode(int kind, char *s, int *len) *len = l; t[l] = 0; return t; - + case Base64: l = strlen(s)+1; t = emalloc(l); @@ -127,7 +127,7 @@ static void twriter(void *v) { Writeargs *w; - + w = v; write(w->fd, w->s, strlen(w->s)); close(w->fd); @@ -216,13 +216,13 @@ unrfc2047(char *s) int len; Rune r; Fmt fmt; - + if(s == nil) return nil; if(strstr(s, "=?") == nil) return s; - + fmtstrinit(&fmt); for(p=s; *p; ){ /* =?charset?e?text?= */ @@ -270,7 +270,7 @@ unrfc2047(char *s) } #ifdef TEST -char *test[] = +char *test[] = { "hello world", "hello =?iso-8859-1?q?this is some text?=", @@ -288,7 +288,7 @@ void threadmain(int argc, char **argv) { int i; - + for(i=0; i<nelem(test); i++) print("%s\n\t%s\n", test[i], unrfc2047(estrdup(test[i]))); threadexitsall(0); diff --git a/src/cmd/upas/nfs/fs.c b/src/cmd/upas/nfs/fs.c index 69cd6b5a..361a3561 100644 --- a/src/cmd/upas/nfs/fs.c +++ b/src/cmd/upas/nfs/fs.c @@ -1,8 +1,8 @@ /* * Mail file system. - * + * * Serve the bulk of requests out of memory, so they can - * be in the main loop (will never see their flushes). + * be in the main loop (will never see their flushes). * Some requests do block and they get handled in * separate threads. They're all okay to give up on * early, though, so we just respond saying interrupted @@ -16,7 +16,7 @@ TO DO: digest disposition filename - + ctl messages fetch mail on demand @@ -48,7 +48,7 @@ enum Qbcc, Qinreplyto, Qmessageid, - + /* part data - same order as stuct Part */ Qtype, Qidstr, @@ -60,7 +60,7 @@ enum Qrawheader, Qrawbody, Qmimeheader, - + /* part numbers - same order as struct Part */ Qsize, Qlines, @@ -75,7 +75,7 @@ enum Qrawunix, Qunixdate, Qunixheader, - + Qfile0 = Qbody, Qnfile = Qunixheader+1-Qfile0 }; @@ -98,7 +98,7 @@ void responderror(Req *r) { char e[ERRMAX]; - + rerrstr(e, sizeof e); respond(r, e); } @@ -132,7 +132,7 @@ Qid qid(int ctl, Box *box, Msg *msg, Part *part) { Qid q; - + q.type = 0; if(ctl == Qroot || ctl == Qbox || ctl == Qmsg) q.type = QTDIR; @@ -150,7 +150,7 @@ parseqid(Qid q, Box **box, Msg **msg, Part **part) { *msg = nil; *part = nil; - + *box = boxbyid(qboxid(q)); if(*box){ *msg = msgbyid(*box, qmsgid(q)); @@ -198,7 +198,7 @@ char* nameoftype(int t) { int i; - + for(i=0; i<nelem(typenames); i++) if(typenames[i].type == t) return typenames[i].name; @@ -209,7 +209,7 @@ int typeofname(char *name) { int i; - + for(i=0; i<nelem(typenames); i++) if(strcmp(typenames[i].name, name) == 0) return typenames[i].type; @@ -246,7 +246,7 @@ fswalk1(Fid *fid, char *name, void *arg) Part *p, *part; USED(arg); - + switch(type = parseqid(fid->qid, &box, &msg, &part)){ case Qroot: if(strcmp(name, "..") == 0) @@ -347,7 +347,7 @@ addaddrs(Fmt *fmt, char *prefix, char *addrs) char **f; int i, nf, inquote; char *p, *sep; - + if(addrs == nil) return; addrs = estrdup(addrs); @@ -409,7 +409,7 @@ mkbody(Part *p, Qid q) } static Qid ZQ; - + static int filedata(int type, Box *box, Msg *msg, Part *part, char **pp, int *len, int *freeme, int force, Qid q) { @@ -444,7 +444,7 @@ filedata(int type, Box *box, Msg *msg, Part *part, char **pp, int *len, int *fre } *pp = ((char**)&part->hdr->date)[type-Qdate]; return 0; - + case Qunixdate: strcpy(buf, ctime(msg->date)); *pp = buf; @@ -630,7 +630,7 @@ filedata(int type, Box *box, Msg *msg, Part *part, char **pp, int *len, int *fre if(part->hdr->from==nil || (part->hdr->sender && strcmp(part->hdr->sender, part->hdr->from) != 0)) addaddrs(&fmt, "Sender", part->hdr->sender); - if(part->hdr->from==nil + if(part->hdr->from==nil || (part->hdr->replyto && strcmp(part->hdr->replyto, part->hdr->from) != 0)) addaddrs(&fmt, "Reply-To", part->hdr->replyto); fmtprint(&fmt, "Subject: %s\n", part->hdr->subject); @@ -681,7 +681,7 @@ filldir(Dir *d, int type, Box *box, Msg *msg, Part *part) case Qsearch: d->mode = 0666; break; - + case Qflags: d->mode = 0666; goto msgfile; @@ -736,7 +736,7 @@ filldir(Dir *d, int type, Box *box, Msg *msg, Part *part) } return 0; } - + static void fsstat(Req *r) { @@ -744,7 +744,7 @@ fsstat(Req *r) Box *box; Msg *msg; Part *part; - + type = parseqid(r->fid->qid, &box, &msg, &part); if(filldir(&r->d, type, box, msg, part) < 0) responderror(r); @@ -756,7 +756,7 @@ int rootgen(int i, Dir *d, void *aux) { USED(aux); - + if(i == 0) return filldir(d, Qctl, nil, nil, nil); i--; @@ -786,17 +786,17 @@ boxgen(int i, Dir *d, void *aux) } static int msgdir[] = { - Qtype, - Qbody, Qbcc, Qcc, Qdate, Qflags, Qfrom, Qheader, Qinfo, - Qinreplyto, Qlines, Qmimeheader, Qmessageid, + Qtype, + Qbody, Qbcc, Qcc, Qdate, Qflags, Qfrom, Qheader, Qinfo, + Qinreplyto, Qlines, Qmimeheader, Qmessageid, Qraw, Qrawunix, Qrawbody, Qrawheader, Qreplyto, Qsender, Qsubject, Qto, Qunixdate, Qunixheader }; static int mimemsgdir[] = { - Qtype, - Qbody, Qbcc, Qcc, Qdate, Qfrom, Qheader, Qinfo, - Qinreplyto, Qlines, Qmimeheader, Qmessageid, + Qtype, + Qbody, Qbcc, Qcc, Qdate, Qfrom, Qheader, Qinfo, + Qinreplyto, Qlines, Qmimeheader, Qmessageid, Qraw, Qrawunix, Qrawbody, Qrawheader, Qreplyto, Qsender, Qsubject, Qto }; @@ -808,14 +808,14 @@ static int mimedir[] = { Qmimeheader, Qraw }; - + int msggen(int i, Dir *d, void *aux) { Box *box; Msg *msg; Part *part; - + part = aux; msg = part->msg; box = msg->box; @@ -875,7 +875,7 @@ fsread(Req *r) Box *box; Msg *msg; Part *part; - + switch(type = parseqid(r->fid->qid, &box, &msg, &part)){ case Qroot: dirread9p(r, rootgen, nil); @@ -906,7 +906,7 @@ fsread(Req *r) dirread9p(r, msggen, part); respond(r, nil); return; - + case Qctl: case Qboxctl: respond(r, Egreg); @@ -937,7 +937,7 @@ mkmsglist(Box *box, char **f, int nf, Msg ***mm) { int i, nm; Msg **m; - + m = emalloc(nf*sizeof m[0]); nm = 0; for(i=0; i<nf; i++) @@ -1012,7 +1012,7 @@ fswrite(Req *r) respond(r, nil); free(m); break; - + case CMjunk: flag = FlagJunk; goto flagit; @@ -1188,7 +1188,7 @@ static void fsthread(void *v) { Req *r; - + r = v; switch(r->ifcall.type){ case Tread: @@ -1255,10 +1255,9 @@ fsinit0(void) /* bad planning - clash with lib9pclient */ fs.write = fssend; fs.stat = fssend; fs.destroyfid = fsdestroyfid; - + rootqid = qid(Qroot, nil, nil, nil); - + fsreqchan = chancreate(sizeof(void*), 0); mailthread(fsrecv, nil); } - diff --git a/src/cmd/upas/nfs/imap.c b/src/cmd/upas/nfs/imap.c index ef76487b..5249e2e7 100644 --- a/src/cmd/upas/nfs/imap.c +++ b/src/cmd/upas/nfs/imap.c @@ -41,7 +41,7 @@ struct Imap static struct { char *name; int flag; -} flagstab[] = +} flagstab[] = { "Junk", FlagJunk, "NonJunk", FlagNonJunk, @@ -116,20 +116,20 @@ imapconnect(char *server, int mode, char *root, char *user) z->fd = -1; z->autoreconnect = 0; z->io = ioproc(); - + qlock(&z->lk); if(imapreconnect(z) < 0){ free(z); return nil; } - + z->r.l = &z->rlk; z->autoreconnect = 1; qunlock(&z->lk); - + proccreate(imaptimerproc, z, STACK); mailthread(imaprefreshthread, z); - + return z; } @@ -231,7 +231,7 @@ getboxes(Imap *z) { int i; Box **r, **w, **e; - + for(i=0; i<nboxes; i++){ boxes[i]->mark = 1; boxes[i]->exists = 0; @@ -260,10 +260,10 @@ getbox(Imap *z, Box *b) { int i; Msg **r, **w, **e; - + if(b == nil) return 0; - + for(i=0; i<b->nmsg; i++) b->msg[i]->imapid = 0; if(imapcmd(z, b, "UID FETCH 1:* FLAGS") < 0) @@ -294,7 +294,7 @@ static void imaptimerproc(void *v) { Imap *z; - + z = v; for(;;){ sleep(60*1000); @@ -323,13 +323,13 @@ static void imaprefreshthread(void *v) { Imap *z; - + z = v; for(;;){ qlock(z->r.l); rsleep(&z->r); qunlock(z->r.l); - + qlock(&z->lk); if(z->inbox) checkbox(z, z->inbox); @@ -347,7 +347,7 @@ imapvcmdsx0(Imap *z, char *fmt, va_list arg, int dotag) Fmt f; int len; Sx *sx; - + if(canqlock(&z->lk)) abort(); @@ -380,7 +380,7 @@ imapcmdsx0(Imap *z, char *fmt, ...) { va_list arg; Sx *sx; - + va_start(arg, fmt); sx = imapvcmdsx0(z, fmt, arg, 1); va_end(arg); @@ -395,7 +395,7 @@ imapvcmdsx(Imap *z, Box *b, char *fmt, va_list arg, int dotag) { int tries; Sx *sx; - + tries = 0; z->nextbox = b; @@ -478,7 +478,7 @@ static Sx* imapwaitsx(Imap *z) { Sx *sx; - + while((sx = zBrdsx(z)) != nil){ if(chattyimap) fprint(2, "<| %#$\n", sx); @@ -534,7 +534,7 @@ static void fetch1(Imap *z, Part *p, char *s) { qlock(&z->lk); - imapcmd(z, p->msg->box, "UID FETCH %d BODY[%s]", + imapcmd(z, p->msg->box, "UID FETCH %d BODY[%s]", p->msg->imapuid, bodyname(p, s)); qunlock(&z->lk); } @@ -569,7 +569,7 @@ imaplistcmd(Imap *z, Box *box, char *before, Msg **m, uint nm, char *after) int i, r; char *cmd; Fmt fmt; - + if(nm == 0) return 0; @@ -582,7 +582,7 @@ imaplistcmd(Imap *z, Box *box, char *before, Msg **m, uint nm, char *after) } fmtprint(&fmt, " %s", after); cmd = fmtstrflush(&fmt); - + r = 0; if(imapcmd(z, box, "%s", cmd) < 0) r = -1; @@ -595,7 +595,7 @@ imapcopylist(Imap *z, char *nbox, Msg **m, uint nm) { int rv; char *name, *p; - + if(nm == 0) return 0; @@ -617,7 +617,7 @@ int imapremovelist(Imap *z, Msg **m, uint nm) { int rv; - + if(nm == 0) return 0; @@ -636,7 +636,7 @@ imapflaglist(Imap *z, int op, int flag, Msg **m, uint nm) char *mod, *s, *sep; int i, rv; Fmt fmt; - + if(op > 0) mod = "+"; else if(op == 0) @@ -655,7 +655,7 @@ imapflaglist(Imap *z, int op, int flag, Msg **m, uint nm) } fmtprint(&fmt, ")"); s = fmtstrflush(&fmt); - + qlock(&z->lk); rv = imaplistcmd(z, m[0]->box, "UID STORE", m, nm, s); qunlock(&z->lk); @@ -726,7 +726,7 @@ _ioimapdial(va_list *arg) { char *server; int mode; - + server = va_arg(*arg, char*); mode = va_arg(*arg, int); return imapdial(server, mode); @@ -742,7 +742,7 @@ _ioBrdsx(va_list *arg) { Biobuf *b; Sx **sx; - + b = va_arg(*arg, Biobuf*); sx = va_arg(*arg, Sx**); *sx = Brdsx(b); @@ -779,12 +779,12 @@ imapdial(char *server, int mode) int fd[3]; char *tmp; char *fpath; - + switch(mode){ default: case Unencrypted: return dial(netmkaddr(server, "tcp", "143"), nil, nil, nil); - + case Starttls: werrstr("starttls not supported"); return -1; @@ -818,7 +818,7 @@ imapdial(char *server, int mode) free(tmp); close(p[0]); return p[1]; - + case Cmd: if(pipe(p) < 0) return -1; @@ -912,7 +912,7 @@ static int sxmatch(Sx *sx, char *fmt) { int i; - + for(i=0; fmt[i]; i++){ if(fmt[i] == '*') fmt--; /* like i-- but better */ @@ -994,7 +994,7 @@ static int isatom(Sx *v, char *name) { int n; - + if(v == nil || v->type != SxAtom) return 0; n = strlen(name); @@ -1021,7 +1021,7 @@ isnumber(Sx *sx) static int isnil(Sx *v) { - return v == nil || + return v == nil || (v->type==SxList && v->nsx == 0) || (v->type==SxAtom && strcmp(v->data, "NIL") == 0); } @@ -1036,7 +1036,7 @@ static uint parseflags(Sx *v) { int f, i, j; - + if(v->type != SxList){ warn("malformed flags: %$", v); return 0; @@ -1051,13 +1051,13 @@ parseflags(Sx *v) } return f; } - + static char months[] = "JanFebMarAprMayJunJulAugSepOctNovDec"; static int parsemon(char *s) { int i; - + for(i=0; months[i]; i+=3) if(memcmp(s, months+i, 3) == 0) return i/3; @@ -1071,13 +1071,13 @@ parsedate(Sx *v) uint t; int delta; char *p; - + if(v->type != SxString || !stringmatch("01-Aaa-1111 01:11:11 +1111", v->data)){ bad: warn("bad date: %$", v); return 0; } - + /* cannot use atoi because 09 is malformed octal! */ memset(&tm, 0, sizeof tm); p = v->data; @@ -1095,7 +1095,7 @@ parsedate(Sx *v) delta = ((p[22]-'0')*10+p[23]-'0')*3600 + ((p[24]-'0')*10+p[25]-'0')*60; if(p[21] == '-') delta = -delta; - + t -= delta; return t; } @@ -1123,7 +1123,7 @@ parseenvelope(Sx *v) Hdr *hdr; uchar digest[16]; DigestState ds; - + if(v->type != SxList || !sxmatch(v, "SSLLLLLLSS")){ warn("bad envelope: %$", v); return nil; @@ -1140,7 +1140,7 @@ parseenvelope(Sx *v) hdr->bcc = copyaddrs(v->sx[7]); hdr->inreplyto = unrfc2047(nstring(v->sx[8])); hdr->messageid = unrfc2047(nstring(v->sx[9])); - + memset(&ds, 0, sizeof ds); hash(&ds, "date", hdr->date); hash(&ds, "subject", hdr->subject); @@ -1162,7 +1162,7 @@ static void strlwr(char *s) { char *t; - + if(s == nil) return; for(t=s; *t; t++) @@ -1174,7 +1174,7 @@ static void nocr(char *s) { char *r, *w; - + if(s == nil) return; for(r=w=s; *r; r++) @@ -1191,7 +1191,7 @@ gsub(char *s, char *a, char *b) { char *p, *t, *w, *last; int n; - + n = 0; for(p=s; (p=strstr(p, a)) != nil; p+=strlen(a)) n++; @@ -1256,7 +1256,7 @@ unexpected(Imap *z, Sx *sx) name = sx->sx[1]->data; }else return; - + for(i=0; i<nelem(unextab); i++){ if(unextab[i].num == num && cistrcmp(unextab[i].name, name) == 0){ if(unextab[i].fmt && !sxmatch(sx, unextab[i].fmt)){ @@ -1304,9 +1304,9 @@ xlist(Imap *z, Sx *sx) free(s); s = t; } - - /* - * Plan 9 calls the main mailbox mbox. + + /* + * Plan 9 calls the main mailbox mbox. * Rename any existing mbox by appending a $. */ if(!inbox && strncmp(s, "mbox", 4) == 0 && alldollars(s+4)){ @@ -1352,7 +1352,7 @@ xflags(Imap *z, Sx *sx) /* * This response contains in sx->sx[2] the list of flags * that can be validly attached to messages in z->box. - * We don't have any use for this list, since we + * We don't have any use for this list, since we * use only the standard flags. */ } @@ -1396,7 +1396,7 @@ static void xsearch(Imap *z, Sx *sx) { int i; - + free(z->uid); z->uid = emalloc((sx->nsx-2)*sizeof z->uid[0]); z->nuid = sx->nsx-2; @@ -1404,7 +1404,7 @@ xsearch(Imap *z, Sx *sx) z->uid[i] = sx->sx[i+2]->number; } -/* +/* * Table-driven FETCH message info parser. */ static void xmsgflags(Msg*, Sx*, Sx*); @@ -1496,7 +1496,7 @@ static char* nstring(Sx *v) { char *p; - + if(isnil(v)) return estrdup(""); p = v->data; @@ -1511,7 +1511,7 @@ copyaddrs(Sx *v) char *name, *email, *host, *mbox; int i; Fmt fmt; - + if(v->nsx == 0) return nil; @@ -1565,7 +1565,7 @@ parseparams(Part *part, Sx *v) { int i, j; char *s, *t, **p; - + if(isnil(v)) return; if(v->nsx%2){ @@ -1586,7 +1586,7 @@ parseparams(Part *part, Sx *v) } free(s); free(t); - } + } } static void @@ -1594,7 +1594,7 @@ parsestructure(Part *part, Sx *v) { int i; char *s, *t; - + if(isnil(v)) return; if(v->type != SxList){ @@ -1627,7 +1627,7 @@ parsestructure(Part *part, Sx *v) strlwr(t); free(part->type); part->type = esmprint("%s/%s", s, t); - if(v->nsx < 7 || !islist(v->sx[2]) || !isstring(v->sx[3]) + if(v->nsx < 7 || !islist(v->sx[2]) || !isstring(v->sx[3]) || !isstring(v->sx[4]) || !isstring(v->sx[5]) || !isnumber(v->sx[6])) goto bad; parseparams(part, v->sx[2]); @@ -1676,13 +1676,13 @@ xmsgbodydata(Msg *msg, Sx *k, Sx *v) int i; char *name, *p; Part *part; - + name = k->data; name += 5; /* body[ */ p = strchr(name, ']'); if(p) *p = 0; - + /* now name is something like 1 or 3.2.MIME - walk down parts from root */ part = msg->part[0]; @@ -1777,7 +1777,7 @@ xokuidvalidity(Imap *z, Sx *sx) { int i; Box *b; - + if((b=z->box) == nil) return; if(b->validity != sx->number){ @@ -1822,4 +1822,3 @@ xokreadonly(Imap *z, Sx *sx) USED(sx); /* z->boxmode = OREAD; */ } - diff --git a/src/cmd/upas/nfs/main.c b/src/cmd/upas/nfs/main.c index ebcf701c..c72a4849 100644 --- a/src/cmd/upas/nfs/main.c +++ b/src/cmd/upas/nfs/main.c @@ -67,13 +67,13 @@ threadmain(int argc, char **argv) break; }ARGEND - quotefmtinstall(); + quotefmtinstall(); fmtinstall('$', sxfmt); if(argc != 1) usage(); server = argv[0]; - + mailthreadinit(); boxinit(); fsinit0(); @@ -82,4 +82,3 @@ threadmain(int argc, char **argv) sysfatal("imapconnect: %r"); threadpostmountsrv(&fs, srvname, mtpt, 0); } - diff --git a/src/cmd/upas/nfs/mbox.c b/src/cmd/upas/nfs/mbox.c index 5f90f0a2..1b60ffa6 100644 --- a/src/cmd/upas/nfs/mbox.c +++ b/src/cmd/upas/nfs/mbox.c @@ -8,7 +8,7 @@ static void markboxes(int mark) { Mailbox *b; - + for(i=0; i<nbox; i++) if(box[i]) box[i]->mark = mark; @@ -18,7 +18,7 @@ static void sweepboxes(void) { Mailbox *b; - + for(i=0; i<nbox; i++) if(box[i] && box[i]->mark){ freembox(box[i]); @@ -30,7 +30,7 @@ static Mailbox* mboxbyname(char *name) { int i; - + for(i=0; i<nbox; i++) if(box[i] && strcmp(box[i]->name, name) == 0) return box[i]; @@ -49,7 +49,7 @@ static Mailbox* mboxcreate(char *name) { Mailbox *b; - + b = emalloc(sizeof *b); b->name = estrdup(name); if(nbox%64 == 0) diff --git a/src/cmd/upas/nfs/msg.c b/src/cmd/upas/nfs/msg.c index f4a26862..622841a6 100644 --- a/src/cmd/upas/nfs/msg.c +++ b/src/cmd/upas/nfs/msg.c @@ -6,4 +6,3 @@ cache flushes optionally to disk before being tossed out reload from disk, then from server - diff --git a/src/cmd/upas/nfs/sx.c b/src/cmd/upas/nfs/sx.c index 65d338c2..55e2934e 100644 --- a/src/cmd/upas/nfs/sx.c +++ b/src/cmd/upas/nfs/sx.c @@ -7,7 +7,7 @@ Brdsx(Biobuf *b) { Sx **sx, *x; int nsx; - + nsx = 0; sx = nil; while((x = Brdsx1(b)) != nil){ @@ -21,11 +21,11 @@ Brdsx(Biobuf *b) return x; } -int +int sxwalk(Sx *sx) { int i, n; - + if(sx == nil) return 1; switch(sx->type){ @@ -46,7 +46,7 @@ void freesx(Sx *sx) { int i; - + if(sx == nil) return; switch(sx->type){ @@ -70,7 +70,7 @@ Brdsx1(Biobuf *b) char *s; vlong n; Sx *x; - + c = Bgetc(b); if(c == ' ') c = Bgetc(b); @@ -144,7 +144,7 @@ Brdsx1(Biobuf *b) s = emalloc(1); s[0] = c; nbr = 0; - while((c = Bgetc(b)) >= 0 && c > ' ' && !strchr("(){}", c)){ + while((c = Bgetc(b)) >= 0 && c > ' ' && !strchr("(){}", c)){ /* allow embedded brackets as in BODY[] */ if(c == '['){ if(s[0] == '[') @@ -169,7 +169,7 @@ Brdsx1(Biobuf *b) x->type = SxAtom; x->data = s; x->ndata = len; - return x; + return x; } int @@ -177,7 +177,7 @@ sxfmt(Fmt *fmt) { int i, paren; Sx *sx; - + sx = va_arg(fmt->args, Sx*); if(sx == nil) return 0; @@ -211,7 +211,7 @@ sxfmt(Fmt *fmt) int oksx(Sx *sx) { - return sx->nsx >= 2 - && sx->sx[1]->type == SxAtom + return sx->nsx >= 2 + && sx->sx[1]->type == SxAtom && cistrcmp(sx->sx[1]->data, "OK") == 0; } diff --git a/src/cmd/upas/nfs/sx.h b/src/cmd/upas/nfs/sx.h index 38a801d4..696b5a70 100644 --- a/src/cmd/upas/nfs/sx.h +++ b/src/cmd/upas/nfs/sx.h @@ -28,4 +28,3 @@ void freesx(Sx*); int oksx(Sx*); int sxfmt(Fmt*); int sxwalk(Sx*); - diff --git a/src/cmd/upas/nfs/thread.c b/src/cmd/upas/nfs/thread.c index bb40def1..b4c893ee 100644 --- a/src/cmd/upas/nfs/thread.c +++ b/src/cmd/upas/nfs/thread.c @@ -13,7 +13,7 @@ void mailthread(void (*fn)(void*), void *arg) { New n; - + n.fn = fn; n.arg = arg; send(mailthreadchan, &n); @@ -23,7 +23,7 @@ void mailproc(void *v) { New n; - + USED(v); while(recv(mailthreadchan, &n) == 1) threadcreate(n.fn, n.arg, STACK); @@ -35,4 +35,3 @@ mailthreadinit(void) mailthreadchan = chancreate(sizeof(New), 0); proccreate(mailproc, nil, STACK); } - diff --git a/src/cmd/upas/nfs/util.c b/src/cmd/upas/nfs/util.c index ac9deba8..048eef05 100644 --- a/src/cmd/upas/nfs/util.c +++ b/src/cmd/upas/nfs/util.c @@ -4,7 +4,7 @@ void warn(char *fmt, ...) { va_list arg; - + va_start(arg, fmt); fprint(2, "warning: "); vfprint(2, fmt, arg); diff --git a/src/cmd/upas/pop3/pop3.c b/src/cmd/upas/pop3/pop3.c index af674368..4974a8b5 100644 --- a/src/cmd/upas/pop3/pop3.c +++ b/src/cmd/upas/pop3/pop3.c @@ -63,7 +63,7 @@ static int passwordinclear; static int didtls; typedef struct Msg Msg; -struct Msg +struct Msg { int upasnum; char digest[64]; @@ -575,7 +575,7 @@ stlscmd(char*) Binit(&out, 1, OWRITE); didtls = 1; return 0; -} +} static int topcmd(char *arg) @@ -643,7 +643,7 @@ uidlcmd(char *arg) return senderr("no such message"); sendok("%d %s", n+1, msg[n].digest); } - return 0; + return 0; } static char* @@ -746,7 +746,7 @@ dologin(char *response) if(tries++ >= 5){ senderr("authentication failed: %r; server exiting"); exits(nil); - } + } return senderr("authentication failed"); } @@ -801,4 +801,3 @@ apopcmd(char *arg) return -1; return dologin(resp); } - diff --git a/src/cmd/upas/scanmail/common.c b/src/cmd/upas/scanmail/common.c index 2e368504..30301424 100644 --- a/src/cmd/upas/scanmail/common.c +++ b/src/cmd/upas/scanmail/common.c @@ -277,7 +277,7 @@ htmlchk(char **msg, char *end) p = *msg; if(ishtml == 0){ ishtml = htmlmatch(htmlcmds, p, end, &n); - + /* If not an HTML keyword, check if it's * an HTML comment (<!comment>). if so, * skip over it; otherwise copy it in. @@ -287,7 +287,7 @@ htmlchk(char **msg, char *end) } else if(htmlmatch(hrefs, p, end, &n)) /* if special HTML string */ return '<'; /* copy it */ - + /* * this is an uninteresting HTML command; skip over it. */ diff --git a/src/cmd/upas/scanmail/testscan.c b/src/cmd/upas/scanmail/testscan.c index 48cd4bbf..79399c8b 100644 --- a/src/cmd/upas/scanmail/testscan.c +++ b/src/cmd/upas/scanmail/testscan.c @@ -110,7 +110,7 @@ main(int argc, char *argv[]) exits("open"); } Binit(&bin, fd, OREAD); - } else + } else Binit(&bin, 0, OREAD); *body = 0; diff --git a/src/cmd/upas/send/bind.c b/src/cmd/upas/send/bind.c index 8a8fc8ea..05327975 100644 --- a/src/cmd/upas/send/bind.c +++ b/src/cmd/upas/send/bind.c @@ -130,4 +130,3 @@ forward_loop(char *addr, char *system) return 1; return 0; } - diff --git a/src/cmd/upas/send/main.c b/src/cmd/upas/send/main.c index 6c455833..15a2026e 100644 --- a/src/cmd/upas/send/main.c +++ b/src/cmd/upas/send/main.c @@ -122,7 +122,7 @@ main(int argc, char *argv[]) /* * If this is a gateway, translate the sender address into a local - * address. This only happens if mail to the local address is + * address. This only happens if mail to the local address is * forwarded to the sender. */ gateway(mp); diff --git a/src/cmd/upas/send/message.c b/src/cmd/upas/send/message.c index 3ec8d706..60dd050b 100644 --- a/src/cmd/upas/send/message.c +++ b/src/cmd/upas/send/message.c @@ -224,7 +224,7 @@ rfc822cruft(message *mp) if(p->addr){ cp = skipequiv(s_to_c(p->s)); s_append(body, cp); - } else + } else s_append(body, s_to_c(p->s)); }else{ s_putc(body, p->c); @@ -494,7 +494,7 @@ int isutf8(String *s) { char *p; - + for(p = s_to_c(s); *p; p++) if(*p&0x80) return 1; diff --git a/src/cmd/upas/send/rewrite.c b/src/cmd/upas/send/rewrite.c index 3f30d4f3..3b19da27 100644 --- a/src/cmd/upas/send/rewrite.c +++ b/src/cmd/upas/send/rewrite.c @@ -3,7 +3,7 @@ extern int debug; -/* +/* * Routines for dealing with the rewrite rules. */ @@ -249,7 +249,7 @@ substitute(String *source, Resub *subexp, message *mp) char *s; char *sp; String *stp; - + if(source == 0) return 0; sp = s_to_c(source); @@ -292,7 +292,7 @@ substitute(String *source, Resub *subexp, message *mp) s_putc(stp, *sp); break; } - } else if(*sp == '&') { + } else if(*sp == '&') { if(subexp[0].s.sp != 0) for (s = subexp[0].s.sp; s < subexp[0].e.ep; s++) @@ -345,4 +345,3 @@ dumprules(void) fprint(2, " '%s'\n", rp->repl2 ? rp->repl2->base:"..."); } } - diff --git a/src/cmd/upas/send/skipequiv.c b/src/cmd/upas/send/skipequiv.c index f40181ad..d5bf0bb1 100644 --- a/src/cmd/upas/send/skipequiv.c +++ b/src/cmd/upas/send/skipequiv.c @@ -41,7 +41,7 @@ okfile(char *cp, Biobuf *fp) len = strlen(cp); Bseek(fp, 0, 0); - + /* one iteration per system name in the file */ while(buf = Brdline(fp, '\n')) { ep = &buf[Blinelen(fp)]; diff --git a/src/cmd/upas/smtp/mxdial.c b/src/cmd/upas/smtp/mxdial.c index 56962dcd..f7a009af 100644 --- a/src/cmd/upas/smtp/mxdial.c +++ b/src/cmd/upas/smtp/mxdial.c @@ -171,7 +171,7 @@ mxlookup(DS *ds, char *domain) { int i, n, nmx; Ndbtuple *t, *tmx, *tpref, *tip; - + strcpy(domain, ds->host); ds->netdir = "/net"; nmx = 0; @@ -184,7 +184,7 @@ mxlookup(DS *ds, char *domain) nmx++; break; } - } + } } ndbfree(t); } @@ -216,14 +216,14 @@ mxlookup(DS *ds, char *domain) strncpy(mx[i].ip, tip->val, sizeof(mx[i].ip)-1); ndbfree(t); continue; - + no: /* remove mx[i] and go around again */ nmx--; mx[i] = mx[nmx]; i--; } - return nmx; + return nmx; } static int diff --git a/src/cmd/upas/smtp/smtp.c b/src/cmd/upas/smtp/smtp.c index 92873723..88d7f7a4 100644 --- a/src/cmd/upas/smtp/smtp.c +++ b/src/cmd/upas/smtp/smtp.c @@ -60,7 +60,7 @@ void usage(void) { fprint(2, "usage: smtp [-adips] [-uuser] [-hhost] [.domain] net!host[!service] sender rcpt-list\n"); - threadexitsall(Giveup); + threadexitsall(Giveup); } int @@ -656,7 +656,7 @@ data(String *from, Biobuf *b) nbytes += Bprint(&bout, "Message-ID: <%s@%s>\r\n", id, hostdomain); if(debug) Bprint(&berr, "Message-ID: <%s@%s>\r\n", id, hostdomain); - } + } if(originator==0){ nbytes += Bprint(&bout, "From: %s\r\n", s_to_c(fromline)); @@ -687,7 +687,7 @@ data(String *from, Biobuf *b) /* * send body */ - + putcrnl(uneaten, buf+n - uneaten); nbytes += buf+n - uneaten; if(eof == 0){ @@ -1109,14 +1109,14 @@ dBputc(int x) return Bputc(&bout, x); } -char* +char* expand_addr(char *addr) { static char buf[256]; char *p, *q, *name, *sys; Ndbtuple *t; Ndb *db; - + p = strchr(addr, '!'); if(p){ q = strchr(p+1, '!'); @@ -1131,7 +1131,7 @@ expand_addr(char *addr) name++; if(q) *q = 0; - + sys = sysname(); db = ndbopen(0); t = ndbipinfo(db, "sys", sys, &name, 1); @@ -1141,7 +1141,7 @@ expand_addr(char *addr) *q = '!'; return addr; } - + *(name-1) = 0; if(q) *q = '!'; diff --git a/src/cmd/upas/smtp/smtpd.c b/src/cmd/upas/smtp/smtpd.c index e59dbddd..df722c10 100644 --- a/src/cmd/upas/smtp/smtpd.c +++ b/src/cmd/upas/smtp/smtpd.c @@ -304,7 +304,7 @@ hello(String *himp, int extended) if (extended) { if(tlscert != nil) reply("250-STARTTLS\r\n"); - if (passwordinclear) + if (passwordinclear) reply("250 AUTH CRAM-MD5 PLAIN LOGIN\r\n"); else reply("250 AUTH CRAM-MD5\r\n"); @@ -1101,7 +1101,7 @@ sendermxcheck(void) * Could add an option with the remote IP address * to allow validatesender to implement SPF eventually. */ - execl(validate, "validatesender", + execl(validate, "validatesender", "-n", nci->root, senddom, user, nil); threadexitsall("exec validatesender: %r"); default: @@ -1165,7 +1165,7 @@ data(void) reply("450 %s\r\n", errx); for(l=rcvers.first; l; l=l->next) syslog(0, "smtpd", "[%s/%s] %s -> %s sendercheck: %s", - him, nci->rsys, s_to_c(senders.first->p), + him, nci->rsys, s_to_c(senders.first->p), s_to_c(l->p), errx); rejectcount++; return; @@ -1214,7 +1214,7 @@ data(void) code = 554; } else { syslog(0, "smtpd", "++[%s/%s] %s %s %s%s%sreturned %#q %s", him, nci->rsys, - s_to_c(senders.first->p), s_to_c(cmd), + s_to_c(senders.first->p), s_to_c(cmd), piperror ? "error during pipemsg: " : "", piperror ? piperror : "", piperror ? "; " : "", diff --git a/src/cmd/upas/smtp/smtpd.h b/src/cmd/upas/smtp/smtpd.h index bb982a2f..9f8cdffa 100644 --- a/src/cmd/upas/smtp/smtpd.h +++ b/src/cmd/upas/smtp/smtpd.h @@ -11,7 +11,7 @@ enum { MAXREJECTS = 100 }; - + typedef struct Link Link; typedef struct List List; diff --git a/src/cmd/upas/smtp/spam.c b/src/cmd/upas/smtp/spam.c index 723e341d..2422dfe9 100644 --- a/src/cmd/upas/smtp/spam.c +++ b/src/cmd/upas/smtp/spam.c @@ -26,7 +26,7 @@ static Keyword options[] = { "norelay", NORELAY, "verifysenderdom", DNSVERIFY, "saveblockedmsg", SAVEBLOCK, - "defaultdomain", DOMNAME, + "defaultdomain", DOMNAME, "ournets", OURNETS, "ourdomains", OURDOMS, 0, NONE @@ -84,7 +84,7 @@ getaction(char *s, char *type) return ACCEPT; for(k = actions; k->name != 0; k++){ - snprint(buf, sizeof buf, "%s/mail/ratify/%s/%s/%s", + snprint(buf, sizeof buf, "%s/mail/ratify/%s/%s/%s", get9root(), k->name, type, s); if(access(buf,0) >= 0) return k->code; @@ -435,7 +435,7 @@ cidrcheck(char *cp) if((v4peerip&m) == a) return 1; cp += strlen(cp)+1; - } + } return 0; } @@ -508,7 +508,7 @@ recipok(char *user) int pid; Waitmsg *w; static int beenhere; - + if(!beenhere){ beenhere++; validator = unsharp(validator); diff --git a/src/cmd/upas/vf/unvf.c b/src/cmd/upas/vf/unvf.c index aecbca62..7269da90 100644 --- a/src/cmd/upas/vf/unvf.c +++ b/src/cmd/upas/vf/unvf.c @@ -15,10 +15,10 @@ main(void) Biobuf b, b1; char *p, *encoding; int e, len; - + Binit(&b, 0, OREAD); Binit(&b1, 1, OWRITE); - + /* header */ encoding = nil; while((p = Brdstr(&b, '\n', 1)) != nil){ @@ -58,7 +58,7 @@ main(void) } /* - * decode quoted + * decode quoted */ enum { @@ -153,4 +153,3 @@ decquoted(char *out, char *in, char *e) return p - out; } - diff --git a/src/cmd/upas/vf/vf.c b/src/cmd/upas/vf/vf.c index fb54d4a1..5aab37fe 100644 --- a/src/cmd/upas/vf/vf.c +++ b/src/cmd/upas/vf/vf.c @@ -213,7 +213,7 @@ part(Part *pp) passnotheader(); return part(p); } else { - /* + /* * This is the meat. This may be an executable. * if so, wrap it and change its type */ @@ -390,7 +390,7 @@ save(Part *p, char *file) Bprint(&out, "\n"); Bterm(&out); close(fd); - + memset(&out, 0, sizeof out); Binit(&out, 1, OWRITE); return 0; @@ -404,7 +404,7 @@ savetmp(Part *p) { char buf[40], *name; int fd; - + strcpy(buf, "/var/tmp/vf.XXXXXXXXXXX"); if((fd = mkstemp(buf)) < 0){ fprint(2, "error creating temporary file: %r\n"); @@ -439,7 +439,7 @@ runchecker(Part *p) char *name; Waitmsg *w; static char *val; - + if(val == nil) val = unsharp("#9/mail/lib/validateattachment"); if(val == nil || access(val, AEXEC) < 0) @@ -503,7 +503,7 @@ problemchild(Part *p) if(justreject) return p; - + syslog(0, "mail", "vf wrapped %s %s", p->type?s_to_c(p->type):"?", p->filename?s_to_c(p->filename):"?"); @@ -591,7 +591,7 @@ isattribute(char **pp, char *attr) } /* - * parse content type header + * parse content type header */ static void ctype(Part *p, Hdef *h, char *cp) @@ -605,7 +605,7 @@ ctype(Part *p, Hdef *h, char *cp) cp = getstring(cp, p->type, 1); if(badtype(s_to_c(p->type))) p->badtype = 1; - + while(*cp){ if(isattribute(&cp, "boundary")){ s = s_new(); @@ -627,13 +627,13 @@ ctype(Part *p, Hdef *h, char *cp) p->charset = s_new(); cp = getstring(cp, s_reset(p->charset), 0); } - + cp = skiptosemi(cp); } } /* - * parse content encoding header + * parse content encoding header */ static void cencoding(Part *m, Hdef *h, char *p) @@ -647,7 +647,7 @@ cencoding(Part *m, Hdef *h, char *p) } /* - * parse content disposition header + * parse content disposition header */ static void cdisposition(Part *p, Hdef *h, char *cp) @@ -1006,7 +1006,7 @@ err: } /* - * decode quoted + * decode quoted */ enum { diff --git a/src/cmd/usage.c b/src/cmd/usage.c index b064feaf..8d4a71e6 100644 --- a/src/cmd/usage.c +++ b/src/cmd/usage.c @@ -9,7 +9,7 @@ main(int argc, char **argv) char *argv0, *args, *flags, *p, *p0; int single; Rune r; - + argv0 = getenv("0"); if(argv0 == nil) { if(argc > 1) @@ -21,7 +21,7 @@ main(int argc, char **argv) argv0 = p+1; flags = getenv("flagfmt"); args = getenv("args"); - + if(argv0 == nil){ fprint(2, "aux/usage: $0 not set\n"); exits("$0"); diff --git a/src/cmd/vac/dat.h b/src/cmd/vac/dat.h index 000a762a..7182d52b 100644 --- a/src/cmd/vac/dat.h +++ b/src/cmd/vac/dat.h @@ -35,4 +35,3 @@ struct VacDirEnum int i, n; VacDir *buf; }; - diff --git a/src/cmd/vac/file.c b/src/cmd/vac/file.c index d9650289..e25f6cfc 100644 --- a/src/cmd/vac/file.c +++ b/src/cmd/vac/file.c @@ -8,21 +8,21 @@ /* * Vac file system. This is a simplified version of the same code in Fossil. - * + * * The locking order in the tree is upward: a thread can hold the lock * for a VacFile and then acquire the lock of f->up (the parent), * but not vice-versa. - * + * * A vac file is one or two venti files. Plain data files are one venti file, * while directores are two: a venti data file containing traditional - * directory entries, and a venti directory file containing venti + * directory entries, and a venti directory file containing venti * directory entries. The traditional directory entries in the data file * contain integers indexing into the venti directory entry file. * It's a little complicated, but it makes the data usable by standard * tools like venti/copy. * */ - + static int filemetaflush(VacFile*, char*); struct VacFile @@ -45,7 +45,7 @@ struct VacFile VtFile *msource; /* metadata for children in a directory */ VacFile *down; /* children */ int mode; - + uvlong qidoffset; /* qid offset */ }; @@ -215,7 +215,7 @@ vacfiledecref(VacFile *f) filefree(f); return 0; } - + filemetalock(f); f->ref--; if(f->ref > 0){ @@ -256,12 +256,12 @@ vacfiledecref(VacFile *f) } -/* - * Construct a vacfile for the root of a vac tree, given the - * venti file for the root information. That venti file is a +/* + * Construct a vacfile for the root of a vac tree, given the + * venti file for the root information. That venti file is a * directory file containing VtEntries for three more venti files: - * the two venti files making up the root directory, and a - * third venti file that would be the metadata half of the + * the two venti files making up the root directory, and a + * third venti file that would be the metadata half of the * "root's parent". * * Fossil generates slightly different vac files, due to a now @@ -273,7 +273,7 @@ VacFile* _vacfileroot(VacFs *fs, VtFile *r) { int redirected; - char err[ERRMAX]; + char err[ERRMAX]; VtBlock *b; VtFile *r0, *r1, *r2; MetaBlock mb; @@ -374,7 +374,7 @@ Err1: * to look at every block to find a given name. * Dirlookup looks in f for an element name elem. * It returns a new VacFile with the dir, boff, and mode - * filled in, but the sources (venti files) are not, and f is + * filled in, but the sources (venti files) are not, and f is * not yet linked into the tree. These details must be taken * care of by the caller. * @@ -535,8 +535,8 @@ Err: return nil; } -/* - * Open a path in the vac file system: +/* + * Open a path in the vac file system: * just walk each element one at a time. */ VacFile* @@ -696,12 +696,12 @@ vacfilegetsize(VacFile *f, uvlong *size) * Directory reading. * * A VacDirEnum is a buffer containing directory entries. - * Directory entries contain malloced strings and need to - * be cleaned up with vdcleanup. The invariant in the + * Directory entries contain malloced strings and need to + * be cleaned up with vdcleanup. The invariant in the * VacDirEnum is that the directory entries between * vde->i and vde->n are owned by the vde and need to * be cleaned up if it is closed. Those from 0 up to vde->i - * have been handed to the reader, and the reader must + * have been handed to the reader, and the reader must * take care of calling vdcleanup as appropriate. */ VacDirEnum* @@ -718,7 +718,7 @@ vdeopen(VacFile *f) /* * There might be changes to this directory's children * that have not been flushed out into the cache yet. - * Those changes are only available if we look at the + * Those changes are only available if we look at the * VacFile structures directory. But the directory reader * is going to read the cache blocks directly, so update them. */ @@ -912,19 +912,19 @@ vdeclose(VacDirEnum *vde) * On to mutation. If the vac file system has been opened * read-write, then the files and directories can all be edited. * Changes are kept in the in-memory cache until flushed out - * to venti, so we must be careful to explicitly flush data + * to venti, so we must be careful to explicitly flush data * that we're not likely to modify again. * * Each VacFile has its own copy of its VacDir directory entry * in f->dir, but otherwise the cache is the authoratative source - * for data. Thus, for the most part, it suffices if we just + * for data. Thus, for the most part, it suffices if we just * call vtfileflushbefore and vtfileflush when we modify things. * There are a few places where we have to remember to write * changed VacDirs back into the cache. If f->dir *is* out of sync, * then f->dirty should be set. * * The metadata in a directory is, to venti, a plain data file, - * but as mentioned above it is actually a sequence of + * but as mentioned above it is actually a sequence of * MetaBlocks that contain sorted lists of VacDir entries. * The filemetaxxx routines manipulate that stream. */ @@ -949,10 +949,10 @@ filemetaalloc(VacFile *fp, VacDir *dir, u32int start) int i, n; MetaEntry me; VtFile *ms; - + ms = fp->msource; n = vdsize(dir, VacDirVersion); - + /* Look for a block with room for a new entry of size n. */ nb = (vtfilegetsize(ms)+ms->dsize-1)/ms->dsize; if(start == NilBlock){ @@ -961,7 +961,7 @@ filemetaalloc(VacFile *fp, VacDir *dir, u32int start) else start = 0; } - + if(start > nb) start = nb; for(bo=start; bo<nb; bo++){ @@ -1015,7 +1015,7 @@ Err: } /* - * Update f's directory entry in the block cache. + * Update f's directory entry in the block cache. * We look for the directory entry by name; * if we're trying to rename the file, oelem is the old name. * @@ -1057,7 +1057,7 @@ filemetaflush(VacFile *f, char *oelem) goto Err; /* - * Check whether we can resize the entry and keep it + * Check whether we can resize the entry and keep it * in this block. */ n = vdsize(&f->dir, VacDirVersion); @@ -1076,20 +1076,20 @@ filemetaflush(VacFile *f, char *oelem) vdunpack(&f->dir, &me); mbinsert(&mb, i, &me); mbpack(&mb); - + /* Done */ vtblockput(b); vtfileunlock(fp->msource); f->dirty = 0; return 0; } - + /* * The entry must be moved to another block. * This can only really happen on renames that * make the name very long. */ - + /* Allocate a spot in a new block. */ if((bo = filemetaalloc(fp, &f->dir, f->boff+1)) == NilBlock){ /* mbresize above might have modified block */ @@ -1175,7 +1175,7 @@ vacfileflush(VacFile *f, int recursive) int ret; VacFile **kids, *p; int i, nkids; - + if(f->mode == VtOREAD) return 0; @@ -1218,7 +1218,7 @@ vacfileflush(VacFile *f, int recursive) /* * Now we can flush our own data. - */ + */ vtfilelock(f->source, -1); if(vtfileflush(f->source) < 0) ret = -1; @@ -1233,7 +1233,7 @@ vacfileflush(VacFile *f, int recursive) return ret; } - + /* * Create a new file named elem in fp with the given mode. * The mode can be changed later except for the ModeDir bit. @@ -1339,7 +1339,7 @@ vacfilecreate(VacFile *fp, char *elem, ulong mode) vacfileincref(fp); fileunlock(fp); - + filelock(ff); vtfilelock(ff->source, -1); vtfileunlock(ff->source); @@ -1375,7 +1375,7 @@ vacfilesetsize(VacFile *f, uvlong size) werrstr(ENotFile); return -1; } - + if(filelock(f) < 0) return -1; @@ -1534,7 +1534,7 @@ vacfilesetdir(VacFile *f, VacDir *dir) if(filelock(f) < 0) return -1; filemetalock(f); - + if(f->source->mode != VtORDWR){ werrstr(EReadOnly); goto Err; @@ -1777,7 +1777,7 @@ vacfsopen(VtConn *z, char *file, int mode, ulong cachemem) int fd; uchar score[VtScoreSize]; char *prefix; - + if(vtparsescore(file, &prefix, score) >= 0){ if(prefix == nil || strcmp(prefix, "vac") != 0){ werrstr("not a vac file"); @@ -1836,7 +1836,7 @@ if(debug) fprint(2, "bad type %s\n", rt.type); memmove(e.score, rt.score, VtScoreSize); e.gen = 0; - + // Don't waste cache memory on pointer blocks // when rt.blocksize is large. e.psize = (rt.blocksize/VtEntrySize)*VtEntrySize; @@ -1918,7 +1918,7 @@ int vacfsgetmaxqid(VacFs *fs, uvlong *maxqid) { VacDir vd; - + if(vacfilegetdir(fs->root, &vd) < 0) return -1; if(vd.qidspace) @@ -1955,7 +1955,7 @@ vacfscreate(VtConn *z, int bsize, ulong cachemem) VacDir vd; MetaEntry me; int psize; - + if((fs = vacfsalloc(z, bsize, cachemem, VtORDWR)) == nil) return nil; @@ -1989,7 +1989,7 @@ if(debug) fprint(2, "create bsize %d psize %d\n", bsize, psize); vtblockwrite(b); memmove(metascore, b->score, VtScoreSize); vtblockput(b); - + /* First entry: empty venti directory stream. */ memset(&e, 0, sizeof e); e.flags = VtEntryActive; @@ -1999,7 +1999,7 @@ if(debug) fprint(2, "create bsize %d psize %d\n", bsize, psize); memmove(e.score, vtzeroscore, VtScoreSize); vtentrypack(&e, buf, 0); vtfilewrite(f, buf, VtEntrySize, 0); - + /* Second entry: empty metadata stream. */ e.type = VtDataType; vtentrypack(&e, buf, 0); @@ -2013,7 +2013,7 @@ if(debug) fprint(2, "create bsize %d psize %d\n", bsize, psize); vtfileflush(f); vtfileunlock(f); - + /* Now open it as a vac fs. */ fs->root = _vacfileroot(fs, f); if(fs->root == nil){ @@ -2105,7 +2105,7 @@ sha1matches(VacFile *f, ulong b, uchar *buf, int n) { uchar fscore[VtScoreSize]; uchar bufscore[VtScoreSize]; - + if(vacfileblockscore(f, b, fscore) < 0) return 0; n = vtzerotruncate(VtDataType, buf, n); @@ -2114,4 +2114,3 @@ sha1matches(VacFile *f, ulong b, uchar *buf, int n) return 1; return 0; } - diff --git a/src/cmd/vac/glob.c b/src/cmd/vac/glob.c index 863eb848..69602ad7 100644 --- a/src/cmd/vac/glob.c +++ b/src/cmd/vac/glob.c @@ -89,7 +89,7 @@ glob2regexp(char *glob) *w++ = ')'; *w++ = '$'; *w = 0; - + re = regcomp(s); if(re == nil){ syntax: @@ -130,7 +130,7 @@ loadexcludefile(char *file) case '#': continue; } - + inc = 0; if(strncmp(p, "include ", 8) == 0){ inc = 1; @@ -157,7 +157,7 @@ void excludepattern(char *p) { Reprog *re; - + if((re = glob2regexp(p)) == nil) sysfatal("bad glob pattern %s", p); @@ -171,10 +171,9 @@ int includefile(char *file) { Pattern *p, *ep; - + for(p=pattern, ep=p+npattern; p<ep; p++) if(regexec(p->re, file, nil, 0)) return p->include; return 1; } - diff --git a/src/cmd/vac/pack.c b/src/cmd/vac/pack.c index 5555cc0e..1eca665d 100644 --- a/src/cmd/vac/pack.c +++ b/src/cmd/vac/pack.c @@ -36,7 +36,7 @@ stringunpack(char **s, uchar **p, int *n) if(*n < 2) return -1; - + nn = U16GET(*p); *p += 2; *n -= 2; @@ -187,7 +187,7 @@ if(0)print("eo = %d en = %d\n", eo, en); } p = mb->buf + eo; - + /* make sure entry looks ok and includes an elem name */ if(en < 8 || U32GET(p) != DirMagic || en < 8 + U16GET(p+6)) { werrstr("corrupted meta block entry"); @@ -317,7 +317,7 @@ mbcompact(MetaBlock *mb, MetaChunk *mc) int oo, o, n, i; oo = MetaHeaderSize + mb->maxindex*MetaIndexSize; - + for(i=0; i<mb->nindex; i++) { o = mc[i].offset; n = mc[i].size; @@ -375,7 +375,7 @@ int vdsize(VacDir *dir, int version) { int n; - + if(version < 8 || version > 9) sysfatal("bad version %d in vdpack", version); @@ -433,7 +433,7 @@ vdpack(VacDir *dir, MetaEntry *me, int version) sysfatal("bad version %d in vdpack", version); p = me->p; - + U32PUT(p, DirMagic); U16PUT(p+4, version); /* version */ p += 6; @@ -442,7 +442,7 @@ vdpack(VacDir *dir, MetaEntry *me, int version) U32PUT(p, dir->entry); p += 4; - + if(version == 9){ U32PUT(p, dir->gen); U32PUT(p+4, dir->mentry); @@ -456,7 +456,7 @@ vdpack(VacDir *dir, MetaEntry *me, int version) p += stringpack(dir->uid, p); p += stringpack(dir->gid, p); p += stringpack(dir->mid, p); - + U32PUT(p, dir->mtime); U32PUT(p+4, dir->mcount); U32PUT(p+8, dir->ctime); @@ -481,7 +481,7 @@ vdpack(VacDir *dir, MetaEntry *me, int version) U64PUT(p+8, dir->qidmax, t32); p += 16; } - + if(dir->gen && version < 9) { U8PUT(p, DirGenEntry); U16PUT(p+1, 4); @@ -498,7 +498,7 @@ vdunpack(VacDir *dir, MetaEntry *me) { int t, nn, n, version; uchar *p; - + p = me->p; n = me->size; @@ -517,7 +517,7 @@ vdunpack(VacDir *dir, MetaEntry *me) if(version < 7 || version > 9) goto Err; p += 2; - n -= 2; + n -= 2; /* elem */ if(stringunpack(&dir->elem, &p, &n) < 0) @@ -560,7 +560,7 @@ vdunpack(VacDir *dir, MetaEntry *me) p += VtScoreSize; n -= VtScoreSize; } - + /* uid */ if(stringunpack(&dir->uid, &p, &n) < 0) goto Err; @@ -678,7 +678,7 @@ mbsearch(MetaBlock *mb, char *elem, int *ri, MetaEntry *me) *ri = i; return 1; } - + if(x < 0) b = i+1; else /* x > 0 */ @@ -686,7 +686,7 @@ mbsearch(MetaBlock *mb, char *elem, int *ri, MetaEntry *me) } assert(b == t); - + *ri = b; /* b is the index to insert this entry */ memset(me, 0, sizeof(*me)); diff --git a/src/cmd/vac/testinc.c b/src/cmd/vac/testinc.c index 0cd43143..3049e34b 100644 --- a/src/cmd/vac/testinc.c +++ b/src/cmd/vac/testinc.c @@ -14,13 +14,13 @@ threadmain(int argc, char **argv) default: goto usage; }ARGEND - + if(argc != 1){ usage: fprint(2, "usage: testinc includefile\n"); threadexitsall("usage"); } - + loadexcludefile(argv[0]); Binit(&b, 0, OREAD); while((p = Brdline(&b, '\n')) != nil){ diff --git a/src/cmd/vac/unvac.c b/src/cmd/vac/unvac.c index 594a6a2e..a265893f 100644 --- a/src/cmd/vac/unvac.c +++ b/src/cmd/vac/unvac.c @@ -46,7 +46,7 @@ threadmain(int argc, char *argv[]) fmtinstall('F', vtfcallfmt); fmtinstall('t', mtimefmt); fmtinstall('M', dirmodefmt); - + host = nil; printstats = 0; @@ -104,7 +104,7 @@ threadmain(int argc, char *argv[]) if((f = vacfsgetroot(fs)) == nil) sysfatal("vacfsgetroot: %r"); - + unvac(f, nil, nil); for(i=0; i<nwant; i++){ if(want[i] && !found[i]){ @@ -125,7 +125,7 @@ writen(int fd, char *buf, int n) { int m; int oldn; - + oldn = n; while(n > 0){ m = write(fd, buf, n); @@ -141,7 +141,7 @@ int wantfile(char *name) { int i, namelen, n; - + if(nwant == 0) return 1; @@ -229,7 +229,7 @@ unvac(VacFile *f, char *name, VacDir *vdir) fprint(2, "warning: ignoring %s %s\n", what, name); return; } - + if(mode&ModeDir){ if((vde = vdeopen(f)) == nil){ fprint(2, "vdeopen %s: %r", name); @@ -342,7 +342,7 @@ int mtimefmt(Fmt *f) { Tm *tm; - + tm = localtime(va_arg(f->args, ulong)); fmtprint(f, "%04d-%02d-%02d %02d:%02d", tm->year+1900, tm->mon+1, tm->mday, diff --git a/src/cmd/vac/vac.c b/src/cmd/vac/vac.c index b54503e4..7e441482 100644 --- a/src/cmd/vac/vac.c +++ b/src/cmd/vac/vac.c @@ -48,7 +48,7 @@ static void removevacfile(void); #ifdef PLAN9PORT /* * We're between a rock and a hard place here. - * The pw library (getpwnam, etc.) reads the + * The pw library (getpwnam, etc.) reads the * password and group files into an on-stack buffer, * so if you have some huge groups, you overflow * the stack. Because of this, the thread library turns @@ -136,10 +136,10 @@ threadmain(int argc, char **argv) default: usage(); }ARGEND - + if(argc == 0 && !stdinname) usage(); - + if(archivefile && (vacfile || diffvac)){ fprint(2, "cannot use -a with -f, -d\n"); usage(); @@ -266,7 +266,7 @@ threadmain(int argc, char **argv) } if(fdiff) vacfiledecref(fdiff); - + /* * Record the maximum qid so that vacs can be merged * without introducing overlapping qids. Older versions @@ -313,7 +313,7 @@ recentarchive(VacFs *fs, char *path) char buf[10]; int year, mmdd, nn, n, n1; char *p; - + fp = vacfsgetroot(fs); de = vdeopen(fp); year = 0; @@ -339,7 +339,7 @@ recentarchive(VacFs *fs, char *path) return nil; } fp = f; - + de = vdeopen(fp); mmdd = 0; nn = 0; @@ -440,7 +440,7 @@ enum { /* * Archive the file named name, which has stat info d, - * into the vac directory fp (p = parent). + * into the vac directory fp (p = parent). * * If we're doing a vac -d against another archive, the * equivalent directory to fp in that archive is diffp. @@ -469,7 +469,7 @@ vac(VacFile *fp, VacFile *diffp, char *name, Dir *d) if(merge && vacmerge(fp, name) >= 0) return; - + if(verbose) fprint(2, "%s%s\n", name, (d->mode&DMDIR) ? "/" : ""); @@ -551,7 +551,7 @@ vac(VacFile *fp, VacFile *diffp, char *name, Dir *d) if(vacfilegetentries(fdiff, &e, nil) >= 0) if(vacfilesetentries(f, &e, nil) >= 0){ bsize = e.dsize; - + /* * Or if -q is set, and the metadata looks the same, * don't even bother reading the file. @@ -565,7 +565,7 @@ vac(VacFile *fp, VacFile *diffp, char *name, Dir *d) vdcleanup(&vddiff); goto Out; } - + /* * Skip over presumably-unchanged prefix * of an append-only file. @@ -631,7 +631,7 @@ vacstdin(VacFile *fp, char *name) warn("vacfilecreate %s: %r", name); return; } - + off = 0; while((n = read(0, buf, sizeof buf)) > 0){ if(vacfilewrite(f, buf, n, off) < 0){ @@ -660,7 +660,7 @@ vacmergefile(VacFile *fp, VacFile *mp, VacDir *d, char *vacfile, VtEntry ed, em; VacFile *mf; VacFile *f; - + mf = vacfilewalk(mp, d->elem); if(mf == nil){ warn("could not walk %s in %s", d->elem, vacfile); @@ -671,7 +671,7 @@ vacmergefile(VacFile *fp, VacFile *mp, VacDir *d, char *vacfile, vacfiledecref(mf); return -1; } - + if((f = vacfilecreate(fp, d->elem, d->mode)) == nil){ warn("vacfilecreate %s: %r", d->elem); vacfiledecref(mf); @@ -693,7 +693,7 @@ vacmergefile(VacFile *fp, VacFile *mp, VacDir *d, char *vacfile, vacfiledecref(f); return -1; } - + vacfiledecref(mf); vacfiledecref(f); return 0; @@ -778,4 +778,3 @@ warn(char *fmt, ...) fprint(2, "\n"); va_end(arg); } - diff --git a/src/cmd/vac/vac.h b/src/cmd/vac/vac.h index 0edd41e4..bbed4931 100644 --- a/src/cmd/vac/vac.h +++ b/src/cmd/vac/vac.h @@ -13,7 +13,7 @@ typedef struct VacDirEnum VacDirEnum; */ enum { - ModeOtherExec = (1<<0), + ModeOtherExec = (1<<0), ModeOtherWrite = (1<<1), ModeOtherRead = (1<<2), ModeGroupExec = (1<<3), @@ -64,7 +64,7 @@ struct VacDir ulong mgen; /* generation of meta entry */ uvlong size; /* size of file */ uvlong qid; /* unique file id */ - + char *uid; /* owner id */ char *gid; /* group id */ char *mid; /* last modified by */ @@ -144,4 +144,3 @@ int vdeunread(VacDirEnum*); int vacfiledsize(VacFile *f); int sha1matches(VacFile *f, ulong b, uchar *buf, int n); - diff --git a/src/cmd/vac/vacfs.c b/src/cmd/vac/vacfs.c index b4525729..05baf66e 100644 --- a/src/cmd/vac/vacfs.c +++ b/src/cmd/vac/vacfs.c @@ -149,7 +149,7 @@ threadmain(int argc, char *argv[]) fmtinstall('H', encodefmt); fmtinstall('V', vtscorefmt); fmtinstall('F', vtfcallfmt); - + defmnt = nil; defsrv = nil; ARGBEGIN{ @@ -620,7 +620,7 @@ rstat(Fid *f) VacDir dir; static uchar statbuf[1024]; VacFile *parent; - + if(!f->busy) return vtstrdup(Enotexist); parent = vacfilegetparent(f->file); @@ -671,7 +671,7 @@ vacstat(VacFile *parent, VacDir *vd, uchar *p, int np) dir.qid.type |= QTDIR; dir.mode |= DMDIR; } - + #ifdef PLAN9PORT if(vd->mode & (ModeLink|ModeDevice|ModeNamedPipe)){ vf = vacfilewalk(parent, vd->elem); @@ -695,7 +695,7 @@ vacstat(VacFile *parent, VacDir *vd, uchar *p, int np) dir.mode |= DMNAMEDPIPE; } #endif - + dir.atime = vd->atime; dir.mtime = vd->mtime; dir.length = vd->size; @@ -862,4 +862,3 @@ vacshutdown(void) vacfsclose(fs); vthangup(conn); } - diff --git a/src/cmd/vbackup/config.c b/src/cmd/vbackup/config.c index 1b5b404a..288e3434 100644 --- a/src/cmd/vbackup/config.c +++ b/src/cmd/vbackup/config.c @@ -91,7 +91,7 @@ readconfigfile(char *name, VtCache *vcache) if((dir = dirstat(name)) == nil) return nil; - + if((b = Bopen(name, OREAD)) == nil){ free(dir); return nil; @@ -142,7 +142,7 @@ readconfigfile(char *name, VtCache *vcache) freeconfig(c); return nil; } - + return c; } diff --git a/src/cmd/vbackup/disknfs.c b/src/cmd/vbackup/disknfs.c index b51d0a3b..b7798db8 100644 --- a/src/cmd/vbackup/disknfs.c +++ b/src/cmd/vbackup/disknfs.c @@ -132,4 +132,3 @@ fsreaddir(SunAuthUnix *au, Nfs3Handle *h, u32int count, u64int cookie, uchar **d { return fsysreaddir(fsys, au, h, count, cookie, data, pcount, peof); } - diff --git a/src/cmd/vbackup/mount-Linux.c b/src/cmd/vbackup/mount-Linux.c index b343aa62..bfc0e0fd 100644 --- a/src/cmd/vbackup/mount-Linux.c +++ b/src/cmd/vbackup/mount-Linux.c @@ -56,4 +56,3 @@ mountnfs(int proto, struct sockaddr_in *sa, uchar *handle, int nhandle, char *mt if(mount("backup:/", mtpt, "nfs", mflag, &nfs) < 0) sysfatal("mount: %r"); } - diff --git a/src/cmd/vbackup/mount-none.c b/src/cmd/vbackup/mount-none.c index db8e1e5b..28380e13 100644 --- a/src/cmd/vbackup/mount-none.c +++ b/src/cmd/vbackup/mount-none.c @@ -9,4 +9,3 @@ mountnfs(int proto, struct sockaddr_in *addr, uchar *handle, int hlen, char *mtp { sysfatal("mountnfs not implemented"); } - diff --git a/src/cmd/vbackup/nfs3srv.c b/src/cmd/vbackup/nfs3srv.c index c3fc780b..532f7e6c 100644 --- a/src/cmd/vbackup/nfs3srv.c +++ b/src/cmd/vbackup/nfs3srv.c @@ -74,7 +74,7 @@ rumnt(SunMsg *m) NfsMount3RUmnt rx; /* ignore */ - + memset(&rx, 0, sizeof rx); return sunmsgreply(m, &rx.call); } @@ -359,7 +359,7 @@ rrofs(SunMsg *m) memset(buf, 0, sizeof buf); return senderror(m, (SunCall*)buf, Nfs3ErrRoFs); } - + static void rnfs3(void *v) @@ -429,4 +429,3 @@ nfs3proc(void *v) while((m = recvp(c)) != nil) threadcreate(rnfs3, m, SunStackSize); } - diff --git a/src/cmd/vbackup/nfs3srv.h b/src/cmd/vbackup/nfs3srv.h index f96be985..6d72c1e6 100644 --- a/src/cmd/vbackup/nfs3srv.h +++ b/src/cmd/vbackup/nfs3srv.h @@ -15,4 +15,3 @@ enum { MaxDataSize = 8192 }; - diff --git a/src/cmd/vbackup/vbackup.c b/src/cmd/vbackup/vbackup.c index 353ff610..df68abe2 100644 --- a/src/cmd/vbackup/vbackup.c +++ b/src/cmd/vbackup/vbackup.c @@ -13,7 +13,7 @@ * -s print status updates * -v print debugging trace * -w write parallelism - * + * * If score is given on the command line, it should be the * score from a previous vbackup on this fspartition. * In this mode, only the new blocks are stored to Venti. @@ -24,12 +24,12 @@ * by buffered queues: * * fsysproc | cmpproc | ventiproc - * + * * Fsysproc reads the disk and queues the blocks. * Cmpproc compares the blocks against the SHA1 hashes * in the old image, if any. It discards the unchanged blocks * and queues the changed ones. Ventiproc writes blocks to Venti. - * + * * There is a fourth proc, statusproc, which prints status * updates about how the various procs are progressing. */ @@ -259,14 +259,14 @@ threadmain(int argc, char **argv) tmpnam = smprint("%s/vbackup.XXXXXX", tmp); if(tmpnam == nil) sysfatal("smprint: %r"); - + if((fd = opentemp(tmpnam, ORDWR|ORCLOSE)) < 0) sysfatal("opentemp %s: %r", tmpnam); if(statustime) print("# %T reading scores into %s\n", tmpnam); if(verbose) fprint(2, "read scores into %s...\n", tmpnam); - + Binit(&bscores, fd, OWRITE); for(i=0; i<fsys->nblock; i++){ if(vtfileblockscore(vfile, i, score) < 0) @@ -276,7 +276,7 @@ threadmain(int argc, char **argv) } Bterm(&bscores); vtfileunlock(vfile); - + /* * prep scores for rereading */ @@ -285,7 +285,7 @@ threadmain(int argc, char **argv) } /* - * start the main processes + * start the main processes */ if(statustime) print("# %T starting procs\n"); @@ -307,7 +307,7 @@ threadmain(int argc, char **argv) * wait for processes to finish */ wlock(&endlk); - + qfree(qcmp); qfree(qventi); @@ -358,7 +358,7 @@ threadmain(int argc, char **argv) if(mountplace == nil) mountplace = guessmountplace(argv[0]); print("mount /%s/%d/%02d%02d%s %s:%V %d/%02d%02d/%02d%02d\n", - mountname, tm.year, tm.mon, tm.mday, + mountname, tm.year, tm.mon, tm.mday, mountplace, root.type, b->score, tm.year, tm.mon, tm.mday, tm.hour, tm.min); @@ -370,7 +370,7 @@ threadmain(int argc, char **argv) sysfatal("vtsync: %r"); if(statustime) print("# %T synced\n"); - + fsysclose(fsys); diskclose(disk); vtcachefree(zcache); @@ -468,7 +468,7 @@ writethread(void *v) nrecv++; if(wr.p == nil) break; - + if(fastwrites && vtread(z, wr.score, wr.type, nil, 0) < 0){ rerrstr(err, sizeof err); if(strstr(err, "read too small")){ /* already exists */ @@ -581,7 +581,7 @@ timefmt(Fmt *fmt) Tm tm; ns = nsec(); tm = *localtime(time(0)); - return fmtprint(fmt, "%04d/%02d%02d %02d:%02d:%02d.%03d", + return fmtprint(fmt, "%04d/%02d%02d %02d:%02d:%02d.%03d", tm.year+1900, tm.mon+1, tm.mday, tm.hour, tm.min, tm.sec, (int)(ns%1000000000)/1000000); } @@ -592,7 +592,7 @@ guessmountplace(char *dev) char *cmd, *q; int p[2], fd[3], n; char buf[100]; - + if(pipe(p) < 0) sysfatal("pipe: %r"); @@ -617,4 +617,3 @@ guessmountplace(char *dev) *--q = 0; return strdup(buf); } - diff --git a/src/cmd/vbackup/vftp.c b/src/cmd/vbackup/vftp.c index c413af42..84ac3df8 100644 --- a/src/cmd/vbackup/vftp.c +++ b/src/cmd/vbackup/vftp.c @@ -34,7 +34,7 @@ struct Cmd char *help; }; -Cmd cmdtab[] = +Cmd cmdtab[] = { "cd", cmdcd, "cd dir - change directory", "ls", cmdls, "ls [-d] path... - list file", @@ -49,7 +49,7 @@ char* ebuf(void) { static char buf[ERRMAX]; - + rerrstr(buf, sizeof buf); return buf; } @@ -58,7 +58,7 @@ static char* estrdup(char *s) { char *t; - + t = emalloc(strlen(s)+1); strcpy(t, s); return t; @@ -70,7 +70,7 @@ walk(char *path, Nfs3Handle *ph) char *p, *q; Nfs3Handle h; Nfs3Status ok; - + path = estrdup(path); /* writable */ if(path[0] == '/') h = root; @@ -99,7 +99,7 @@ char* cmdhelp(int argc, char **argv) { int i; - + for(i=0; i<nelem(cmdtab); i++) print("%s\n", cmdtab[i].help); return nil; @@ -112,10 +112,10 @@ cmdcd(int argc, char **argv) Nfs3Attr attr; Nfs3Status ok; Nfs3Handle h; - + if(argc != 2) return "usage: cd dir"; - + if((err = walk(argv[1], &h)) != nil) return err; if((ok = fsysgetattr(fsys, auth, &h, &attr)) != Nfs3Ok){ @@ -152,7 +152,7 @@ void ls(char *dir, char *elem, Nfs3Attr *attr) { char c; - + c = ' '; /* use attr->type */ Bprint(&bout, "%s%s%s", dir ? dir : "", dir && elem ? "/" : "", elem ? elem : ""); Bprint(&bout, " %c%luo %1d %4d %4d", c, attr->mode, attr->nlink, attr->uid, attr->gid); @@ -172,7 +172,7 @@ lsdir(char *dir, Nfs3Handle *h) u1int eof; Nfs3Status ok; u64int cookie; - + cookie = 0; for(;;){ ok = fsysreaddir(fsys, auth, h, 8192, cookie, &data, &count, &eof); @@ -201,7 +201,7 @@ fprint(2, "got %d\n", count); continue; } ls(dir, e.name, &attr); - } + } free(data); if(eof) break; @@ -217,7 +217,7 @@ cmdls(int argc, char **argv) Nfs3Handle h; Nfs3Attr attr; Nfs3Status ok; - + dflag = 0; ARGBEGIN{ case 'd': @@ -232,7 +232,7 @@ cmdls(int argc, char **argv) Bflush(&bout); return nil; } - + for(i=0; i<argc; i++){ if((e = walk(argv[i], &h)) != nil){ fprint(2, "%s: %s\n", argv[i], e); @@ -264,7 +264,7 @@ cmdget(int argc, char **argv) Nfs3Attr attr; Nfs3Status ok; vlong o; - + dflag = 0; ARGBEGIN{ default: @@ -274,7 +274,7 @@ cmdget(int argc, char **argv) if(argc != 1 && argc != 2) goto usage; - + if((e = walk(argv[0], &h)) != nil){ fprint(2, "%s: %s\n", argv[0], e); return nil; @@ -319,12 +319,12 @@ cmdblock(int argc, char **argv) char *e; Nfs3Handle h; u64int bno; - + ARGBEGIN{ default: return "usage: block path offset"; }ARGEND - + if(argc != 2) return "usage: block path offset"; @@ -347,19 +347,19 @@ cmddisk(int argc, char **argv) int delta, count, i; u64int offset; uchar *p; - + ARGBEGIN{ default: return "usage: disk offset count"; }ARGEND - + if(argc != 2) return "usage: disk offset count"; offset = strtoull(argv[0], 0, 0); count = atoi(argv[1]); delta = offset%fsys->blocksize; - + b = diskread(disk, fsys->blocksize, offset-delta); if(b == nil){ fprint(2, "diskread: %r\n"); @@ -396,7 +396,7 @@ threadmain(int argc, char **argv) int i, nf; uchar score[VtScoreSize]; Nfs3Status ok; - + allowall = 1; ARGBEGIN{ case 'V': @@ -405,14 +405,14 @@ threadmain(int argc, char **argv) default: usage(); }ARGEND - + if(argc != 1) usage(); fmtinstall('F', vtfcallfmt); fmtinstall('H', encodefmt); fmtinstall('V', vtscorefmt); - + if(access(argv[0], AEXIST) >= 0 || strchr(argv[0], '/')){ if((disk = diskopenfile(argv[0])) == nil) sysfatal("diskopen: %r"); @@ -442,7 +442,7 @@ threadmain(int argc, char **argv) cwd = root; Binit(&bin, 0, OREAD); Binit(&bout, 1, OWRITE); - + while(fprint(2, "vftp> "), (p = Brdstr(&bin, '\n', 1)) != nil){ if(p[0] == '#') continue; @@ -461,4 +461,3 @@ threadmain(int argc, char **argv) } threadexitsall(nil); } - diff --git a/src/cmd/vbackup/vnfs.c b/src/cmd/vbackup/vnfs.c index d4319c86..f78d4886 100644 --- a/src/cmd/vbackup/vnfs.c +++ b/src/cmd/vbackup/vnfs.c @@ -154,7 +154,7 @@ threadmain(int argc, char **argv) nfschan = chancreate(sizeof(SunMsg*), 0); mountchan = chancreate(sizeof(SunMsg*), 0); timerchan = chancreate(sizeof(void*), 0); - + if(sunsrvudp(srv, addr) < 0) sysfatal("starting server: %r"); @@ -162,7 +162,7 @@ threadmain(int argc, char **argv) sunsrvthreadcreate(srv, mount3proc, mountchan); sunsrvthreadcreate(srv, timerthread, nil); proccreate(timerproc, nil, 32768); - + sunsrvprog(srv, &nfs3prog, nfschan); sunsrvprog(srv, &nfsmount3prog, mountchan); @@ -200,13 +200,13 @@ unittoull(char *s) /* * Handles. - * + * * We store all the state about which file a client is accessing in * the handle, so that we don't have to maintain any per-client state - * ourselves. In order to avoid leaking handles or letting clients + * ourselves. In order to avoid leaking handles or letting clients * create arbitrary handles, we sign and encrypt each handle with * AES using a key selected randomly when the server starts. - * Thus, handles cannot be used across sessions. + * Thus, handles cannot be used across sessions. * * The decrypted handles begin with the following header: * @@ -215,7 +215,7 @@ unittoull(char *s) * * If we're pressed for space in the rest of the handle, we could * probably reduce the amount of sessid bytes. Note that the sessid - * bytes must be consistent during a run of vnfs, or else some + * bytes must be consistent during a run of vnfs, or else some * clients (e.g., Linux 2.4) eventually notice that successive TLookups * return different handles, and they return "Stale NFS file handle" * errors to system calls in response (even though we never sent @@ -231,9 +231,9 @@ unittoull(char *s) * and the handles need to be stable across changes in the config file * (though not across server restarts since encryption screws * that up nicely). - * - * We encode each of the first two as a 10-byte hash that is - * the first half of a SHA1 hash. + * + * We encode each of the first two as a 10-byte hash that is + * the first half of a SHA1 hash. */ enum @@ -291,7 +291,7 @@ static Nfs3Status hdecrypt(Nfs3Handle *h) { AESstate aes; - + if(h->len == 1 && h->h[0] == 0){ /* single 0 byte is root */ *h = root; return Nfs3Ok; @@ -323,7 +323,7 @@ cryptinit(void) uchar key[32], ivec[AESbsize]; int i; u32int u32; - + u32 = truerand(); memmove(sessid, &u32, 4); for(i=0; i<nelem(key); i+=4) { @@ -371,12 +371,12 @@ struct Cnode Cnode *nextsib; /* in tree */ Cnode *kidlist; /* in tree */ Cnode *nexthash; /* in hash list */ - + Nfs3Status (*read)(Cnode*, u32int, u64int, uchar**, u32int*, u1int*); /* synthesized read fn */ uchar handle[VtScoreSize]; /* sha1(path to here) */ ulong mtime; /* mtime for this directory entry */ - + /* fsys overlay on this node */ Fsys *fsys; /* cache of memory structure */ Nfs3Handle fsyshandle; @@ -394,7 +394,7 @@ struct Cnode char *fsysimage; /* raw disk image */ Fsys *mfsys; /* mounted file system (nil until walked) */ Nfs3Handle mfsyshandle; /* handle to root of mounted fsys */ - + int mark; /* gc */ }; @@ -409,7 +409,7 @@ mkcnode(Ctree *t, Cnode *parent, char *elem, uint elen, char *path, uint plen) { uint h; Cnode *n; - + n = emalloc(sizeof *n + elen+1); n->name = (char*)(n+1); memmove(n->name, elem, elen); @@ -424,7 +424,7 @@ mkcnode(Ctree *t, Cnode *parent, char *elem, uint elen, char *path, uint plen) h = dumbhash(n->handle); n->nexthash = t->hash[h]; t->hash[h] = n; - + return n; } @@ -446,7 +446,7 @@ refreshdisk(void) int i; Cnode *n; Ctree *t; - + t = config.ctree; for(i=0; i<nelem(t->hash); i++) for(n=t->hash[i]; n; n=n->nexthash){ @@ -485,7 +485,7 @@ static Cnode* cnodewalk(Cnode *n, char *name, uint len, int markokay) { Cnode *nn; - + for(nn=n->kidlist; nn; nn=nn->nextsib) if(strncmp(nn->name, name, len) == 0 && nn->name[len] == 0) if(!nn->mark || markokay) @@ -498,7 +498,7 @@ ctreewalkpath(Ctree *t, char *name, ulong createmtime) { Cnode *n, *nn; char *p, *nextp; - + n = t->root; p = name; for(; *p; p=nextp){ @@ -526,10 +526,10 @@ Ctree* mkctree(void) { Ctree *t; - + t = emalloc(sizeof *t); t->root = mkcnode(t, nil, "", 0, "", 0); - + ctreewalkpath(t, "/+log", time(0))->read = logread; ctreewalkpath(t, "/+refreshdisk", time(0))->read = refreshdiskread; ctreewalkpath(t, "/+refreshconfig", time(0))->read = refreshconfigread; @@ -541,7 +541,7 @@ Cnode* ctreemountfsys(Ctree *t, char *path, ulong time, uchar *score, char *file) { Cnode *n; - + if(time == 0) time = 1; n = ctreewalkpath(t, path, time); @@ -570,7 +570,7 @@ cnodebyhandle(Ctree *t, uchar *p) { int h; Cnode *n; - + h = dumbhash(p); for(n=t->hash[h]; n; n=n->nexthash) if(memcmp(n->handle, p, CnodeHandleSize) == 0) @@ -582,7 +582,7 @@ static int parseipandmask(char *s, uchar *ip, uchar *mask) { char *p, *q; - + p = strchr(s, '/'); if(p) *p++ = 0; @@ -609,14 +609,14 @@ parsetime(char *s, ulong *time) char *p; int i; Tm tm; - + /* decimal integer is seconds since 1970 */ x = strtoul(s, &p, 10); if(x > 0 && *p == 0){ *time = x; return 0; } - + /* otherwise expect yyyy/mmdd/hhmm */ if(strlen(s) != 14 || s[4] != '/' || s[9] != '/') return -1; @@ -629,7 +629,7 @@ parsetime(char *s, ulong *time) return -1; tm.mon = (s[5]-'0')*10+s[6]-'0' - 1; if(tm.mon < 0 || tm.mon > 11) - return -1; + return -1; tm.mday = (s[7]-'0')*10+s[8]-'0'; if(tm.mday < 0 || tm.mday > 31) return -1; @@ -673,7 +673,7 @@ readconfigfile(Config *cp) free(dir); if((b = Bopen(name, OREAD)) == nil) return -1; - + /* * Reuse old tree, garbage collecting entries that * are not mentioned in the new config file. @@ -684,7 +684,7 @@ readconfigfile(Config *cp) markctree(c.ctree); c.ok = nil; c.nok = 0; - + line = 0; for(; (p=Brdstr(b, '\n', 1)) != nil; free(p)){ line++; @@ -726,7 +726,7 @@ readconfigfile(Config *cp) } if(strcmp(f[0], "allow") == 0 || strcmp(f[0], "deny") == 0){ if(nf != 2){ - werrstr("syntax error: allow|deny ip[/mask]"); + werrstr("syntax error: allow|deny ip[/mask]"); goto badline; } c.ok = erealloc(c.ok, (c.nok+1)*sizeof(c.ok[0])); @@ -755,8 +755,8 @@ ipokay(uchar *ip, ushort port) { int i; uchar ipx[IPaddrlen]; - Ipokay *ok; - + Ipokay *ok; + for(i=0; i<config.nok; i++){ ok = &config.ok[i]; maskip(ip, ok->mask, ipx); @@ -775,7 +775,7 @@ Nfs3Status cnodelookup(Ctree *t, Cnode **np, char *name) { Cnode *n, *nn; - + n = *np; if(n->isblackhole) return Nfs3Ok; @@ -826,7 +826,7 @@ cnodereaddir(Cnode *n, u32int count, u64int cookie, uchar **pdata, u32int *pcoun u64int c; u64int u64; Nfs3Entry ne; - + n = n->kidlist; c = cookie; for(; c && n; c--) @@ -837,7 +837,7 @@ cnodereaddir(Cnode *n, u32int count, u64int cookie, uchar **pdata, u32int *pcoun *peof = 1; return Nfs3Ok; } - + data = emalloc(count); p = data; ep = data+count; @@ -882,7 +882,7 @@ timerthread(void *v) } /* - * Actually serve the NFS requests. Called from nfs3srv.c. + * Actually serve the NFS requests. Called from nfs3srv.c. * Each request runs in its own thread (coroutine). * * Decrypted handles have the form: @@ -891,7 +891,7 @@ timerthread(void *v) * glob[10] - SHA1 hash prefix identifying a glob state * fsyshandle[<=10] - disk file system handle (usually 4 bytes) */ - + /* * A fid represents a point in the file tree. * There are three components, all derived from the handle: @@ -933,7 +933,7 @@ handletofid(Nfs3Handle *eh, Fid *fid, int mode) Fsys *fsys; Nfs3Status ok; Nfs3Handle h2, *h, *fh; - + memset(fid, 0, sizeof *fid); domount = 1; @@ -999,7 +999,7 @@ handletofid(Nfs3Handle *eh, Fid *fid, int mode) n->mfsys = fsys; fsysroot(fsys, &n->mfsyshandle); } - + /* * Use inner handle. */ @@ -1010,7 +1010,7 @@ handletofid(Nfs3Handle *eh, Fid *fid, int mode) * Use fsys handle from tree or from handle. * This assumes that fsyshandle was set by fidtohandle * earlier, so it's not okay to reuse handles (except the root) - * across sessions. The encryption above makes and + * across sessions. The encryption above makes and * enforces the same restriction, so this is okay. */ fid->fsys = n->fsys; @@ -1035,7 +1035,7 @@ void _fidtohandle(Fid *fid, Nfs3Handle *h) { Cnode *n; - + n = fid->cnode; /* * Record fsys handle in n, don't bother sending it to client @@ -1062,7 +1062,7 @@ void setrootfid(void) { Fid fid; - + memset(&fid, 0, sizeof fid); fid.cnode = config.ctree->root; _fidtohandle(&fid, &root); @@ -1101,7 +1101,7 @@ fslookup(SunAuthUnix *au, Nfs3Handle *h, char *name, Nfs3Handle *nh) Nfs3Status ok; Nfs3Handle xh; int mode; - + trace("lookup %.*lH %s\n", h->len, h->h, name); mode = HWalk; @@ -1112,7 +1112,7 @@ fslookup(SunAuthUnix *au, Nfs3Handle *h, char *name, Nfs3Handle *nh) trace("lookup: handletofid %r\n"); return ok; } - + if(strcmp(name, ".") == 0){ fidtohandle(&fid, nh); return Nfs3Ok; @@ -1122,7 +1122,7 @@ fslookup(SunAuthUnix *au, Nfs3Handle *h, char *name, Nfs3Handle *nh) * Walk down file system and cnode simultaneously. * If dotdot and file system doesn't move, need to walk * up cnode. Save the corresponding fsys handles in - * the cnode as we walk down so that we'll have them + * the cnode as we walk down so that we'll have them * for dotdotting back up. */ n = fid.cnode; @@ -1143,7 +1143,7 @@ fslookup(SunAuthUnix *au, Nfs3Handle *h, char *name, Nfs3Handle *nh) return ok; } fid.fsyshandle = xh; - } + } }else{ /* * Walking dotdot. Ick. @@ -1162,7 +1162,7 @@ fslookup(SunAuthUnix *au, Nfs3Handle *h, char *name, Nfs3Handle *nh) /* * Usually just go to n->parent. - * + * * If we're in a subtree of the mounted file system that * isn't represented explicitly by the config tree (instead * the black hole node represents the entire file tree), @@ -1176,7 +1176,7 @@ fslookup(SunAuthUnix *au, Nfs3Handle *h, char *name, Nfs3Handle *nh) n->parent->fsyshandle.len, n->parent->fsyshandle.h, xh.len, xh.h); } - + if(n->isblackhole){ if(handlecmp(&n->parent->mfsyshandle, &xh) == 0) n = n->parent; @@ -1205,7 +1205,7 @@ fsaccess(SunAuthUnix *au, Nfs3Handle *h, u32int want, u32int *got, Nfs3Attr *att { Fid fid; Nfs3Status ok; - + trace("access %.*lH 0x%ux\n", h->len, h->h, want); if((ok = handletofid(h, &fid, HAccess)) != Nfs3Ok) return ok; @@ -1220,7 +1220,7 @@ fsreadlink(SunAuthUnix *au, Nfs3Handle *h, char **link) { Fid fid; Nfs3Status ok; - + trace("readlink %.*lH\n", h->len, h->h); if((ok = handletofid(h, &fid, HRead)) != Nfs3Ok) return ok; @@ -1235,7 +1235,7 @@ fsreadfile(SunAuthUnix *au, Nfs3Handle *h, u32int count, u64int offset, uchar ** { Fid fid; Nfs3Status ok; - + trace("readfile %.*lH\n", h->len, h->h); if((ok = handletofid(h, &fid, HRead)) != Nfs3Ok) return ok; @@ -1252,7 +1252,7 @@ fsreaddir(SunAuthUnix *au, Nfs3Handle *h, u32int len, u64int cookie, uchar **pda Fid fid; Nfs3Status ok; - trace("readdir %.*lH\n", h->len, h->h); + trace("readdir %.*lH\n", h->len, h->h); if((ok = handletofid(h, &fid, HRead)) != Nfs3Ok) return ok; if(fid.fsys) @@ -1272,7 +1272,7 @@ Nfs3Status refreshdiskread(Cnode *n, u32int count, u64int offset, uchar **data, u32int *pcount, u1int *peof) { char buf[128]; - + if(offset != 0){ *pcount = 0; *peof = 1; @@ -1293,7 +1293,7 @@ Nfs3Status refreshconfigread(Cnode *n, u32int count, u64int offset, uchar **data, u32int *pcount, u1int *peof) { char buf[128]; - + if(offset != 0){ *pcount = 0; *peof = 1; @@ -1309,4 +1309,3 @@ refreshconfigread(Cnode *n, u32int count, u64int offset, uchar **data, u32int *p *peof = 1; return Nfs3Ok; } - diff --git a/src/cmd/venti/copy.c b/src/cmd/venti/copy.c index d6d770bc..50d9bb20 100644 --- a/src/cmd/venti/copy.c +++ b/src/cmd/venti/copy.c @@ -53,7 +53,7 @@ static int havevisited(uchar score[VtScoreSize], int type) { ScoreTree a; - + if(scoretree == nil) return 0; memmove(a.score, score, VtScoreSize); @@ -99,7 +99,7 @@ walk(uchar score[VtScoreSize], uint type, int base, int depth) if(memcmp(score, vtzeroscore, VtScoreSize) == 0 || memcmp(score, zeroscore, VtScoreSize) == 0) return; - + if(havevisited(score, type)){ nskip++; return; @@ -145,7 +145,7 @@ walk(uchar score[VtScoreSize], uint type, int base, int depth) continue; walk(e.score, e.type, e.type&VtTypeBaseMask, depth+1); /* - * Don't repack unless we're rewriting -- some old + * Don't repack unless we're rewriting -- some old * vac files have psize==0 and dsize==0, and these * get rewritten by vtentryunpack to have less strange * block sizes. So vtentryunpack; vtentrypack does not @@ -175,7 +175,7 @@ walk(uchar score[VtScoreSize], uint type, int base, int depth) sysfatal("writing block %V (type %d): %r", score, type); } if(!rewrite && memcmp(score, nscore, VtScoreSize) != 0) - sysfatal("not rewriting: wrote %V got %V", score, nscore); + sysfatal("not rewriting: wrote %V got %V", score, nscore); if((type !=0 || base !=0) && verbose){ n = vtzerotruncate(type, buf, n); @@ -185,7 +185,7 @@ walk(uchar score[VtScoreSize], uint type, int base, int depth) fprint(2, " "); fprint(2, "<- %V\n", score); } - + markvisited(score, type); free(buf); } diff --git a/src/cmd/venti/devnull.c b/src/cmd/venti/devnull.c index fdad553e..3bf6cee4 100644 --- a/src/cmd/venti/devnull.c +++ b/src/cmd/venti/devnull.c @@ -33,7 +33,7 @@ threadmain(int argc, char **argv) fmtinstall('V', vtscorefmt); fmtinstall('F', vtfcallfmt); - + address = "tcp!*!venti"; ARGBEGIN{ @@ -76,4 +76,3 @@ threadmain(int argc, char **argv) } threadexitsall(nil); } - diff --git a/src/cmd/venti/dump.c b/src/cmd/venti/dump.c index 352b3cac..53ec4bad 100644 --- a/src/cmd/venti/dump.c +++ b/src/cmd/venti/dump.c @@ -31,7 +31,7 @@ dump(int indent, uchar *score, int type) uchar *buf; VtEntry e; VtRoot root; - + if(spaces[0] == 0) memset(spaces, ' ', sizeof spaces-1); @@ -54,7 +54,7 @@ dump(int indent, uchar *score, int type) indent*4, spaces, score, root.name, root.type, root.prev, root.blocksize); dump(indent+1, root.score, VtDirType); break; - + case VtDirType: Bprint(&bout, "%.*s%V dir n=%d\n", indent*4, spaces, score, n); for(i=0; i*VtEntrySize<n; i++){ @@ -67,7 +67,7 @@ dump(int indent, uchar *score, int type) dump(indent+2, e.score, e.type); } break; - + case VtDataType: Bprint(&bout, "%.*s%V data n=%d", indent*4, spaces, score, n); for(i=0; i<n; i++){ @@ -88,7 +88,7 @@ dump(int indent, uchar *score, int type) break; } out: - free(buf); + free(buf); } diff --git a/src/cmd/venti/randtest.c b/src/cmd/venti/randtest.c index 7d94eef2..846279fe 100644 --- a/src/cmd/venti/randtest.c +++ b/src/cmd/venti/randtest.c @@ -333,4 +333,3 @@ xxxlrand(void) return x; } - diff --git a/src/cmd/venti/readlist.c b/src/cmd/venti/readlist.c index 0a201827..04ed8e32 100644 --- a/src/cmd/venti/readlist.c +++ b/src/cmd/venti/readlist.c @@ -50,7 +50,7 @@ parsescore(uchar *score, char *buf, int n) if((i & 1) == 0) c <<= 4; - + score[i>>1] |= c; } return 0; diff --git a/src/cmd/venti/ro.c b/src/cmd/venti/ro.c index ee954a32..a499aa1e 100644 --- a/src/cmd/venti/ro.c +++ b/src/cmd/venti/ro.c @@ -32,7 +32,7 @@ readthread(void *v) VtReq *r; uchar *buf; int n; - + r = v; buf = vtmalloc(r->tx.count); if((n=vtread(z, r->tx.score, r->tx.blocktype, buf, r->tx.count)) < 0){ @@ -57,10 +57,10 @@ threadmain(int argc, char **argv) fmtinstall('F', vtfcallfmt); fmtinstall('V', vtscorefmt); - + address = "tcp!*!venti"; ventiaddress = nil; - + ARGBEGIN{ case 'v': verbose++; @@ -109,4 +109,3 @@ threadmain(int argc, char **argv) } threadexitsall(nil); } - diff --git a/src/cmd/venti/srv/arena.c b/src/cmd/venti/srv/arena.c index ddeb3b4c..7df1fc4b 100644 --- a/src/cmd/venti/srv/arena.c +++ b/src/cmd/venti/srv/arena.c @@ -401,7 +401,7 @@ atailcmp(ATailStats *a, ATailStats *b) return -1; if(a->used > b->used) return 1; - + /* suspect tests - why order this way? (no one cares) */ if(a->clumps < b->clumps) return -1; @@ -419,7 +419,7 @@ atailcmp(ATailStats *a, ATailStats *b) return -1; if(a->sealed > b->sealed) return 1; - + /* everything matches */ return 0; } @@ -574,7 +574,7 @@ ReadErr: sha1(b->data, bs-VtScoreSize, nil, &s); sha1(zeroscore, VtScoreSize, nil, &s); sha1(nil, 0, score, &s); - + /* * check for no checksum or the same */ @@ -683,7 +683,7 @@ loadarena(Arena *arena) || arena->blocksize != head.blocksize || arena->size + 2 * arena->blocksize != head.size){ if(namecmp(arena->name, head.name)!=0) - logerr(ECorrupt, "arena tail name %s head %s", + logerr(ECorrupt, "arena tail name %s head %s", arena->name, head.name); else if(arena->clumpmagic != head.clumpmagic) logerr(ECorrupt, "arena tail clumpmagic 0x%lux head 0x%lux", @@ -780,22 +780,22 @@ putcib(Arena *arena, CIBlock *cib) /* - * For index entry readahead purposes, the arenas are + * For index entry readahead purposes, the arenas are * broken into smaller subpieces, called clump info groups * or cigs. Each cig has ArenaCIGSize clumps (ArenaCIGSize * is chosen to make the index entries take up about half * a megabyte). The index entries do not contain enough * information to determine what the clump index is for * a given address in an arena. That info is needed both for - * figuring out which clump group an address belongs to + * figuring out which clump group an address belongs to * and for prefetching a clump group's index entries from * the arena table of contents. The first time clump groups * are accessed, we scan the entire arena table of contents - * (which might be 10s of megabytes), recording the data + * (which might be 10s of megabytes), recording the data * offset of each clump group. */ -/* +/* * load clump info group information by scanning entire toc. */ static void @@ -811,7 +811,7 @@ loadcig(Arena *arena) return; // fprint(2, "loadcig %s\n", arena->name); - + ncig = (arena->memstats.clumps+ArenaCIGSize-1) / ArenaCIGSize; if(ncig == 0){ arena->cig = vtmalloc(1); @@ -839,7 +839,7 @@ loadcig(Arena *arena) } } vtfree(ci); - + arena->ncig = ncig; arena->cig = cig; @@ -900,7 +900,7 @@ asumload(Arena *arena, int g, IEntry *entries, int nentries) fprint(2, "asking for too few entries\n"); return -1; } - + qlock(&arena->lock); if(arena->cig == nil) loadcig(arena); @@ -908,7 +908,7 @@ asumload(Arena *arena, int g, IEntry *entries, int nentries) qunlock(&arena->lock); return -1; } - + addr = 0; base = g*ArenaCIGSize; limit = base + ArenaCIGSize; diff --git a/src/cmd/venti/srv/bloom.c b/src/cmd/venti/srv/bloom.c index 42418d1c..d50b1777 100644 --- a/src/cmd/venti/srv/bloom.c +++ b/src/cmd/venti/srv/bloom.c @@ -1,6 +1,6 @@ /* * Bloom filter tracking which scores are present in our arenas - * and (more importantly) which are not. + * and (more importantly) which are not. */ #include "stdinc.h" @@ -13,19 +13,19 @@ int bloominit(Bloom *b, vlong vsize, u8int *data) { ulong size; - + size = vsize; if(size != vsize){ /* truncation */ werrstr("bloom data too big"); return -1; } - + b->size = size; b->nhash = 32; /* will be fixed by caller on initialization */ if(data != nil) if(unpackbloomhead(b, data) < 0) return -1; - + b->bitmask = (b->size<<3) - 1; b->data = data; return 0; @@ -42,7 +42,7 @@ readbloom(Part *p) { uchar buf[512]; Bloom *b; - + b = vtmallocz(sizeof *b); if(readpart(p, 0, buf, sizeof buf) < 0) return nil; @@ -75,7 +75,7 @@ int resetbloom(Bloom *b) { uchar *data; - + data = vtmallocz(b->size); b->data = data; if(b->size == MaxBloomSize) /* 2^32 overflows ulong */ @@ -92,7 +92,7 @@ loadbloom(Bloom *b) uint ones; uchar *data; u32int *a; - + data = vtmallocz(b->size); if(readpart(b->part, 0, data, b->size) < 0){ vtfree(b); @@ -105,14 +105,14 @@ loadbloom(Bloom *b) n = b->size/4; ones = 0; for(i=0; i<n; i++) - ones += countbits(a[i]); + ones += countbits(a[i]); addstat(StatBloomOnes, ones); if(b->size == MaxBloomSize) /* 2^32 overflows ulong */ addstat(StatBloomBits, b->size*8-1); else addstat(StatBloomBits, b->size*8); - + return 0; } @@ -204,7 +204,7 @@ inbloomfilter(Bloom *b, u8int *score) if(ignorebloom) return 1; - + rlock(&b->lk); r = _inbloomfilter(b, score); runlock(&b->lk); @@ -236,7 +236,7 @@ markbloomfiltern(Bloom *b, u8int score[][20], int n) if(b == nil || b->data == nil) return; - + rlock(&b->lk); qlock(&b->mod); for(i=0; i<n; i++) @@ -251,7 +251,7 @@ bloomwriteproc(void *v) int ret; Bloom *b; - threadsetname("bloomwriteproc"); + threadsetname("bloomwriteproc"); b = v; for(;;){ recv(b->writechan, 0); @@ -268,5 +268,5 @@ startbloomproc(Bloom *b) { b->writechan = chancreate(sizeof(void*), 0); b->writedonechan = chancreate(sizeof(ulong), 0); - vtproc(bloomwriteproc, b); + vtproc(bloomwriteproc, b); } diff --git a/src/cmd/venti/srv/buildindex.c b/src/cmd/venti/srv/buildindex.c index 95fb74b7..faf4b414 100644 --- a/src/cmd/venti/srv/buildindex.c +++ b/src/cmd/venti/srv/buildindex.c @@ -12,7 +12,7 @@ enum }; typedef struct IEntryBuf IEntryBuf; -struct IEntryBuf +struct IEntryBuf { IEntry ie[100]; int nie; @@ -61,7 +61,7 @@ threadmain(int argc, char *argv[]) u32int bcmem, imem; Config conf; Part *p; - + maxdisks = 100000; ventifmtinstall(); imem = 256*1024*1024; @@ -116,18 +116,18 @@ threadmain(int argc, char *argv[]) close(fd); } } - + /* * need a block for every arena */ bcmem = maxblocksize * (mainindex->narenas + 16); if(0) fprint(2, "initialize %d bytes of disk block cache\n", bcmem); initdcache(bcmem); - + totalclumps = 0; for(i=0; i<ix->narenas; i++) totalclumps += ix->arenas[i]->diskstats.clumps; - + totalbuckets = 0; for(i=0; i<ix->nsects; i++) totalbuckets += ix->sects[i]->blocks; @@ -142,7 +142,7 @@ threadmain(int argc, char *argv[]) vtproc(isectproc, ix->sects[i]); } } - + for(i=0; i<nisect; i++) if(isect[i]) fprint(2, "warning: did not find index section %s\n", isect[i]); @@ -180,7 +180,7 @@ threadmain(int argc, char *argv[]) if(ix->bloom && writebloom(ix->bloom) < 0) fprint(2, "writing bloom filter: %r\n"); - fprint(2, "%T done arenaentries=%,lld indexed=%,lld (nskip=%,lld)\n", + fprint(2, "%T done arenaentries=%,lld indexed=%,lld (nskip=%,lld)\n", arenaentries, indexentries, skipentries); threadexitsall(nil); } @@ -189,7 +189,7 @@ static int shouldprocess(ISect *is) { int i; - + if(nisect == 0) return 1; @@ -205,7 +205,7 @@ static void add(u64int *a, u64int n) { static Lock l; - + lock(&l); *a += n; unlock(&l); @@ -233,7 +233,7 @@ arenapartproc(void *v) IEntryBuf *buf, *b; uchar *score; ScoreBuf sb; - + p = v; threadsetname("arenaproc %s", p->name); buf = MKNZ(IEntryBuf, ix->nsects); @@ -247,10 +247,10 @@ arenapartproc(void *v) if(a->part != p) continue; if(a->memstats.clumps) - fprint(2, "%T arena %s: %d entries\n", + fprint(2, "%T arena %s: %d entries\n", a->name, a->memstats.clumps); /* - * Running the loop backwards accesses the + * Running the loop backwards accesses the * clump info blocks forwards, since they are * stored in reverse order at the end of the arena. * This speeds things slightly. @@ -304,7 +304,7 @@ arenapartproc(void *v) } add(&arenaentries, tot); add(&skipentries, nskip); - + for(i=0; i<ix->nsects; i++) if(ix->sects[i]->writechan && buf[i].nie > 0) send(ix->sects[i]->writechan, &buf[i]); @@ -323,7 +323,7 @@ static u32int score2bucket(ISect *is, uchar *score) { u32int b; - + b = hashbits(score, 32)/ix->div; if(b < is->start || b >= is->stop){ fprint(2, "score2bucket: score=%V div=%d b=%ud start=%ud stop=%ud\n", @@ -340,7 +340,7 @@ static u32int offset2bucket(ISect *is, u64int offset) { u32int b; - + assert(is->blockbase <= offset); offset -= is->blockbase; b = offset/is->blocksize; @@ -358,7 +358,7 @@ bucket2offset(ISect *is, u32int b) return is->blockbase + (u64int)b*is->blocksize; } -/* +/* * IEntry buffers to hold initial round of spraying. */ typedef struct Buf Buf; @@ -378,7 +378,7 @@ static void bflush(Buf *buf) { u32int bufsize; - + if(buf->woffset >= buf->eoffset) sysfatal("buf index chunk overflow - need bigger index"); bufsize = buf->ep - buf->bp; @@ -420,11 +420,11 @@ struct Minibuf }; /* - * Index entry pool. Used when trying to shuffle around + * Index entry pool. Used when trying to shuffle around * the entries in a big buffer into the corresponding M minibuffers. * Sized to hold M*EntriesPerBlock entries, so that there will always * either be room in the pool for another block worth of entries - * or there will be an entire block worth of sorted entries to + * or there will be an entire block worth of sorted entries to * write out. */ typedef struct IEntryLink IEntryLink; @@ -461,7 +461,7 @@ countsokay(IPool *p) { int i; u64int n; - + n = 0; for(i=0; i<p->nmbuf; i++) n += p->mcount[i]; @@ -477,21 +477,21 @@ countsokay(IPool *p) */ static IPool* -mkipool(ISect *isect, Minibuf *mbuf, u32int nmbuf, +mkipool(ISect *isect, Minibuf *mbuf, u32int nmbuf, u32int mbufbuckets, u32int bufsize) { u32int i, nentry; uchar *data; IPool *p; IEntryLink *l; - + nentry = (nmbuf+1)*bufsize / IEntrySize; p = ezmalloc(sizeof(IPool) +nentry*sizeof(IEntry) +nmbuf*sizeof(IEntryLink*) +nmbuf*sizeof(u32int) +3*bufsize); - + p->isect = isect; p->mbufbuckets = mbufbuckets; p->bufsize = bufsize; @@ -516,7 +516,7 @@ mkipool(ISect *isect, Minibuf *mbuf, u32int nmbuf, return p; } -/* +/* * Add the index entry ie to the pool p. * Caller must know there is room. */ @@ -543,7 +543,7 @@ ipoolinsert(IPool *p, uchar *ie) l->next = p->mlist[x]; p->mlist[x] = l; p->mcount[x]++; -} +} /* * Pull out a block containing as many @@ -555,7 +555,7 @@ ipoolgetbuf(IPool *p, u32int x) uchar *bp, *ep, *wp; IEntryLink *l; u32int n; - + bp = p->wbuf; ep = p->wbuf + p->bufsize; n = 0; @@ -582,7 +582,7 @@ static void ipoolloadblock(IPool *p, Minibuf *mb) { u32int i, n; - + assert(mb->nentry > 0); assert(mb->roffset >= mb->woffset); assert(mb->roffset < mb->eoffset); @@ -609,14 +609,14 @@ ipoolflush0(IPool *pool, u32int x) { u32int bufsize; Minibuf *mb; - + mb = pool->mbuf+x; bufsize = pool->bufsize; mb->nwentry += ipoolgetbuf(pool, x); if(mb->nentry > 0 && mb->roffset == mb->woffset){ assert(pool->nfree >= pool->bufsize/IEntrySize); /* - * There will be room in the pool -- we just + * There will be room in the pool -- we just * removed a block worth. */ ipoolloadblock(pool, mb); @@ -655,7 +655,7 @@ static void ipoolflush(IPool *pool) { u32int i; - + for(i=0; i<pool->nmbuf; i++) while(pool->mlist[i]) ipoolflush0(pool, i); @@ -668,7 +668,7 @@ ipoolflush(IPool *pool) */ /* - * Compare two packed index entries. + * Compare two packed index entries. * Usual ordering except break ties by putting higher * index addresses first (assumes have duplicates * due to corruption in the lower addresses). @@ -678,7 +678,7 @@ ientrycmpaddr(const void *va, const void *vb) { int i; uchar *a, *b; - + a = (uchar*)va; b = (uchar*)vb; i = ientrycmp(a, b); @@ -692,7 +692,7 @@ zerorange(Part *p, u64int o, u64int e) { static uchar zero[MaxIoSize]; u32int n; - + for(; o<e; o+=n){ n = sizeof zero; if(o+n > e) @@ -703,7 +703,7 @@ zerorange(Part *p, u64int o, u64int e) } /* - * Load a minibuffer into memory and write out the + * Load a minibuffer into memory and write out the * corresponding buckets. */ static void @@ -714,10 +714,10 @@ sortminibuffer(ISect *is, Minibuf *mb, uchar *buf, u32int nbuf, u32int bufsize) u64int o; IBucket ib; Part *part; - + part = is->part; buckdata = emalloc(is->blocksize); - + if(mb->nwentry == 0) return; @@ -732,7 +732,7 @@ sortminibuffer(ISect *is, Minibuf *mb, uchar *buf, u32int nbuf, u32int bufsize) return; } assert(*(uint*)buf != 0xa5a5a5a5); - + /* * remove fragmentation due to IEntrySize * not evenly dividing Bufsize @@ -746,7 +746,7 @@ sortminibuffer(ISect *is, Minibuf *mb, uchar *buf, u32int nbuf, u32int bufsize) ep = buf + mb->nwentry*IEntrySize; assert(ep <= buf+nbuf); - /* + /* * sort entries */ qsort(buf, mb->nwentry, IEntrySize, ientrycmpaddr); @@ -795,14 +795,14 @@ isectproc(void *v) IPool *ipool; ISect *is; Minibuf *mbuf, *mb; - + is = v; blocksize = is->blocksize; nbucket = is->stop - is->start; /* * Three passes: - * pass 1 - write index entries from arenas into + * pass 1 - write index entries from arenas into * large sequential sections on index disk. * requires nbuf * bufsize memory. * @@ -810,36 +810,36 @@ isectproc(void *v) * requires nminibuf * bufsize memory. * * pass 3 - read each minibuf into memory and - * write buckets out. + * write buckets out. * requires entries/minibuf * IEntrySize memory. - * + * * The larger we set bufsize the less seeking hurts us. - * + * * The fewer sections and minibufs we have, the less * seeking hurts us. - * - * The fewer sections and minibufs we have, the + * + * The fewer sections and minibufs we have, the * more entries we end up with in each minibuf - * at the end. + * at the end. * * Shoot for using half our memory to hold each - * minibuf. The chance of a random distribution - * getting off by 2x is quite low. + * minibuf. The chance of a random distribution + * getting off by 2x is quite low. * - * Once that is decided, figure out the smallest + * Once that is decided, figure out the smallest * nminibuf and nsection/biggest bufsize we can use * and still fit in the memory constraints. */ - + /* expected number of clump index entries we'll see */ xclump = nbucket * (double)totalclumps/totalbuckets; - + /* number of clumps we want to see in a minibuf */ xminiclump = isectmem/2/IEntrySize; - + /* total number of minibufs we need */ prod = (xclump+xminiclump-1) / xminiclump; - + /* if possible, skip second pass */ if(!dumb && prod*MinBufSize < isectmem){ nbuf = prod; @@ -904,7 +904,7 @@ isectproc(void *v) } } add(&indexentries, n); - + nn = 0; for(i=0; i<nbuf; i++){ bflush(&buf[i]); @@ -915,15 +915,15 @@ isectproc(void *v) } if(n != nn) fprint(2, "isectproc bug: n=%ud nn=%ud\n", n, nn); - + free(data); fprint(2, "%T %s: reordering\n", is->part->name); - + /* * Rearrange entries into minibuffers and then * split each minibuffer into buckets. - * The minibuffer must be sized so that it is + * The minibuffer must be sized so that it is * a multiple of blocksize -- ipoolloadblock assumes * that each minibuf starts aligned on a blocksize * boundary. @@ -971,7 +971,7 @@ isectproc(void *v) while(mb->nentry > 0){ if(ipool->nfree < epbuf){ ipoolflush1(ipool); - /* ipoolflush1 might change mb->nentry */ + /* ipoolflush1 might change mb->nentry */ continue; } assert(ipool->nfree >= epbuf); @@ -1002,9 +1002,6 @@ isectproc(void *v) } free(data); } - + sendp(isectdonechan, is); } - - - diff --git a/src/cmd/venti/srv/clumpstats.c b/src/cmd/venti/srv/clumpstats.c index d2cfe251..1a7e016c 100644 --- a/src/cmd/venti/srv/clumpstats.c +++ b/src/cmd/venti/srv/clumpstats.c @@ -122,6 +122,6 @@ threadmain(int argc, char *argv[]) initdcache(bcmem); clumpstats(mainindex); - + threadexitsall(0); } diff --git a/src/cmd/venti/srv/cmparenas.c b/src/cmd/venti/srv/cmparenas.c index 322f16ee..5abf8575 100644 --- a/src/cmd/venti/srv/cmparenas.c +++ b/src/cmd/venti/srv/cmparenas.c @@ -57,7 +57,7 @@ printheader(char *name, ArenaHead *head, int fd) Arena arena; vlong baseoff, lo, hi, off; int clumpmax; - + off = seek(fd, 0, 1); seek(fd, off + head->size - head->blocksize, 0); if(readblock(fd, data, head->blocksize) < 0){ @@ -91,7 +91,7 @@ printheader(char *name, ArenaHead *head, int fd) lo = hi; fprint(2, "\t%llx-%llx: clumps (%llx)\n", lo, hi, hi - lo); fprint(2, "\t%llx-%llx: tail\n", hi, hi + head->blocksize); - + fprint(2, "arena:\n"); printarena(2, &arena); return 0; @@ -149,7 +149,7 @@ cmparena(char *name, vlong len) if(printheader(name, &head, fd) < 0) return; - + /* * now we know how much to read * read everything but the last block, which is special @@ -196,7 +196,7 @@ static int shouldcheck(char *name, char **s, int n) { int i; - + if(n == 0) return 1; @@ -213,7 +213,7 @@ char * readap(int fd, ArenaPart *ap) { char *table; - + if(preadblock(fd, data, 8192, PartBlank) < 0) sysfatal("read arena part header: %r"); if(unpackarenapart(ap, data) < 0) @@ -237,7 +237,7 @@ threadmain(int argc, char *argv[]) vlong start, stop; ArenaPart ap; ArenaPart ap1; - + ventifmtinstall(); blocksize = MaxIoSize; ARGBEGIN{ diff --git a/src/cmd/venti/srv/config.c b/src/cmd/venti/srv/config.c index 8c29fe95..e7dde3e4 100644 --- a/src/cmd/venti/srv/config.c +++ b/src/cmd/venti/srv/config.c @@ -201,7 +201,7 @@ configisect(char *file) { Part *part; ISect *is; - + if(0) fprint(2, "configure index section in %s\n", file); part = initpart(file, ORDWR|ODIRECT); @@ -252,4 +252,3 @@ void needmainindex(void) { } - diff --git a/src/cmd/venti/srv/conv.c b/src/cmd/venti/srv/conv.c index e6a6cbfe..90aefbec 100644 --- a/src/cmd/venti/srv/conv.c +++ b/src/cmd/venti/srv/conv.c @@ -162,7 +162,7 @@ unpackarena(Arena *arena, u8int *buf) * all the existing version 4 arenas too. * * To maintain backwards compatibility with existing venti - * installations using the older format, we define that if + * installations using the older format, we define that if * memstats == diskstats, then the extension fields are not * included (see packarena below). That is, only partially * indexed arenas have these fields. Fully indexed arenas @@ -181,7 +181,7 @@ unpackarena(Arena *arena, u8int *buf) p += U64Size; arena->memstats.sealed = U8GET(p); p += U8Size; - + /* * 2008/4/2 * Packarena (below) used to have a bug in which it would @@ -264,7 +264,7 @@ _packarena(Arena *arena, u8int *buf, int forceext) p += U64Size; U8PUT(p, arena->diskstats.sealed); p += U8Size; - + /* * Extension fields; see above. */ @@ -281,7 +281,7 @@ _packarena(Arena *arena, u8int *buf, int forceext) p += U32Size; U32PUT(p, arena->memstats.cclumps); p += U32Size; - U64PUT(p, arena->memstats.used, t32); + U64PUT(p, arena->memstats.used, t32); p += U64Size; U64PUT(p, arena->memstats.uncsize, t32); p += U64Size; @@ -669,7 +669,7 @@ unpackibucket(IBucket *b, u8int *buf, u32int magic) b->data = buf + IBucketSize; if(magic && magic != U32GET(buf+U16Size)) b->n = 0; -} +} void packibucket(IBucket *b, u8int *buf, u32int magic) @@ -705,7 +705,7 @@ unpackbloomhead(Bloom *b, u8int *buf) return -1; } p += U32Size; - + m = U32GET(p); if(m != BloomVersion){ seterr(ECorrupt, "bloom filter has wrong version %ud expected %ud", (uint)m, (uint)BloomVersion); diff --git a/src/cmd/venti/srv/dat.h b/src/cmd/venti/srv/dat.h index f47d01a1..68e6c8f5 100644 --- a/src/cmd/venti/srv/dat.h +++ b/src/cmd/venti/srv/dat.h @@ -90,7 +90,7 @@ enum ArenaPartMagic = 0xa9e4a5e7U, /* arena partition header */ ArenaMagic = 0xf2a14eadU, /* arena trailer */ ArenaHeadMagic = 0xd15c4eadU, /* arena header */ - + BloomMagic = 0xb1004eadU, /* bloom filter header */ BloomMaxHash = 32, @@ -145,7 +145,7 @@ enum IEntryAddrOff = VtScoreSize + U32Size + U16Size, MaxClumpBlocks = (VtMaxLumpSize + ClumpSize + (1 << ABlockLog) - 1) >> ABlockLog, - + IcacheFrac = 1000000, /* denominator */ SleepForever = 1000000000, /* magic value for sleep time */ @@ -156,7 +156,7 @@ enum DirtyArenaCib, DirtyArenaTrailer, DirtyMax, - + ArenaCIGSize = 10*1024, // about 0.5 MB worth of IEntry. VentiZZZZZZZZ @@ -231,7 +231,7 @@ struct DBlock u32int used2; u32int ref; /* reference count */ RWLock lock; /* for access to data only */ - Channel *writedonechan; + Channel *writedonechan; void* chanbuf[1]; /* buffer for the chan! */ }; @@ -315,7 +315,7 @@ struct CIBlock }; /* - * Statistics kept in the tail. + * Statistics kept in the tail. */ struct ATailStats { @@ -382,7 +382,7 @@ struct Arena u32int ctime; /* first time a block was written */ u32int wtime; /* last time a block was written */ u32int clumpmagic; - + ArenaCIG *cig; int ncig; }; @@ -465,7 +465,7 @@ struct Index Bloom *bloom; /* bloom filter */ /* - * fields stored in config file + * fields stored in config file */ u32int version; char name[ANameSize]; /* text label */ @@ -473,7 +473,7 @@ struct Index AMap *smap; /* mapping of buckets to index sections */ int narenas; AMap *amap; /* mapping from index addesses to arenas */ - + QLock writing; }; @@ -529,7 +529,7 @@ struct IEntry /* on disk data - 32 bytes*/ u8int score[VtScoreSize]; IAddr ia; - + IEntry *nexthash; IEntry *nextdirty; IEntry *next; @@ -657,7 +657,7 @@ enum StatSumRead, StatSumReadBytes, - + StatCigLoad, StatCigLoadTime, @@ -762,4 +762,3 @@ extern ulong stattime; #pragma varargck type "V" uchar* #define ODIRECT 0 #endif - diff --git a/src/cmd/venti/srv/dcache.c b/src/cmd/venti/srv/dcache.c index a50ef0c5..f4f00898 100644 --- a/src/cmd/venti/srv/dcache.c +++ b/src/cmd/venti/srv/dcache.c @@ -1,23 +1,23 @@ /* * Disk cache. - * + * * Caches raw disk blocks. Getdblock() gets a block, putdblock puts it back. * Getdblock has a mode parameter that determines i/o and access to a block: * if mode is OREAD or ORDWR, it is read from disk if not already in memory. * If mode is ORDWR or OWRITE, it is locked for exclusive use before being returned. * It is *not* marked dirty -- once changes have been made, they should be noted - * by using dirtydblock() before putdblock(). + * by using dirtydblock() before putdblock(). * - * There is a global cache lock as well as a lock on each block. + * There is a global cache lock as well as a lock on each block. * Within a thread, the cache lock can be acquired while holding a block lock, * but not vice versa; and a block cannot be locked if you already hold the lock * on another block. - * + * * The flush proc writes out dirty blocks in batches, one batch per dirty tag. * For example, the DirtyArena blocks are all written to disk before any of the * DirtyArenaCib blocks. * - * This code used to be in charge of flushing the dirty index blocks out to + * This code used to be in charge of flushing the dirty index blocks out to * disk, but updating the index turned out to benefit from extra care. * Now cached index blocks are never marked dirty. The index.c code takes * care of updating them behind our back, and uses _getdblock to update any @@ -134,7 +134,7 @@ DBlock* getdblock(Part *part, u64int addr, int mode) { DBlock *b; - + b = _getdblock(part, addr, mode, 1); if(mode == OREAD || mode == ORDWR) addstat(StatDcacheRead, 1); @@ -335,7 +335,7 @@ static void unchain(DBlock *b) { ulong h; - + /* * unchain the block */ @@ -395,7 +395,7 @@ void emptydcache(void) { DBlock *b; - + qlock(&dcache.lock); while(dcache.nheap > 0){ b = dcache.heap[0]; @@ -575,7 +575,7 @@ parallelwrites(DBlock **b, DBlock **eb, int dirty) assert(b<=p && p<eb); recvp((*p)->writedonechan); } - + /* * Flush the partitions that have been written to. */ diff --git a/src/cmd/venti/srv/disksched.c b/src/cmd/venti/srv/disksched.c index d43b64c7..0315425c 100644 --- a/src/cmd/venti/srv/disksched.c +++ b/src/cmd/venti/srv/disksched.c @@ -15,7 +15,7 @@ disksched(void) ulong t; vlong cflush; Stats *prev; - + /* * no locks because all the data accesses are atomic. */ @@ -40,22 +40,22 @@ disksched(void) /* # entries written to index cache */ nwrite = stats.n[StatIcacheWrite] - prev->n[StatIcacheWrite]; - + /* # dirty entries in index cache */ ndirty = stats.n[StatIcacheDirty] - prev->n[StatIcacheDirty]; - + /* # entries flushed to disk */ nflush = nwrite - ndirty; - + /* want to stay around 70% dirty */ tdirty = (vlong)stats.n[StatIcacheSize]*700/1000; - + /* assume nflush*icachesleeptime is a constant */ cflush = (vlong)nflush*(icachesleeptime+1); - + /* computer number entries to write in next minute */ toflush = nwrite + (stats.n[StatIcacheDirty] - tdirty); - + /* schedule for that many */ if(toflush <= 0 || cflush/toflush > 100000) icachesleeptime = SleepForever; @@ -86,4 +86,3 @@ diskaccess(int level) } lasttime[level] = time(0); } - diff --git a/src/cmd/venti/srv/fixarenas.c b/src/cmd/venti/srv/fixarenas.c index d7ae41d3..8fc4f55d 100644 --- a/src/cmd/venti/srv/fixarenas.c +++ b/src/cmd/venti/srv/fixarenas.c @@ -6,7 +6,7 @@ * * The rule here (hopefully followed!) is that block corruption * only ever has a local effect -- there are no blocks that you - * can wipe out that will cause large portions of + * can wipe out that will cause large portions of * uncorrupted data blocks to be useless. */ @@ -26,7 +26,7 @@ enum K = 1024, M = 1024*1024, G = 1024*1024*1024, - + Block = 4096, }; @@ -64,7 +64,7 @@ static int zfmt(Fmt *fmt) { vlong x; - + x = va_arg(fmt->args, vlong); if(x == 0) return fmtstrcpy(fmt, "0"); @@ -85,7 +85,7 @@ tfmt(Fmt *fmt) { uint t; char buf[30]; - + t = va_arg(fmt->args, uint); strcpy(buf, ctime(t)); buf[28] = 0; @@ -133,7 +133,7 @@ readdisk(uchar *buf, vlong offset, int len) memset(buf, 0xFB, len); return buf; } - + if(offset+len > partend){ memset(buf, 0xFB, len); len = partend - offset; @@ -141,7 +141,7 @@ readdisk(uchar *buf, vlong offset, int len) if(readpart(part, offset, buf, len) >= 0) return buf; - + /* * The read failed. Clear the buffer to nonsense, and * then try reading in smaller pieces. If that fails, @@ -191,7 +191,7 @@ void sbdebug(Shabuf *sb, char *file) { int fd; - + if(sb->fd > 0){ close(sb->fd); sb->fd = 0; @@ -234,7 +234,7 @@ sbupdate(Shabuf *sb, uchar *p, vlong offset, int len) len -= x; } assert(sb->offset == offset); - + if(sb->fd > 0) pwrite(sb->fd, p, len, offset - sb->r0); @@ -243,7 +243,7 @@ sbupdate(Shabuf *sb, uchar *p, vlong offset, int len) sb->offset += len; return; } - + /* save state every 4M so we can roll back quickly */ o = offset - sb->r0; while(len > 0){ @@ -265,7 +265,7 @@ sbupdate(Shabuf *sb, uchar *p, vlong offset, int len) } sb->hist[x] = sb->state; } - } + } } void @@ -273,7 +273,7 @@ sbdiskhash(Shabuf *sb, vlong eoffset) { static uchar dbuf[4*M]; int n; - + while(sb->offset < eoffset){ n = sizeof dbuf; if(sb->offset+n > eoffset) @@ -289,7 +289,7 @@ sbrollback(Shabuf *sb, vlong offset) int x; vlong o; Dir d; - + if(!sb->rollback || !sb->r0){ print("cannot rollback sha\n"); return; @@ -305,7 +305,7 @@ sbrollback(Shabuf *sb, vlong offset) sb->state = sb->hist[x]; sb->offset = sb->r0 + x*4*M; assert(sb->offset <= offset); - + if(sb->fd > 0){ nulldir(&d); d.length = sb->offset - sb->r0; @@ -325,7 +325,7 @@ sbscore(Shabuf *sb, uchar *score) /* * If we're fixing arenas, then editing this memory edits the disk! - * It will be written back out as new data is paged in. + * It will be written back out as new data is paged in. */ uchar buf[4*M]; uchar sbuf[4*M]; @@ -341,7 +341,7 @@ pagein(vlong offset, int len) memset(buf, 0xFB, sizeof buf); return buf; } - + if(offset+len > partend){ memset(buf, 0xFB, sizeof buf); len = partend - offset; @@ -373,16 +373,16 @@ zerorange(vlong offset, int len) vlong ooff; int olen; enum { MinBlock = 4*K, MaxBlock = 8*K }; - + if(0) if(bufoffset <= offset && offset+len <= bufoffset+buflen){ memset(buf+(offset-bufoffset), 0, len); return; } - + ooff = bufoffset; olen = buflen; - + i = offset%MinBlock; if(i+len < MaxBlock){ pagein(offset-i, (len+MinBlock-1)&~(MinBlock-1)); @@ -455,7 +455,7 @@ static int vlongcmp(const void *va, const void *vb) { vlong a, b; - + a = *(vlong*)va; b = *(vlong*)vb; if(a < b) @@ -524,7 +524,7 @@ Info tailinfo4[] = { 1, "sealed", 0 }; - + Info tailinfo4a[] = { /* tailinfo 4 */ 4, "magic", @@ -547,7 +547,7 @@ Info tailinfo4a[] = { 1, "mem.sealed", 0 }; - + Info tailinfo5[] = { 4, "magic", D|4, "version", @@ -586,12 +586,12 @@ Info tailinfo5a[] = { 1, "mem.sealed", 0 }; - + void showdiffs(uchar *want, uchar *have, int len, Info *info) { int n; - + while(len > 0 && (n=info->len&N) > 0){ if(memcmp(have, want, n) != 0){ switch(info->len){ @@ -625,7 +625,7 @@ showdiffs(uchar *want, uchar *have, int len, Info *info) break; case S|ANameSize: print("\t%s: correct=%s disk=%.*s\n", - info->name, (char*)want, + info->name, (char*)want, utfnlen((char*)have, ANameSize-1), (char*)have); break; @@ -672,7 +672,7 @@ guessgeometry(void) uchar *p, *ep, *sp; u64int diff[100], head[20], tail[20]; u64int offset, bestdiff; - + ap.version = ArenaPartVersion; if(arenasize == 0 || ap.blocksize == 0){ @@ -705,8 +705,8 @@ guessgeometry(void) } if(nhead < 3 && ntail < 3) sysfatal("too few intact arenas: %d heads, %d tails", nhead, ntail); - - /* + + /* * Arena size is likely the most common * inter-head or inter-tail spacing. */ @@ -816,7 +816,7 @@ guessgeometry(void) } } p = pagein(ap.arenabase, Block); - print("arena base likely %z%s\n", (vlong)ap.arenabase, + print("arena base likely %z%s\n", (vlong)ap.arenabase, u32(p)!=ArenaHeadMagic ? " (but no arena head there)" : ""); ap.tabsize = ap.arenabase - ap.tabbase; @@ -893,7 +893,7 @@ isclump(uchar *p, Clump *cl, u32int *pmagic) uchar score[VtScoreSize], *bp; Unwhack uw; uchar ubuf[70*1024]; - + bp = p; magic = u32(p); if(magic == 0) @@ -942,7 +942,7 @@ isclump(uchar *p, Clump *cl, u32int *pmagic) return 0; } p += cl->info.size; - + /* it all worked out in the end */ *pmagic = magic; return p - bp; @@ -975,7 +975,7 @@ int* ltreewalk(int *p, uchar *score) { int i; - + for(;;){ if(*p == -1) return p; @@ -993,7 +993,7 @@ void addcibuf(ClumpInfo *ci, vlong corrupt) { Cit *cit; - + if(ncibuf == mcibuf){ mcibuf += 131072; cibuf = vtrealloc(cibuf, mcibuf*sizeof cibuf[0]); @@ -1012,7 +1012,7 @@ void addcicorrupt(vlong len) { static ClumpInfo zci; - + addcibuf(&zci, len); } @@ -1021,7 +1021,7 @@ haveclump(uchar *score) { int i; int p; - + p = ciroot; for(;;){ if(p == -1) @@ -1054,7 +1054,7 @@ int sealedarena(uchar *p, int blocksize) { int v, n; - + v = u32(p+4); switch(v){ default: @@ -1085,13 +1085,13 @@ int okayname(char *name, int n) { char buf[20]; - + if(nameok(name) < 0) return 0; sprint(buf, "%d", n); if(n == 0) buf[0] = 0; - if(strlen(name) < strlen(buf) + if(strlen(name) < strlen(buf) || strcmp(name+strlen(name)-strlen(buf), buf) != 0) return 0; return 1; @@ -1115,7 +1115,7 @@ loadci(vlong offset, Arena *arena, int nci) int i, j, per; uchar *p, *sp; ClumpInfo *bci, *ci; - + per = arena->blocksize/ClumpInfoSize; bci = vtmalloc(nci*sizeof bci[0]); ci = bci; @@ -1139,7 +1139,7 @@ writeci(vlong offset, Arena *arena, ClumpInfo *ci, int nci) { int i, j, per; uchar *p, *sp; - + per = arena->blocksize/ClumpInfoSize; offset += arena->size - arena->blocksize; p = sp = nil; @@ -1177,11 +1177,11 @@ loadarenabasics(vlong offset0, int anum, ArenaHead *head, Arena *arena) if(offset0+arena->size > partend) arena->size = partend - offset0; head->size = arena->size; - + arena->blocksize = ap.blocksize; head->blocksize = arena->blocksize; - - /* + + /* * Look for clump magic and name in head/tail blocks. * All the other info we will reconstruct just in case. */ @@ -1194,7 +1194,7 @@ loadarenabasics(vlong offset0, int anum, ArenaHead *head, Arena *arena) strcpy(head->name, ohead.name); } - p = pagein(offset0+arena->size-arena->blocksize, + p = pagein(offset0+arena->size-arena->blocksize, arena->blocksize); memset(&oarena, 0, sizeof oarena); if(unpackarena(&oarena, p) >= 0){ @@ -1228,7 +1228,7 @@ print("old arena: sealed=%d\n", oarena.diskstats.sealed); strcpy(lastbase, arena->name); sprint(dname, "%d", anum); lastbase[strlen(lastbase)-strlen(dname)] = 0; - + /* Was working in arena, now copy to head. */ head->version = arena->version; memmove(head->name, arena->name, sizeof head->name); @@ -1240,7 +1240,7 @@ void shahead(Shabuf *sb, vlong offset0, ArenaHead *head) { uchar headbuf[MaxDiskBlock]; - + sb->offset = offset0; memset(headbuf, 0, sizeof headbuf); packarenahead(head, headbuf); @@ -1251,7 +1251,7 @@ u32int newclumpmagic(int version) { u32int m; - + if(version == ArenaVersion4) return _ClumpMagic; do{ @@ -1279,7 +1279,7 @@ guessarena(vlong offset0, int anum, ArenaHead *head, Arena *arena, ClumpInfo *bci, *ci, *eci, *xci; Cit *bcit, *cit, *ecit; Shabuf oldsha, newsha; - + /* * We expect to find an arena, with data, between offset * and offset+arenasize. With any luck, the data starts at @@ -1314,7 +1314,7 @@ guessarena(vlong offset0, int anum, ArenaHead *head, Arena *arena, loadarenabasics(offset0, anum, head, arena); /* start the clump hunt */ - + clumps = 0; totalcorrupt = 0; sealing = 1; @@ -1424,7 +1424,7 @@ guessarena(vlong offset0, int anum, ArenaHead *head, Arena *arena, * grow clump info blocks if needed. */ if(verbose > 1) - print("\tclump %d: %d %V at %#llux+%#ux (%d)\n", + print("\tclump %d: %d %V at %#llux+%#ux (%d)\n", clumps, cl.info.type, cl.info.score, offset, n, n); addcibuf(&cl.info, 0); if(minclumps%ncib == 0) @@ -1435,7 +1435,7 @@ guessarena(vlong offset0, int anum, ArenaHead *head, Arena *arena, arena->diskstats.cclumps++; arena->diskstats.uncsize += cl.info.uncsize; arena->wtime = cl.time; - + /* * Move to next clump. */ @@ -1470,7 +1470,7 @@ guessarena(vlong offset0, int anum, ArenaHead *head, Arena *arena, pageout(); if(verbose) - print("readable clumps: %d; min. directory entries: %d\n", + print("readable clumps: %d; min. directory entries: %d\n", clumps, minclumps); arena->diskstats.used = lastclumpend - boffset; leaked = eoffset - lastclumpend; @@ -1488,10 +1488,10 @@ guessarena(vlong offset0, int anum, ArenaHead *head, Arena *arena, sbupdate(&oldsha, dbuf, toffset, arena->blocksize); sbscore(&oldsha, oldscore); } - + /* * If we still don't know the clump magic, the arena - * must be empty. It still needs a value, so make + * must be empty. It still needs a value, so make * something up. */ if(arena->version == 0) @@ -1537,7 +1537,7 @@ guessarena(vlong offset0, int anum, ArenaHead *head, Arena *arena, v = offset0 + arena->size - arena->blocksize; clumps = (v-lastclumpend)/arena->blocksize * ncib; } - + if(clumps < minclumps) print("cannot happen?\n"); @@ -1546,7 +1546,7 @@ guessarena(vlong offset0, int anum, ArenaHead *head, Arena *arena, * The tricky part is handling the corrupt sections of arena. * If possible, we remark just the affected directory entries * rather than slide everything down. - * + * * Allocate clumps+1 blocks and check that we don't need * the last one at the end. */ @@ -1554,7 +1554,7 @@ guessarena(vlong offset0, int anum, ArenaHead *head, Arena *arena, eci = bci+clumps+1; bcit = cibuf; ecit = cibuf+ncibuf; - + smart = 0; /* Somehow the smart code doesn't do corrupt clumps right. */ Again: nbad = 0; @@ -1614,11 +1614,11 @@ Again: if(clumpinfocmp(&cit->ci, ci) != 0){ if(verbose && (smart || verbose>1)){ print("clumpinfo %d\n", (int)(ci-bci)); - print("\twant: %d %d %d %V\n", + print("\twant: %d %d %d %V\n", cit->ci.type, cit->ci.size, cit->ci.uncsize, cit->ci.score); - print("\thave: %d %d %d %V\n", - ci->type, ci->size, + print("\thave: %d %d %d %V\n", + ci->type, ci->size, ci->uncsize, ci->score); } *ci = cit->ci; @@ -1633,7 +1633,7 @@ Again: smart = 0; goto Again; } - + assert(ci <= eci); arena->diskstats.clumps = ci-bci; eoffset = writeci(offset0, arena, bci, ci-bci); @@ -1661,7 +1661,7 @@ Nocib: arena->memstats = arena->diskstats; if(sealing && fix){ uchar tbuf[MaxDiskBlock]; - + sbdiskhash(&newsha, toffset); memset(tbuf, 0, sizeof tbuf); packarena(arena, tbuf); @@ -1676,7 +1676,7 @@ dumparena(vlong offset, int anum, Arena *arena) char buf[1000]; vlong o, e; int fd, n; - + snprint(buf, sizeof buf, "%s.%d", dumpbase, anum); if((fd = create(buf, OWRITE, 0666)) < 0){ fprint(2, "create %s: %r\n", buf); @@ -1703,7 +1703,7 @@ checkarena(vlong offset, int anum) ArenaHead head; Info *fmt, *fmta; int sz; - + print("# arena %d: offset %#llux\n", anum, offset); if(offset >= partend){ @@ -1737,11 +1737,11 @@ checkarena(vlong offset, int anum) p = pagein(offset, arena.blocksize); if(memcmp(dbuf, p, arena.blocksize) != 0){ print("on-disk arena header incorrect\n"); - showdiffs(dbuf, p, arena.blocksize, + showdiffs(dbuf, p, arena.blocksize, arena.version==ArenaVersion4 ? headinfo4 : headinfo5); } memmove(p, dbuf, arena.blocksize); - + memset(dbuf, 0, sizeof dbuf); packarena(&arena, dbuf); if(arena.diskstats.sealed) @@ -1781,14 +1781,14 @@ checkarena(vlong offset, int anum) print("\t disk=%V\n", p+arena.blocksize-VtScoreSize); } if(fix && scorecmp(p+arena.blocksize-VtScoreSize, score) != 0){ - print("%ssealing arena%s: %V\n", + print("%ssealing arena%s: %V\n", oarena.diskstats.sealed ? "re" : "", - scorecmp(oldscore, score) == 0 ? + scorecmp(oldscore, score) == 0 ? "" : " after changes", score); } } memmove(p, dbuf, arena.blocksize); - + pageout(); } @@ -1800,7 +1800,7 @@ buildamap(void) ArenaHead h; AMapN *an; AMap *m; - + an = vtmallocz(sizeof *an); for(o=ap.arenabase; o<partend; o+=arenasize){ p = pagein(o, Block); @@ -1812,7 +1812,7 @@ buildamap(void) strcpy(m->name, h.name); } } - return an; + return an; } void @@ -1823,7 +1823,7 @@ checkmap(void) int i, len; AMapN *an; Fmt fmt; - + an = buildamap(); fmtstrinit(&fmt); fmtprint(&fmt, "%ud\n", an->n); @@ -1837,7 +1837,7 @@ checkmap(void) (vlong)len, (vlong)ap.tabsize); len = ap.tabsize; } - + if(ap.tabsize >= 4*M){ /* can't happen - max arenas is 2000 */ print("arena partition map *way* too long\n"); return; @@ -1857,9 +1857,9 @@ void threadmain(int argc, char **argv) { int mode; - + mode = OREAD; - readonly = 1; + readonly = 1; ARGBEGIN{ case 'U': unseal = 1; @@ -1887,22 +1887,22 @@ threadmain(int argc, char **argv) default: usage(); }ARGEND - + if(argc != 1 && argc != 2) usage(); file = argv[0]; - + ventifmtinstall(); fmtinstall('z', zfmt); fmtinstall('t', tfmt); quotefmtinstall(); - + part = initpart(file, mode|ODIRECT); if(part == nil) sysfatal("can't open %s: %r", file); partend = part->size; - + if(isonearena()){ checkarena(0, -1); threadexitsall(nil); @@ -1911,4 +1911,3 @@ threadmain(int argc, char **argv) checkmap(); threadexitsall(nil); } - diff --git a/src/cmd/venti/srv/fmtbloom.c b/src/cmd/venti/srv/fmtbloom.c index 76677871..db08b91a 100644 --- a/src/cmd/venti/srv/fmtbloom.c +++ b/src/cmd/venti/srv/fmtbloom.c @@ -19,7 +19,7 @@ threadmain(int argc, char *argv[]) vlong bits, size, size2; int nhash; vlong nblocks; - + ventifmtinstall(); statsinit(); @@ -62,7 +62,7 @@ threadmain(int argc, char *argv[]) if(size == 0) size = part->size; - + if(size < 1024*1024) sysfatal("bloom filter too small"); @@ -93,7 +93,7 @@ threadmain(int argc, char *argv[]) } /* - * optimal is to use ln 2 times as many hash functions as we have bits per blocks. + * optimal is to use ln 2 times as many hash functions as we have bits per blocks. */ bits = (8*size)/nblocks; nhash = bits*7/10; diff --git a/src/cmd/venti/srv/graph.c b/src/cmd/venti/srv/graph.c index db12c3d9..f4336369 100644 --- a/src/cmd/venti/srv/graph.c +++ b/src/cmd/venti/srv/graph.c @@ -36,7 +36,7 @@ Memimage* allocrepl(ulong color) { Memimage *m; - + m = allocmemimage(Rect(0,0,1,1), RGB24); memfillcolor(m, color); m->flags |= Frepl; @@ -49,10 +49,10 @@ ginit(void) { static int first = 1; int i; - + if(!first) return; - + first = 0; memimageinit(); #ifdef PLAN9PORT @@ -90,7 +90,7 @@ drawlabel(Memimage *m, Point p, int n) { char buf[30]; Point w; - + mklabel(buf, n); w = memsubfontwidth(smallfont, buf); memimagestring(m, Pt(p.x-5-w.x, p.y), memblack, ZP, smallfont, buf); @@ -117,7 +117,7 @@ statgraph(Graph *g) Statbin *b, bin[2000]; /* 32 kB, but whack is worse */ needstack(8192); /* double check that bin didn't kill us */ - + if(g->wid <= MinWidth) g->wid = DefaultWidth; if(g->ht <= MinHeight) @@ -128,7 +128,7 @@ statgraph(Graph *g) g->fill = ((uint)(uintptr)g->arg>>8)%nelem(lofill); if(g->fill > nelem(lofill)) g->fill %= nelem(lofill); - + nbin = g->wid - (Left+Right); binstats(g->fn, g->arg, g->t0, g->t1, bin, nbin); @@ -168,7 +168,7 @@ statgraph(Graph *g) } r = Rect(Left, Top, g->wid-Right, g->ht-Bottom); memfillcolor(m, DTransparent); - + /* x axis */ memimagedraw(m, Rect(r.min.x, r.max.y, r.max.x, r.max.y+1), black, ZP, memopaque, ZP, S); @@ -176,7 +176,7 @@ statgraph(Graph *g) drawlabel(m, r.min, max); if(min != 0) drawlabel(m, Pt(r.min.x, r.max.y-smallfont->height), min); - + /* actual data */ for(i=0; i<nbin; i++){ b = &bin[i]; diff --git a/src/cmd/venti/srv/hdisk.c b/src/cmd/venti/srv/hdisk.c index 8cf937d1..e477b815 100644 --- a/src/cmd/venti/srv/hdisk.c +++ b/src/cmd/venti/srv/hdisk.c @@ -14,7 +14,7 @@ hdisk(HConnect *c) char *disk, *type; Part *p; int ret; - + if(hsethtml(c) < 0) return -1; @@ -42,7 +42,7 @@ hdisk(HConnect *c) return 0; } freepart(p); - return ret; + return ret; } static int @@ -51,7 +51,7 @@ disksummary(HConnect *c) int i; Index *ix; Part *p; - + hprint(&c->hout, "<h1>venti disks</h1>\n"); hprint(&c->hout, "<pre>\n"); ix = mainindex; @@ -83,7 +83,7 @@ readap(Part *p, ArenaPart *ap) { uchar *blk; char *table; - + blk = vtmalloc(8192); if(readpart(p, PartBlank, blk, 8192) != 8192) return nil; @@ -108,7 +108,7 @@ xfindarena(char *table, char *name, vlong *start, vlong *end) { int i, nline; char *p, *q, *f[4], line[256]; - + nline = atoi(table); p = strchr(table, '\n'); if(p) @@ -212,7 +212,7 @@ diskarenapart(HConnect *c, char *disk, Part *p) hprint(&c->hout, "%r\n"); goto out; } - + hprint(&c->hout, "<pre>\n"); hprint(&c->hout, "version=%d blocksize=%d base=%d\n", ap.version, ap.blocksize, ap.arenabase); @@ -223,12 +223,12 @@ diskarenapart(HConnect *c, char *disk, Part *p) diskarenatable(c, disk, table); goto out; } - + if(xfindarena(table, arenaname, &start, &end) < 0){ hprint(&c->hout, "no such arena %s\n", arenaname); goto out; } - + hprint(&c->hout, "<h2>arena %s</h2>\n", arenaname); hprint(&c->hout, "<pre>start=%#llx end=%#llx<pre>\n", start, end); if(end < start || end - start < HeadSize){ @@ -253,7 +253,7 @@ diskarenapart(HConnect *c, char *disk, Part *p) hprint(&c->hout, "head:\n<pre>\n"); hprint(&c->hout, "version=%d name=%s blocksize=%d size=%#llx clumpmagic=%#ux\n", - head.version, head.name, head.blocksize, head.size, + head.version, head.name, head.blocksize, head.size, head.clumpmagic); hprint(&c->hout, "</pre><br><br>\n"); @@ -281,7 +281,7 @@ diskarenapart(HConnect *c, char *disk, Part *p) scorecp(arena.score, blk+head.blocksize - VtScoreSize); vtfree(blk); - + hprint(&c->hout, "tail:\n<pre>\n"); hprint(&c->hout, "version=%d name=%s\n", arena.version, arena.name); hprint(&c->hout, "ctime=%d %s\n", arena.ctime, fmttime(tbuf, arena.ctime)); @@ -389,10 +389,10 @@ diskarenatoc(HConnect *c, Arena *arena) } unpackclumpinfo(&ci, blk+(i%arena->clumpmax)*ClumpInfoSize); if(i/arena->clumpmax == cib || i%arena->clumpmax == 0){ - hprint(&c->hout, "%5d %6d %7d %V", + hprint(&c->hout, "%5d %6d %7d %V", ci.type, ci.size, ci.uncsize, ci.score); if(coff >= 0) - hprint(&c->hout, " at <a href=\"%s&clump=%#llx&score=%V\">%#llx</a>", + hprint(&c->hout, " at <a href=\"%s&clump=%#llx&score=%V\">%#llx</a>", base, coff, ci.score, coff); if(i/arena->clumpmax != cib) hprint(&c->hout, " <font size=-1><a href=\"%s&cib=%d\">more</a></font>", base, i/arena->clumpmax); @@ -415,7 +415,7 @@ diskarenaclump(HConnect *c, Arena *arena, vlong off, char *scorestr) uchar xscore[VtScoreSize], score[VtScoreSize]; Unwhack uw; int n; - + if(scorestr){ if(vtparsescore(scorestr, nil, score) < 0){ hprint(&c->hout, "bad score %s: %r\n", scorestr); @@ -436,7 +436,7 @@ diskarenaclump(HConnect *c, Arena *arena, vlong off, char *scorestr) hprint(&c->hout, "bad offset %#llx\n", off); return -1; } - + off += arena->base; blk = vtmalloc(ClumpSize + VtMaxLumpSize); @@ -461,15 +461,15 @@ diskarenaclump(HConnect *c, Arena *arena, vlong off, char *scorestr) hprint(&c->hout, "<pre>type=%d size=%d uncsize=%d score=%V\n", cl.info.type, cl.info.size, cl.info.uncsize, cl.info.score); hprint(&c->hout, "encoding=%d creator=%d time=%d %s</pre>\n", cl.encoding, cl.creator, cl.time, fmttime(err, cl.time)); - + if(cl.info.type == VtCorruptType) hprint(&c->hout, "clump is marked corrupt<br>\n"); - + if(cl.info.size >= VtMaxLumpSize){ hprint(&c->hout, "clump too big\n"); goto error; } - + switch(cl.encoding){ case ClumpECompress: blk2 = vtmalloc(VtMaxLumpSize); @@ -493,7 +493,7 @@ diskarenaclump(HConnect *c, Arena *arena, vlong off, char *scorestr) scoremem(xscore, blk+ClumpSize, cl.info.size); break; } - + hprint(&c->hout, "score=%V<br>\n", xscore); if(scorestr && scorecmp(score, xscore) != 0) hprint(&c->hout, "score does NOT match expected %V\n", score); @@ -536,7 +536,7 @@ debugamap(HConnect *c) amap = mainindex->amap; for(i=0; i<mainindex->narenas; i++) - hprint(&c->hout, "%s %#llx %#llx\n", + hprint(&c->hout, "%s %#llx %#llx\n", amap[i].name, amap[i].start, amap[i].stop); } @@ -559,23 +559,23 @@ debugread(HConnect *c, u8int *score) hprint(&c->hout, "zero score\n"); return; } - + hprint(&c->hout, "<h2>index search %V</h2><pre>\n", score); if(icachelookup(score, -1, &ia) < 0) hprint(&c->hout, " icache: not found\n"); else hprint(&c->hout, " icache: addr=%#llx size=%d type=%d blocks=%d\n", ia.addr, ia.size, ia.type, ia.blocks); - + if(loadientry(mainindex, score, -1, &ie) < 0) hprint(&c->hout, " idisk: not found\n"); else hprint(&c->hout, " idisk: addr=%#llx size=%d type=%d blocks=%d\n", ie.ia.addr, ie.ia.size, ie.ia.type, ie.ia.blocks); - + hprint(&c->hout, "</pre><h2>lookup %V</h2>\n", score); hprint(&c->hout, "<pre>\n"); - + for(type=0; type < VtMaxType; type++){ hprint(&c->hout, "%V type %d:", score, type); u = lookuplump(score, type); @@ -584,14 +584,14 @@ debugread(HConnect *c, u8int *score) else hprint(&c->hout, " -cache"); putlump(u); - + if(lookupscore(score, type, &ia) < 0){ hprint(&c->hout, " -lookup\n"); continue; } hprint(&c->hout, "\n lookupscore: addr=%#llx size=%d blocks=%d\n", ia.addr, ia.size, ia.blocks); - + arena = amapitoa(mainindex, ia.addr, &aa); if(arena == nil){ hprint(&c->hout, " amapitoa failed: %r\n"); @@ -606,7 +606,7 @@ debugread(HConnect *c, u8int *score) hprint(&c->hout, " loadclump failed: %r\n"); continue; } - + hprint(&c->hout, " loadclump: uncsize=%d type=%d score=%V\n", cl.info.uncsize, cl.info.type, sc); if(ia.size != cl.info.uncsize || ia.type != cl.info.type || scorecmp(score, sc) != 0){ @@ -614,12 +614,12 @@ debugread(HConnect *c, u8int *score) continue; } } - + if(hargstr(c, "brute", "")[0] == 'y'){ hprint(&c->hout, "</pre>\n"); hprint(&c->hout, "<h2>brute force arena search %V</h2>\n", score); hprint(&c->hout, "<pre>\n"); - + for(i=0; i<mainindex->narenas; i++){ arena = mainindex->arenas[i]; hprint(&c->hout, "%s...\n", arena->name); @@ -637,10 +637,10 @@ static void debugmem(HConnect *c) { Index *ix; - + ix = mainindex; hprint(&c->hout, "<h2>memory</h2>\n"); - + hprint(&c->hout, "<pre>\n"); hprint(&c->hout, "ix=%p\n", ix); hprint(&c->hout, "\tarenas=%p\n", ix->arenas); @@ -660,7 +660,7 @@ hdebug(HConnect *c) { char *scorestr, *op; u8int score[VtScoreSize]; - + if(hsethtml(c) < 0) return -1; hprint(&c->hout, "<h1>venti debug</h1>\n"); @@ -670,7 +670,7 @@ hdebug(HConnect *c) hprint(&c->hout, "no op\n"); return 0; } - + if(strcmp(op, "amap") == 0){ debugamap(c); return 0; @@ -690,7 +690,7 @@ hdebug(HConnect *c) debugread(c, score); return 0; } - + hprint(&c->hout, "unknown op %s", op); return 0; } diff --git a/src/cmd/venti/srv/hproc.c b/src/cmd/venti/srv/hproc.c index 42933920..3da217ce 100644 --- a/src/cmd/venti/srv/hproc.c +++ b/src/cmd/venti/srv/hproc.c @@ -7,11 +7,10 @@ int hproc(HConnect *c) { int r; - + if((r = hsettext(c)) < 0) return r; hprint(&c->hout, "/proc only implemented on Plan 9\n"); hflush(&c->hout); return 0; } - diff --git a/src/cmd/venti/srv/httpd.c b/src/cmd/venti/srv/httpd.c index 83d80ca7..05896ff4 100644 --- a/src/cmd/venti/srv/httpd.c +++ b/src/cmd/venti/srv/httpd.c @@ -51,7 +51,7 @@ httpdinit(char *address, char *dir) if(address == nil) address = "tcp!*!http"; webroot = dir; - + httpdobj("/stats", estats); httpdobj("/index", dindex); httpdobj("/storage", sindex); @@ -168,7 +168,7 @@ httpproc(void *v) */ if(hparsereq(c, 0) < 0) break; - + for(i = 0; i < MaxObjs && objs[i].name[0]; i++){ n = strlen(objs[i].name); if((objs[i].name[n-1] == '/' && strncmp(c->req.uri, objs[i].name, n) == 0) @@ -196,7 +196,7 @@ char* hargstr(HConnect *c, char *name, char *def) { HSPairs *p; - + for(p=c->req.searchpairs; p; p=p->next) if(strcmp(p->s, name) == 0) return p->t; @@ -207,7 +207,7 @@ vlong hargint(HConnect *c, char *name, vlong def) { char *a; - + if((a = hargstr(c, name, nil)) == nil) return def; return atoll(a); @@ -282,7 +282,7 @@ herror(HConnect *c) { int n; Hio *hout; - + hout = &c->hout; n = snprint(c->xferbuf, HBufSize, "<html><head><title>Error</title></head>\n<body><h1>Error</h1>\n<pre>%r</pre>\n</body></html>"); hprint(hout, "%s %s\r\n", hversion, "400 Bad Request"); @@ -301,7 +301,7 @@ herror(HConnect *c) return hflush(hout); } - + int hnotfound(HConnect *c) { @@ -331,7 +331,7 @@ fromwebdir(HConnect *c) char buf[4096], *p, *ext, *type; int i, fd, n, defaulted; Dir *d; - + if(webroot == nil || strstr(c->req.uri, "..")) return hnotfound(c); snprint(buf, sizeof buf-20, "%s/%s", webroot, c->req.uri+1); @@ -430,7 +430,7 @@ xset(HConnect *c) hflush(&c->hout); return 0; } - + old = *namedints[i].p; *namedints[i].p = atoll(value); hprint(&c->hout, "%s = %d (was %d)\n", name, *namedints[i].p, old); @@ -496,7 +496,7 @@ estats(HConnect *c) percent(stats.absorbedwrites, stats.dirtydblocks)); hprint(hout, "disk cache flushes=%,ld\n", stats.dcacheflushes); - hprint(hout, "disk cache flush writes=%,ld (%,ld per flush)\n", + hprint(hout, "disk cache flush writes=%,ld (%,ld per flush)\n", stats.dcacheflushwrites, stats.dcacheflushwrites/(stats.dcacheflushes ? stats.dcacheflushes : 1)); @@ -821,7 +821,7 @@ diskbw(Stats *s) ulong *n; n = s->n; - return n[StatApartReadBytes]+n[StatApartWriteBytes] + return n[StatApartReadBytes]+n[StatApartWriteBytes] + n[StatIsectReadBytes]+n[StatIsectWriteBytes] + n[StatSumReadBytes]; } @@ -882,7 +882,7 @@ static char* graphname[] = "lcachesize", "lcachestall", "lcachelookuptime", - + "dcachehit", "dcachemiss", "dcachelookup", @@ -931,7 +931,7 @@ static char* graphname[] = "sumread", "sumreadbyte", - + "cigload", "cigloadtime", }; @@ -996,7 +996,7 @@ xgraph(HConnect *c) g.ht = hargint(c, "ht", -1); dotext = hargstr(c, "text", "")[0] != 0; g.fill = hargint(c, "fill", -1); - + graph = hargstr(c, "graph", "raw"); if(strcmp(graph, "raw") == 0) g.fn = rawgraph; @@ -1135,14 +1135,14 @@ vtloghdump(Hio *h, VtLog *l) int i; VtLogChunk *c; char *name; - + name = l ? l->name : "<nil>"; hprint(h, "<html><head>\n"); hprint(h, "<title>Venti Server Log: %s</title>\n", name); hprint(h, "</head><body>\n"); hprint(h, "<b>Venti Server Log: %s</b>\n<p>\n", name); - + if(l){ c = l->w; for(i=0; i<l->nchunk; i++){ @@ -1165,12 +1165,12 @@ vtloghlist(Hio *h) { char **p; int i, n; - + hprint(h, "<html><head>\n"); hprint(h, "<title>Venti Server Logs</title>\n"); hprint(h, "</head><body>\n"); hprint(h, "<b>Venti Server Logs</b>\n<p>\n"); - + p = vtlognames(&n); qsort(p, n, sizeof(p[0]), strpcmp); for(i=0; i<n; i++) diff --git a/src/cmd/venti/srv/icache.c b/src/cmd/venti/srv/icache.c index 3055b981..3663345d 100644 --- a/src/cmd/venti/srv/icache.c +++ b/src/cmd/venti/srv/icache.c @@ -60,14 +60,14 @@ mkihash(int size1) u32int size; int bits; IHash *ih; - + bits = 0; size = 1; while(size < size1){ bits++; size <<= 1; } - + ih = vtmallocz(sizeof(IHash)+size*sizeof(ih->table[0])); ih->table = (IEntry**)(ih+1); ih->bits = bits; @@ -80,7 +80,7 @@ ihashlookup(IHash *ih, u8int score[VtScoreSize], int type) { u32int h; IEntry *ie; - + h = hashbits(score, ih->bits); for(ie=ih->table[h]; ie; ie=ie->nexthash) if((type == -1 || type == ie->ia.type) && scorecmp(score, ie->score) == 0) @@ -93,7 +93,7 @@ ihashdelete(IHash *ih, IEntry *ie, char *what) { u32int h; IEntry **l; - + h = hashbits(ie->score, ih->bits); for(l=&ih->table[h]; *l; l=&(*l)->nexthash) if(*l == ie){ @@ -107,7 +107,7 @@ static void ihashinsert(IHash *ih, IEntry *ie) { u32int h; - + h = hashbits(ie->score, ih->bits); ie->nexthash = ih->table[h]; ih->table[h] = ie; @@ -203,7 +203,7 @@ scacheevict(void) { ISum *s; int i; - + for(i=icache.nsum-1; i>=0; i--){ s = icache.sum[i]; if(canqlock(&s->lock)){ @@ -281,7 +281,7 @@ scachemiss(u64int addr) qunlock(&s->lock); return nil; } - + return s; /* locked */ } @@ -294,7 +294,7 @@ initicache(u32int mem0) { u32int mem; int i, entries, scache; - + icache.full.l = &icache.lock; mem = mem0; @@ -312,7 +312,7 @@ fprint(2, "icache %,d bytes = %,d entries; %d scache\n", mem0, entries, scache); icache.clean.prev = icache.clean.next = &icache.clean; icache.dirty.prev = icache.dirty.next = &icache.dirty; icache.free.prev = icache.free.next = (IEntry*)&icache.free; - + icache.hash = mkihash(entries); icache.nentries = entries; setstat(StatIcacheSize, entries); @@ -338,7 +338,7 @@ static IEntry* evictlru(void) { IEntry *ie; - + ie = poplast(&icache.clean); if(ie == nil) return nil; @@ -356,7 +356,7 @@ icacheinsert(u8int score[VtScoreSize], IAddr *ia, int state) while((ie = poplast(&icache.free)) == nil && (ie = evictlru()) == nil){ // Could safely return here if state == IEClean. // But if state == IEDirty, have to wait to make - // sure we don't lose an index write. + // sure we don't lose an index write. // Let's wait all the time. flushdcache(); kickicache(); @@ -444,7 +444,7 @@ insertscore(u8int score[VtScoreSize], IAddr *ia, int state, AState *as) scacheload(toload); qunlock(&toload->lock); } - + if(icache.ndirty >= icache.maxdirty) kickicache(); @@ -483,7 +483,7 @@ lookupscore(u8int score[VtScoreSize], int type, IAddr *ia) addstat2(StatIcacheRead, 1, StatIcacheReadTime, msec() - ms); return ret; } - + u32int hashbits(u8int *sc, int bits) { @@ -550,7 +550,7 @@ void icacheclean(IEntry *ie) { IEntry *next; - + trace(TraceProc, "icacheclean enter"); qlock(&icache.lock); for(; ie; ie=next){ @@ -574,7 +574,7 @@ emptyicache(void) int i; IEntry *ie; ISum *s; - + qlock(&icache.lock); while((ie = evictlru()) != nil) pushfirst(&icache.free, ie); @@ -586,4 +586,3 @@ emptyicache(void) } qunlock(&icache.lock); } - diff --git a/src/cmd/venti/srv/icachewrite.c b/src/cmd/venti/srv/icachewrite.c index e1406ef1..d2e5a815 100644 --- a/src/cmd/venti/srv/icachewrite.c +++ b/src/cmd/venti/srv/icachewrite.c @@ -81,7 +81,7 @@ nextchunk(Index *ix, ISect *is, IEntry **pie, u64int *paddr, uint *pnbuf) *pnbuf = nbuf; return iefirst; } - + static int icachewritesect(Index *ix, ISect *is, u8int *buf) { @@ -192,7 +192,7 @@ skipit: err = -1; continue; } - + addstat(StatIsectWriteBytes, nbuf); addstat(StatIsectWrite, 1); icacheclean(chunk); @@ -264,7 +264,7 @@ icachewritecoord(void *v) send(ix->sects[i]->writechan, 0); if(ix->bloom) send(ix->bloom->writechan, 0); - + err = 0; for(i=0; i<ix->nsects; i++) err |= recvul(ix->sects[i]->writedonechan); @@ -355,4 +355,3 @@ iesort(IEntry *ie) *l = nil; return sorted; } - diff --git a/src/cmd/venti/srv/index.c b/src/cmd/venti/srv/index.c index 07bf81c8..c3baa905 100644 --- a/src/cmd/venti/srv/index.c +++ b/src/cmd/venti/srv/index.c @@ -1,21 +1,21 @@ /* - * Index, mapping scores to log positions. + * Index, mapping scores to log positions. * * The index is made up of some number of index sections, each of - * which is typically stored on a different disk. The blocks in all the - * index sections are logically numbered, with each index section + * which is typically stored on a different disk. The blocks in all the + * index sections are logically numbered, with each index section * responsible for a range of blocks. Blocks are typically 8kB. * * The N index blocks are treated as a giant hash table. The top 32 bits * of score are used as the key for a lookup. Each index block holds * one hash bucket, which is responsible for ceil(2^32 / N) of the key space. - * - * The index is sized so that a particular bucket is extraordinarily - * unlikely to overflow: assuming compressed data blocks are 4kB + * + * The index is sized so that a particular bucket is extraordinarily + * unlikely to overflow: assuming compressed data blocks are 4kB * on disk, and assuming each block has a 40 byte index entry, * the index data will be 1% of the total data. Since scores are essentially * random, all buckets should be about the same fullness. - * A factor of 5 gives us a wide comfort boundary to account for + * A factor of 5 gives us a wide comfort boundary to account for * random variation. So the index disk space should be 5% of the arena disk space. */ @@ -500,7 +500,7 @@ initisect1(ISect *is) v = is->part->size & ~(u64int)(is->blocksize - 1); if(is->blockbase + (u64int)is->blocks * is->blocksize != v){ seterr(ECorrupt, "invalid blocks in index section %s", is->name); - /* ZZZ what to do? + /* ZZZ what to do? freeisect(is); return nil; */ @@ -654,7 +654,7 @@ amapitoag(Index *ix, u64int a, u64int *gstart, u64int *glimit, int *g) { u64int aa; Arena *arena; - + arena = amapitoa(ix, a, &aa); if(arena == nil) return nil; @@ -895,5 +895,3 @@ loadibucket(Index *ix, u8int *score, ISect **pis, u32int *pbuck, IBucket *ib) { return loadibucket1(ix, score, pis, pbuck, ib); } - - diff --git a/src/cmd/venti/srv/lump.c b/src/cmd/venti/srv/lump.c index cc0a26dc..3e66068a 100644 --- a/src/cmd/venti/srv/lump.c +++ b/src/cmd/venti/srv/lump.c @@ -178,7 +178,7 @@ writeqlump(Lump *u, Packet *p, int creator, uint ms) insertlump(u, p); else packetfree(p); - + if(syncwrites){ flushdcache(); flushicache(); diff --git a/src/cmd/venti/srv/lumpcache.c b/src/cmd/venti/srv/lumpcache.c index 93fed6d1..0fdc0102 100644 --- a/src/cmd/venti/srv/lumpcache.c +++ b/src/cmd/venti/srv/lumpcache.c @@ -73,7 +73,7 @@ lookuplump(u8int *score, int type) ms = 0; trace(TraceLump, "lookuplump enter"); - + h = hashbits(score, HashLog); /* @@ -426,4 +426,3 @@ checklumpcache(void) if(lumpcache.nheap + nfree + refed != lumpcache.nblocks) sysfatal("lc: missing blocks: %d %d %d %d", lumpcache.nheap, refed, nfree, lumpcache.nblocks); } - diff --git a/src/cmd/venti/srv/lumpqueue.c b/src/cmd/venti/srv/lumpqueue.c index 869eaeae..a312ad17 100644 --- a/src/cmd/venti/srv/lumpqueue.c +++ b/src/cmd/venti/srv/lumpqueue.c @@ -127,7 +127,7 @@ flushqueue(void) qunlock(&q->lock); } } - + static void queueproc(void *vq) { diff --git a/src/cmd/venti/srv/mgr.c b/src/cmd/venti/srv/mgr.c index 9a615b2c..93e87a39 100644 --- a/src/cmd/venti/srv/mgr.c +++ b/src/cmd/venti/srv/mgr.c @@ -105,7 +105,7 @@ rdconf(char *file, Conf *conf) char *s, *line, *flds[10]; int i, ok; IFile f; - + if(readifile(&f, file) < 0) return -1; memset(conf, 0, sizeof *conf); @@ -132,7 +132,7 @@ rdconf(char *file, Conf *conf) }else if(i == 3 && strcmp(flds[1], "verify") == 0) { if(conf->nverify%64 == 0) conf->verify = vtrealloc(conf->verify, (conf->nverify+64)*sizeof(conf->verify[0])); - conf->verify[conf->nverify++] = vtstrdup(flds[2]); + conf->verify[conf->nverify++] = vtstrdup(flds[2]); }else if(i == 3 && strcmp(flds[1], "verifyfreq") == 0) { conf->verifyfreq = atoi(flds[2]); }else if(i == 3 && strcmp(flds[1], "httpaddr") == 0){ @@ -186,7 +186,7 @@ logtext(VtLog *l) int i; char *p; VtLogChunk *c; - + p = logbuf; c = l->w; for(i=0; i<l->nchunk; i++) { @@ -283,7 +283,7 @@ hsettext(HConnect *c) { return hsettype(c, "text/plain; charset=utf-8"); } - + int hnotfound(HConnect *c) { @@ -316,12 +316,12 @@ vtloghlist(Hio *h) { char **p; int i, n; - + hprint(h, "<html><head>\n"); hprint(h, "<title>Venti Server Logs</title>\n"); hprint(h, "</head><body>\n"); hprint(h, "<b>Venti Server Logs</b>\n<p>\n"); - + p = vtlognames(&n); qsort(p, n, sizeof(p[0]), strpcmp); for(i=0; i<n; i++) @@ -336,14 +336,14 @@ vtloghdump(Hio *h, VtLog *l) int i; VtLogChunk *c; char *name; - + name = l ? l->name : "<nil>"; hprint(h, "<html><head>\n"); hprint(h, "<title>Venti Server Log: %s</title>\n", name); hprint(h, "</head><body>\n"); hprint(h, "<b>Venti Server Log: %s</b>\n<p>\n", name); - + if(l){ c = l->w; for(i=0; i<l->nchunk; i++){ @@ -360,7 +360,7 @@ char* hargstr(HConnect *c, char *name, char *def) { HSPairs *p; - + for(p=c->req.searchpairs; p; p=p->next) if(strcmp(p->s, name) == 0) return p->t; @@ -446,7 +446,7 @@ httpproc(void *v) */ if(hparsereq(c, 0) < 0) break; - + for(i = 0; i < MaxObjs && objs[i].name[0]; i++){ n = strlen(objs[i].name); if((objs[i].name[n-1] == '/' && strncmp(c->req.uri, objs[i].name, n) == 0) @@ -508,7 +508,7 @@ fromwebdir(HConnect *c) char buf[4096], *p, *ext, *type; int i, fd, n, defaulted; Dir *d; - + if(conf.webroot == nil || strstr(c->req.uri, "..")) return hnotfound(c); snprint(buf, sizeof buf-20, "%s/%s", conf.webroot, c->req.uri+1); @@ -614,7 +614,7 @@ piper(void *v) int fd; char *p; int ok; - + j = v; fd = j->pipe; l = j->newlog; @@ -625,7 +625,7 @@ piper(void *v) } qlock(&loglk); p = logtext(l); - ok = j->ok(p); + ok = j->ok(p); qunlock(&loglk); j->newok = ok; close(fd); @@ -808,7 +808,7 @@ threadmain(int argc, char **argv) int nofork; char *prog; Job *j; - + ventilogging = 1; ventifmtinstall(); #ifdef PLAN9PORT @@ -893,8 +893,8 @@ void qp(Biobuf *b, char *p) { int n, nspace; - - nspace = 0; + + nspace = 0; n = 0; for(; *p; p++) { if(*p == '\n') { @@ -934,7 +934,7 @@ smtpread(Biobuf *b, int code) { char *p, *q; int n; - + while((p = Brdstr(b, '\n', 1)) != nil) { n = strtol(p, &q, 10); if(n == 0 || q != p+3) { @@ -957,13 +957,13 @@ smtpread(Biobuf *b, int code) return -1; } - + void sendmail(char *content, char *subject, char *msg) { int fd; Biobuf *bin, *bout; - + if((fd = dial(conf.smtp, 0, 0, 0)) < 0) { vtlogprint(errlog, "dial %s: %r\n", conf.smtp); return; @@ -979,7 +979,7 @@ sendmail(char *content, char *subject, char *msg) Bterm(bout); return; } - + Bprint(bout, "HELO venti-mgr\n"); Bflush(bout); if(smtpread(bin, 250) < 0) @@ -994,12 +994,12 @@ sendmail(char *content, char *subject, char *msg) Bflush(bout); if(smtpread(bin, 250) < 0) goto error; - + Bprint(bout, "DATA\n"); Bflush(bout); if(smtpread(bin, 354) < 0) goto error; - + Bprint(bout, "From: \"venti mgr\" <%s>\n", conf.mailfrom); Bprint(bout, "To: <%s>\n", conf.mailto); Bprint(bout, "Subject: %s\n", subject); @@ -1013,7 +1013,7 @@ sendmail(char *content, char *subject, char *msg) Bflush(bout); if(smtpread(bin, 250) < 0) goto error; - + Bprint(bout, "QUIT\n"); Bflush(bout); Bterm(bin); diff --git a/src/cmd/venti/srv/mirrorarenas.c b/src/cmd/venti/srv/mirrorarenas.c index c0d02e65..adca4a78 100644 --- a/src/cmd/venti/srv/mirrorarenas.c +++ b/src/cmd/venti/srv/mirrorarenas.c @@ -1,5 +1,5 @@ /* - * Mirror one arena partition onto another. + * Mirror one arena partition onto another. * Be careful to copy only new data. */ @@ -41,7 +41,7 @@ void tag(int indx, char *name, char *fmt, ...) { va_list arg; - + if(tagged){ free(tagged); tagged = nil; @@ -53,7 +53,7 @@ tag(int indx, char *name, char *fmt, ...) va_end(arg); } -enum +enum { Sealed = 1, Mirrored = 2, @@ -99,7 +99,7 @@ setstatus(int bits) if(bits < 0) { startindx = -1; return; - } + } } void @@ -132,7 +132,7 @@ ereadpart(Part *p, u64int offset, u8int *buf, u32int count) } return 0; } - + int ewritepart(Part *p, u64int offset, u8int *buf, u32int count) { @@ -153,7 +153,7 @@ static void writeproc(void *v) { Write *w; - + USED(v); while((w = recvp(writechan)) != nil){ if(w == &wsync) @@ -175,7 +175,7 @@ copy(uvlong start, uvlong end, char *what, DigestState *ds) static uchar *tmp[2]; uchar *p; Write w[2]; - + assert(start <= end); assert(astart <= start && start < aend); assert(astart <= end && end <= aend); @@ -240,7 +240,7 @@ copy1(uvlong start, uvlong end, char *what, DigestState *ds) int n; uvlong o; static uchar tmp[1024*1024]; - + assert(start <= end); assert(astart <= start && start < aend); assert(astart <= end && end <= aend); @@ -310,16 +310,16 @@ mirror(int indx, Arena *sa, Arena *da) ArenaHead h; DigestState xds, *ds; vlong shaoff, base; - + base = sa->base; blocksize = sa->blocksize; end = sa->base + sa->size; - + astart = base - blocksize; aend = end + blocksize; tag(indx, sa->name, "%T %s (%,llud-%,llud)\n", sa->name, astart, aend); - + if(force){ copy(astart, aend, "all", nil); return; @@ -357,7 +357,7 @@ mirror(int indx, Arena *sa, Arena *da) if(ewritepart(dst, end, buf, blocksize) < 0) return; } - + memset(&h, 0, sizeof h); h.version = da->version; strcpy(h.name, da->name); @@ -379,7 +379,7 @@ mirror(int indx, Arena *sa, Arena *da) sha1(buf, blocksize, nil, ds); shaoff = base; } - + if(sa->diskstats.used != da->diskstats.used){ di = base+rdown(da->diskstats.used, blocksize); si = base+rup(sa->diskstats.used, blocksize); @@ -389,14 +389,14 @@ mirror(int indx, Arena *sa, Arena *da) return; shaoff = si; } - + clumpmax = sa->clumpmax; di = end - da->diskstats.clumps/clumpmax * blocksize; si = end - (sa->diskstats.clumps+clumpmax-1)/clumpmax * blocksize; if(sa->diskstats.sealed){ /* - * might be a small hole between the end of the + * might be a small hole between the end of the * data and the beginning of the directory. */ v = base+rup(sa->diskstats.used, blocksize); @@ -419,7 +419,7 @@ mirror(int indx, Arena *sa, Arena *da) da->wtime = sa->wtime; da->diskstats = sa->diskstats; da->diskstats.sealed = 0; - + /* * Repack the arena tail information * and save it for next time... @@ -525,7 +525,7 @@ mirrormany(ArenaPart *sp, ArenaPart *dp, char *range) mirror(i, sa, da); } setstatus(-1); - } + } } @@ -536,7 +536,7 @@ threadmain(int argc, char **argv) Arena *sa, *da; ArenaPart *s, *d; char *ranges; - + ventifmtinstall(); ARGBEGIN{ @@ -552,7 +552,7 @@ threadmain(int argc, char **argv) default: usage(); }ARGEND - + if(argc != 2 && argc != 3) usage(); ranges = nil; @@ -571,7 +571,7 @@ threadmain(int argc, char **argv) sysfatal("loadarenapart %s: %r", argv[1]); for(i=0; i<d->narenas; i++) delarena(d->arenas[i]); - + /* * The arena geometries must match or all bets are off. */ @@ -589,7 +589,7 @@ threadmain(int argc, char **argv) if(strcmp(sa->name, da->name) != 0) sysfatal("arena %d: name mismatch: %s vs %s", i, sa->name, da->name); } - + /* * Mirror one arena at a time. */ diff --git a/src/cmd/venti/srv/part.c b/src/cmd/venti/srv/part.c index ae044814..c1fb929f 100644 --- a/src/cmd/venti/srv/part.c +++ b/src/cmd/venti/srv/part.c @@ -56,7 +56,7 @@ strtoullsuf(char *p, char **pp, int rad, u64int *u) *u = v; return 0; } - + static int parsepart(char *name, char **file, char **subpart, u64int *lo, u64int *hi) { @@ -221,11 +221,11 @@ partblocksize(Part *part, u32int blocksize) * Most Unix systems require that when accessing a block device directly, * the buffer, offset, and count are all multiples of the device block size, * making this a lot more complicated than it otherwise would be. - * + * * Most of our callers will make things easy on us, but for some callers it's best * if we just do the work here, with only one place to get it right (hopefully). - * - * If everything is aligned properly, prwb will try to do big transfers in the main + * + * If everything is aligned properly, prwb will try to do big transfers in the main * body of the loop: up to MaxIo bytes at a time. If everything isn't aligned properly, * we work one block at a time. */ @@ -412,7 +412,7 @@ rwpart(Part *part, int isread, u64int offset, u8int *buf, u32int count) int n, try; u32int blocksize; - trace(TraceDisk, "%s %s %ud at 0x%llx", + trace(TraceDisk, "%s %s %ud at 0x%llx", isread ? "read" : "write", part->name, count, offset); if(offset >= part->size || offset+count > part->size){ seterr(EStrange, "out of bounds %s offset 0x%llux count %ud to partition %s size 0x%llux", @@ -491,7 +491,7 @@ readfile(char *name) /* * Search for the Plan 9 partition with the given name. - * This lets you write things like /dev/ad4:arenas + * This lets you write things like /dev/ad4:arenas * if you move a disk from a Plan 9 system to a FreeBSD system. * * God I hope I never write this code again. @@ -566,7 +566,7 @@ findsubpart(Part *part, char *name) /* See if this is a Plan 9 partition. */ if(tryplan9part(part, name) >= 0) return 0; - + /* Otherwise try for an MBR and then narrow to Plan 9 partition. */ if(readpart(part, 0, buf, 512) != 512) return -1; @@ -587,8 +587,3 @@ findsubpart(Part *part, char *name) } return -1; } - - - - - diff --git a/src/cmd/venti/srv/png.c b/src/cmd/venti/srv/png.c index 8805ada4..85901a92 100644 --- a/src/cmd/venti/srv/png.c +++ b/src/cmd/venti/srv/png.c @@ -99,7 +99,7 @@ zread(void *va, void *buf, int n) b[2] = (b[2]*255)/a; } } - }else + }else b += pixwid*pixels; z->x += pixels; @@ -148,7 +148,7 @@ memRGBA(Memimage *i) Memimage *ni; char buf[32]; ulong dst; - + /* * [A]BGR because we want R,G,B,[A] in big-endian order. Sigh. */ @@ -157,7 +157,7 @@ memRGBA(Memimage *i) dst = ABGR32; else dst = BGR24; - + if(i->chan == dst) return i; @@ -194,7 +194,7 @@ writepng(Hio *io, Memimage *m) return -1; hwrite(io, PNGmagic, sizeof PNGmagic); - + /* IHDR chunk */ h = buf; put4(h, Dx(m->r)); h += 4; diff --git a/src/cmd/venti/srv/rdarena.c b/src/cmd/venti/srv/rdarena.c index 9d7cd20e..42be5663 100644 --- a/src/cmd/venti/srv/rdarena.c +++ b/src/cmd/venti/srv/rdarena.c @@ -33,7 +33,7 @@ rdarena(Arena *arena) if(a + bs > e) bs = arena->blocksize; if(readpart(arena->part, a, b->data, bs) < 0) - fprint(2, "can't copy %s, read at %lld failed: %r\n", arena->name, a); + fprint(2, "can't copy %s, read at %lld failed: %r\n", arena->name, a); if(write(1, b->data, bs) != bs) sysfatal("can't copy %s, write at %lld failed: %r", arena->name, a); } diff --git a/src/cmd/venti/srv/readifile.c b/src/cmd/venti/srv/readifile.c index a822a987..ddfef141 100644 --- a/src/cmd/venti/srv/readifile.c +++ b/src/cmd/venti/srv/readifile.c @@ -18,10 +18,10 @@ threadmain(int argc, char *argv[]) default: usage(); }ARGEND - + if(argc != 1) usage(); - + if(readifile(&ifile, argv[0]) < 0) sysfatal("readifile %s: %r", argv[0]); write(1, ifile.b->data, ifile.b->len); diff --git a/src/cmd/venti/srv/reseal.c b/src/cmd/venti/srv/reseal.c index f7353122..41a53ce1 100644 --- a/src/cmd/venti/srv/reseal.c +++ b/src/cmd/venti/srv/reseal.c @@ -97,7 +97,7 @@ verify(Arena *arena, void *data, uchar *newscore) bs = e - n; sha1(data, bs, nil, &ds); } - + /* last block */ if(preadblock(data, arena->blocksize, o + e) < 0){ werrstr("read: %r"); @@ -113,7 +113,7 @@ verify(Arena *arena, void *data, uchar *newscore) } fprint(2, "warning: score mismatch %V != %V\n", score, arena->score); } - + /* prepare new last block */ memset(data, 0, arena->blocksize); packarena(arena, data); @@ -158,17 +158,17 @@ resealarena(char *name, vlong len) if(loadheader(name, &head, &arena, off) < 0) return; - + if(!arena.diskstats.sealed){ fprint(2, "%s: not sealed\n", name); return; } - + if(verify(&arena, data, newscore) < 0){ fprint(2, "%s: failed to verify before reseal: %r\n", name); return; } - + if(pwriteblock(data, arena.blocksize, arena.base + arena.size) < 0){ fprint(2, "%s: writing new tail: %r\n", name); return; @@ -188,7 +188,7 @@ static int shouldcheck(char *name, char **s, int n) { int i; - + if(n == 0) return 1; @@ -205,7 +205,7 @@ char * readap(ArenaPart *ap) { char *table; - + if(preadblock(data, 8192, PartBlank) < 0) sysfatal("read arena part header: %r"); if(unpackarenapart(ap, data) < 0) @@ -229,7 +229,7 @@ threadmain(int argc, char *argv[]) vlong start, stop; ArenaPart ap; Part *part; - + ventifmtinstall(); blocksize = MaxIoSize; ARGBEGIN{ diff --git a/src/cmd/venti/srv/round.c b/src/cmd/venti/srv/round.c index bbf4a478..5e01b0ba 100644 --- a/src/cmd/venti/srv/round.c +++ b/src/cmd/venti/srv/round.c @@ -99,4 +99,3 @@ delaykickroundproc(void *v) trace(TraceProc, "finishround 0x%ux", (uint)n); } } - diff --git a/src/cmd/venti/srv/sortientry.c b/src/cmd/venti/srv/sortientry.c index b8b8e876..e65b9988 100644 --- a/src/cmd/venti/srv/sortientry.c +++ b/src/cmd/venti/srv/sortientry.c @@ -262,7 +262,7 @@ sortiebucks(IEBucks *ib) if(n == TWID32) return TWID64; if(n != ib->bucks[i].total/IEntrySize) - fprint(2, "bucket %d changed count %d => %d\n", + fprint(2, "bucket %d changed count %d => %d\n", i, (int)(ib->bucks[i].total/IEntrySize), n); tot += n; } diff --git a/src/cmd/venti/srv/stats.c b/src/cmd/venti/srv/stats.c index bb944760..e2f077be 100644 --- a/src/cmd/venti/srv/stats.c +++ b/src/cmd/venti/srv/stats.c @@ -17,7 +17,7 @@ Statdesc statdesc[NStat] = { "rpc read cached time", }, { "rpc read uncached", }, { "rpc read uncached time "}, - + { "rpc writes", }, { "rpc writes new", }, { "rpc writes old", }, @@ -83,7 +83,7 @@ Statdesc statdesc[NStat] = { "sum reads", }, { "sum read bytes", }, - + { "cig loads" }, { "cig load time" }, }; @@ -158,9 +158,9 @@ binstats(long (*fn)(Stats *s0, Stats *s1, void *arg), void *arg, int i, j, lo, hi, m; vlong tot; Statbin *b; - + t = stats.now; - + /* negative times mean relative to now. */ if(t0 <= 0) t0 += t; @@ -170,7 +170,7 @@ binstats(long (*fn)(Stats *s0, Stats *s1, void *arg), void *arg, if(t1 <= t0) t0 = t1 - 60*10; if(0) fprint(2, "stats %ld-%ld\n", t0, t1); - + /* binary search to find t0-1 or close */ lo = stattime; hi = stattime+nstathist; @@ -208,5 +208,5 @@ binstats(long (*fn)(Stats *s0, Stats *s1, void *arg), void *arg, b->avg = tot / b->nsamp; if(b->nsamp==0 && i>0) *b = bin[i-1]; - } + } } diff --git a/src/cmd/venti/srv/syncindex0.c b/src/cmd/venti/srv/syncindex0.c index be3a2ea0..9928ca03 100644 --- a/src/cmd/venti/srv/syncindex0.c +++ b/src/cmd/venti/srv/syncindex0.c @@ -11,10 +11,10 @@ syncarenaindex(Arena *arena, u64int a0) ClumpInfo ci; IAddr ia; AState as; - + if(arena->diskstats.clumps == arena->memstats.clumps) return 0; - + memset(&as, 0, sizeof as); as.arena = arena; as.stats = arena->diskstats; @@ -68,10 +68,10 @@ syncindex(Index *ix) continue; } flushdcache(); - + if(arena->memstats.clumps == arena->diskstats.clumps) continue; - + fprint(2, "%T %s: indexing %d clumps...\n", arena->name, arena->memstats.clumps - arena->diskstats.clumps); diff --git a/src/cmd/venti/srv/venti.c b/src/cmd/venti/srv/venti.c index 2a3cc669..1725537a 100644 --- a/src/cmd/venti/srv/venti.c +++ b/src/cmd/venti/srv/venti.c @@ -159,7 +159,7 @@ threadmain(int argc, char *argv[]) /* * block cache: need a block for every arena and every process */ - minbcmem = maxblocksize * + minbcmem = maxblocksize * (mainindex->narenas + mainindex->nsects*4 + 16); if(bcmem < minbcmem) bcmem = minbcmem; diff --git a/src/cmd/venti/srv/verifyarena.c b/src/cmd/venti/srv/verifyarena.c index f53d17f2..47340dcf 100644 --- a/src/cmd/venti/srv/verifyarena.c +++ b/src/cmd/venti/srv/verifyarena.c @@ -127,12 +127,12 @@ verifyarena(char *name, vlong len) scorecp(arena.score, &data[arena.blocksize - VtScoreSize]); if(namecmp(arena.name, head.name) != 0){ - fprint(2, "%T %s: wrong name in trailer: %s vs. %s\n", + fprint(2, "%T %s: wrong name in trailer: %s vs. %s\n", name, head.name, arena.name); return; } if(arena.version != head.version){ - fprint(2, "%T %s: wrong version in trailer: %d vs. %d\n", + fprint(2, "%T %s: wrong version in trailer: %d vs. %d\n", name, head.version, arena.version); return; } @@ -160,7 +160,7 @@ static int shouldcheck(char *name, char **s, int n) { int i; - + if(n == 0) return 1; @@ -209,7 +209,7 @@ threadmain(int argc, char *argv[]) verifyarena("<stdin>", 0); threadexitsall(nil); } - + if((part = initpart(argv[0], OREAD)) == nil) sysfatal("open partition %s: %r", argv[0]); fd = part->fd; @@ -228,7 +228,7 @@ threadmain(int argc, char *argv[]) if(preadblock((uchar*)table, ap.tabsize, ap.tabbase) < 0) sysfatal("reading arena part directory: %r"); table[ap.tabsize] = 0; - + nline = atoi(table); p = strchr(table, '\n'); if(p) diff --git a/src/cmd/venti/srv/wrarena.c b/src/cmd/venti/srv/wrarena.c index 1e274ca7..df8f7fd8 100644 --- a/src/cmd/venti/srv/wrarena.c +++ b/src/cmd/venti/srv/wrarena.c @@ -45,7 +45,7 @@ vtsendthread(void *v) } /* * All the send threads try to exit right when - * threadmain is calling threadexitsall. + * threadmain is calling threadexitsall. * Either libthread or the Linux NPTL pthreads library * can't handle this condition (I suspect NPTL but have * not confirmed this) and we get a seg fault in exit. diff --git a/src/cmd/venti/srv/xml.c b/src/cmd/venti/srv/xml.c index e91afa05..9538d778 100644 --- a/src/cmd/venti/srv/xml.c +++ b/src/cmd/venti/srv/xml.c @@ -65,4 +65,3 @@ void xmlamap(Hio *hout, AMap *s, char *tag, int indent){ xmlu64int(hout, s->stop, "stop"); hprint(hout, "/>\n"); } - diff --git a/src/cmd/venti/srv/zblock.c b/src/cmd/venti/srv/zblock.c index afff0801..80b24064 100644 --- a/src/cmd/venti/srv/zblock.c +++ b/src/cmd/venti/srv/zblock.c @@ -93,4 +93,3 @@ zblock2packet(ZBlock *zb, u32int size) packetappend(p, zb->data, size); return p; } - diff --git a/src/cmd/venti/sync.c b/src/cmd/venti/sync.c index 9d817a72..965f19ed 100644 --- a/src/cmd/venti/sync.c +++ b/src/cmd/venti/sync.c @@ -20,7 +20,7 @@ threadmain(int argc, char *argv[]) fmtinstall('V', vtscorefmt); fmtinstall('F', vtfcallfmt); - + ARGBEGIN{ case 'h': host = EARGF(usage()); diff --git a/src/cmd/venti/writefile.c b/src/cmd/venti/writefile.c index 21117126..3aff69dd 100644 --- a/src/cmd/venti/writefile.c +++ b/src/cmd/venti/writefile.c @@ -85,13 +85,13 @@ threadmain(int argc, char *argv[]) if(vtfilegetentry(f, &e) < 0) sysfatal("vtfilegetentry: %r"); vtfileunlock(f); - + // write directory entry memset(&root, 0, sizeof root); vtentrypack(&e, buf, 0); if(vtwrite(z, root.score, VtDirType, buf, VtEntrySize) < 0) sysfatal("vtwrite dir: %r"); - + // write root strcpy(root.name, "data"); strcpy(root.type, "file"); @@ -99,8 +99,7 @@ threadmain(int argc, char *argv[]) vtrootpack(&root, buf); if(vtwrite(z, score, VtRootType, buf, VtRootSize) < 0) sysfatal("vtwrite root: %r"); - + print("file:%V\n", score); threadexitsall(0); } - diff --git a/src/cmd/zerotrunc.c b/src/cmd/zerotrunc.c index ce6fafea..2ff1d53f 100644 --- a/src/cmd/zerotrunc.c +++ b/src/cmd/zerotrunc.c @@ -23,4 +23,3 @@ main(void) } exits(0); } - |