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

Placate the Sun monster.

Browse source
This commit is contained in:
wkj 2004-07-03 17:48:02 +00:00
parent 13afc7e57c
commit 5241ed2bc2
4 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/cmd/9660/dump9660.c
View file

@ -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);