reserved by posix, move outta the way. Reference: /n/atom/patch/applied/fmtzisreserved Date: Wed Sep 9 06:12:58 CES 2015 Signed-off-by: quanstro@quanstro.net --- /sys/src/cmd/venti/srv/fixarenas.c Wed Sep 9 06:12:49 2015 +++ /sys/src/cmd/venti/srv/fixarenas.c Wed Sep 9 06:12:51 2015 @@ -61,7 +61,7 @@ * Format number in simplest way that is okay with unittoull. */ static int -zfmt(Fmt *fmt) +Zfmt(Fmt *fmt) { vlong x; @@ -612,7 +612,7 @@ info->name, u32(want), u32(have)); break; case Z|4: - print("\t%s: correct=%z disk=%z\n", + print("\t%s: correct=%Z disk=%Z\n", info->name, (uvlong)u32(want), (uvlong)u32(have)); break; case D|8: @@ -620,7 +620,7 @@ info->name, u64(want), u64(have)); break; case Z|8: - print("\t%s: correct=%z disk=%z\n", + print("\t%s: correct=%Z disk=%Z\n", info->name, u64(want), u64(have)); break; case S|ANameSize: @@ -727,9 +727,9 @@ n = 0; } } - print("arena size likely %z (%d of %d)\n", bestdiff, bestn, ndiff); + print("arena size likely %Z (%d of %d)\n", bestdiff, bestn, ndiff); if(arenasize != 0 && arenasize != bestdiff) - print("using user-specified size %z instead\n", arenasize); + print("using user-specified size %Z instead\n", arenasize); else arenasize = bestdiff; @@ -763,9 +763,9 @@ n = 0; } } - print("block size likely %z (%d of %d)\n", bestdiff, bestn, ndiff); + print("block size likely %Z (%d of %d)\n", bestdiff, bestn, ndiff); if(ap.blocksize != 0 && ap.blocksize != bestdiff) - print("using user-specified size %z instead\n", (vlong)ap.blocksize); + print("using user-specified size %Z instead\n", (vlong)ap.blocksize); else ap.blocksize = bestdiff; if(ap.blocksize == 0 || ap.blocksize&(ap.blocksize-1)) @@ -816,7 +816,7 @@ } } 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; @@ -1714,7 +1714,7 @@ guessarena(offset, anum, &head, &arena, oldscore, score); if(verbose){ - print("#\tversion=%d name=%s blocksize=%d size=%z", + print("#\tversion=%d name=%s blocksize=%d size=%Z", head.version, head.name, head.blocksize, head.size); if(head.clumpmagic) print(" clumpmagic=%#.8ux", head.clumpmagic); @@ -1833,7 +1833,7 @@ s = fmtstrflush(&fmt); len = strlen(s); if(len > ap.tabsize){ - print("arena partition map too long: need %z bytes have %z\n", + print("arena partition map too long: need %Z bytes have %Z\n", (vlong)len, (vlong)ap.tabsize); len = ap.tabsize; } @@ -1894,7 +1894,7 @@ file = argv[0]; ventifmtinstall(); - fmtinstall('z', zfmt); + fmtinstall('Z', Zfmt); fmtinstall('t', tfmt); quotefmtinstall();