From 5241ed2bc2c0a0553c75b628d16d3b588cdee685 Mon Sep 17 00:00:00 2001 From: wkj Date: Sat, 3 Jul 2004 17:48:02 +0000 Subject: Placate the Sun monster. --- src/cmd/9660/dump9660.c | 8 ++++---- src/cmd/9660/unix.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/cmd/9660') 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) -- cgit v1.2.3