diff options
| author | wkj <devnull@localhost> | 2004-07-03 17:48:02 +0000 |
|---|---|---|
| committer | wkj <devnull@localhost> | 2004-07-03 17:48:02 +0000 |
| commit | 5241ed2bc2c0a0553c75b628d16d3b588cdee685 (patch) | |
| tree | 4cc67cab95483522941582fce328978a985a3517 /src/cmd | |
| parent | 13afc7e57c2dd8001f23a8875719d57db2a8633c (diff) | |
| download | plan9port-5241ed2bc2c0a0553c75b628d16d3b588cdee685.tar.gz plan9port-5241ed2bc2c0a0553c75b628d16d3b588cdee685.tar.bz2 plan9port-5241ed2bc2c0a0553c75b628d16d3b588cdee685.zip | |
Placate the Sun monster.
Diffstat (limited to 'src/cmd')
| -rw-r--r-- | src/cmd/9660/dump9660.c | 8 | ||||
| -rw-r--r-- | src/cmd/9660/unix.c | 2 | ||||
| -rw-r--r-- | src/cmd/9term/SunOS.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/cmd/9660/dump9660.c b/src/cmd/9660/dump9660.c index 320e56d3..95bba374 100644 --- a/src/cmd/9660/dump9660.c +++ b/src/cmd/9660/dump9660.c @@ -201,7 +201,7 @@ main(int argc, char **argv) checknames(&iroot, isbadiso9660); convertnames(&iroot, struprcpy); } else - convertnames(&iroot, (void *) strcpy); + convertnames(&iroot, (char* (*)(char*, char*))strcpy); // isoabstract = findconform(&iroot, abstract); // isobiblio = findconform(&iroot, biblio); @@ -215,7 +215,7 @@ main(int argc, char **argv) // jnotice = findconform(&jroot, notice); checknames(&jroot, isbadjoliet); - convertnames(&jroot, (void *) strcpy); + convertnames(&jroot, (char* (*)(char*, char*))strcpy); dsort(&jroot, jolietcmp); } @@ -301,14 +301,14 @@ Dofix: * Write dump tree at end. We assume the name characters * are all conforming, so everything is already sorted properly. */ - convertnames(&idumproot, (info.flags & CDconform) ? (void *) struprcpy : (void *) strcpy); + convertnames(&idumproot, (info.flags & CDconform) ? struprcpy : (char* (*)(char*, char*)) strcpy); if(cd->nulldump) { r = walkdirec(&idumproot, dumpname); assert(r != nil); copybutname(r, &iroot); } if(cd->flags & CDjoliet) { - convertnames(&jdumproot, (void *) strcpy); + convertnames(&jdumproot, (char* (*)(char*, char*))strcpy); if(cd->nulldump) { r = walkdirec(&jdumproot, dumpname); assert(r != nil); diff --git a/src/cmd/9660/unix.c b/src/cmd/9660/unix.c index 99332af8..f060c104 100644 --- a/src/cmd/9660/unix.c +++ b/src/cmd/9660/unix.c @@ -41,7 +41,7 @@ dirtoxdir(XDir *xd, Dir *d) //xd->symlink = atom(d->symlink); xd->symlink = atom("symlink"); // XXX: rsc } -}; +} void fdtruncate(int fd, ulong size) diff --git a/src/cmd/9term/SunOS.c b/src/cmd/9term/SunOS.c index 12f64b85..4c85918e 100644 --- a/src/cmd/9term/SunOS.c +++ b/src/cmd/9term/SunOS.c @@ -67,7 +67,7 @@ isecho(int fd) if(debug) fprint(2, "israw %c%c\n", ttmode.c_lflag&ICANON ? 'c' : '-', ttmode.c_lflag&ECHO ? 'e' : '-'); - return (ttmode.c_lflag&(ICANON|ECHO)); + return (ttmode.c_lflag&ICANON && ttmode.c_lflags&ECHO); } int |