Commit Diff

Commit:
36c242dd868672ae9c6705622ef1e7dbb84dbbac
From:
David du Colombier <0intro@gmail.com>
Via:
Russ Cox <rsc@swtch.com>
Date:
Message:
venti: fix format on ulong R=rsc CC=plan9port.codebot http://codereview.appspot.com/5328046
Actions:
Patch | Tree
commit - 11758776a1be725491395b59d52074e7f6fb6f82
commit + 36c242dd868672ae9c6705622ef1e7dbb84dbbac
blob - 44f13e06c3fd0bd267d5450ccedba440735778f6
blob + 212e2117473b74555b6399e4f3df8df6f1a8b408
--- src/cmd/venti/dump.c
+++ src/cmd/venti/dump.c
@@ -50,7 +50,7 @@ dump(int indent, uchar *score, int type)
 			Bprint(&bout, "%.*serror unpacking root %V: %r\n", indent*4, spaces, score);
 			goto out;
 		}
-		Bprint(&bout, "%.*s%V root name=%s type=%s prev=%V bsize=%d\n",
+		Bprint(&bout, "%.*s%V root name=%s type=%s prev=%V bsize=%ld\n",
 			indent*4, spaces, score, root.name, root.type, root.prev, root.blocksize);
 		dump(indent+1, root.score, VtDirType);
 		break;
@@ -62,7 +62,7 @@ dump(int indent, uchar *score, int type)
 				Bprint(&bout, "%.*s%d: cannot unpack\n", indent+1, spaces, i);
 				continue;
 			}
-			Bprint(&bout, "%.*s%d: gen=%#lux psize=%d dsize=%d type=%d flags=%#x size=%llud score=%V\n",
+			Bprint(&bout, "%.*s%d: gen=%#lux psize=%ld dsize=%ld type=%d flags=%#x size=%llud score=%V\n",
 				(indent+1)*4, spaces, i, e.gen, e.psize, e.dsize, e.type, e.flags, e.size, e.score);
 			dump(indent+2, e.score, e.type);
 		}
blob - 6485714a322038b18a0d4cab1090e820d6c94ef5
blob + 5e9a7c1fe8e25eaf7f9b6bb384afc7e9221c8c82
--- src/libventi/entry.c
+++ src/libventi/entry.c
@@ -63,7 +63,7 @@ vtentrypack(VtEntry *e, uchar *p, int index)
 		psize = vttobig(psize);
 		dsize = vttobig(dsize);
 		if(psize < 0 || dsize < 0)
-			sysfatal("invalid entry psize/dsize: %d/%d", e->psize, e->dsize);
+			sysfatal("invalid entry psize/dsize: %ld/%ld", e->psize, e->dsize);
 	}
 	U16PUT(p, psize);
 	p += 2;
blob - ebd71998f2fdada5aebbbbb006b85b0a3cfe1e66
blob + ec9c1b7eda2caf328b86ff6c7de825e7ae38c68e
--- src/libventi/file.c
+++ src/libventi/file.c
@@ -67,7 +67,7 @@ vtfilealloc(VtCache *c, VtBlock *b, VtFile *p, u32int 
 	}
 
 	if(DEPTH(e.type) < sizetodepth(e.size, e.psize, e.dsize)){
-		fprint(2, "depth %ud size %llud psize %ud dsize %ud\n",
+		fprint(2, "depth %ud size %llud psize %lud dsize %lud\n",
 			DEPTH(e.type), e.size, e.psize, e.dsize);
 		werrstr("bad depth");
 		return nil;
blob - b1a153d51161427001144770b799bef373a95e89
blob + 2627ee81b240ddd5eb24a2c4bb7fb2e10cec2e7e
--- src/libventi/root.c
+++ src/libventi/root.c
@@ -27,7 +27,7 @@ vtrootpack(VtRoot *r, uchar *p)
 		vers |= _VtRootVersionBig;
 		bsize = vttobig(bsize);
 		if(bsize < 0)
-			sysfatal("invalid root blocksize: %#x", r->blocksize);
+			sysfatal("invalid root blocksize: %#lx", r->blocksize);
 	}
 	U16PUT(p, vers);
 	p += 2;