Commit Diff

Commit:
589ae3a36793c46a8e92682efd2c7d17a98572b3
From:
Russ Cox <rsc@swtch.com>
Date:
Message:
libventi: correct vtfilesetsize bug (reported by Michael Kaminsky)
Actions:
Patch | Tree
commit - d19769ae98bce9c5893960e92c481a78d62d6be8
commit + 589ae3a36793c46a8e92682efd2c7d17a98572b3
blob - 65e0e8c45a3f131171539a0c3a27ba1a09921d68
blob + 636a6ea781b6249cbab7fe5c5f4717bbd8df4d73
--- src/libventi/cache.c
+++ src/libventi/cache.c
@@ -312,7 +312,7 @@ vtcachelocal(VtCache *c, u32int addr, int type)
 		sysfatal("vtcachelocal: asked for nonexistent block 0");
 	if(addr > c->nblock)
 		sysfatal("vtcachelocal: asked for block #%ud; only %d blocks",
-			addr, c->nblock);
+			(uint)addr, c->nblock);
 
 	b = &c->block[addr-1];
 	if(b->addr == NilBlock || b->iostate != BioLocal)
blob - b6887dec7ad12033bf684283ecf9891d7d32bb56
blob + 1573a155e0353b3a890413319c1f45d956601542
--- src/libventi/file.c
+++ src/libventi/file.c
@@ -342,7 +342,7 @@ shrinksize(VtFile *r, VtEntry *e, uvlong size)
 		ptrsz *= ppb;
 
 	isdir = r->dir;
-	while(depth > 0){
+	while(DEPTH(type) > 0){
 		if(b->addr == NilBlock){
 			/* not worth copying the block just so we can zero some of it */
 			vtblockput(b);