shithub: neoventi

Info  •  Files  •  Log  •  Branches

minor cleanup

--- a/disk.c

+++ b/disk.c

@@ -365,18 +365,17 @@

 	// Binits cannot fail when given a valid mode; see /sys/src/libbio/binit.c:/^Binits

 	Binits(&bio, index.sects[0].fd, OREAD, buf, index.sects[0].tabsize+Bungetsize);

 	if(Bseek(&bio, index.sects[0].tabbase, 0) != index.sects[0].tabbase)

-		sysfatal("unable to read index header");

+		sysfatal("invalid or corrupt index: unable to read header");

 	if(memcmp(Brdline(&bio, '\n'), "venti index configuration", 25) != 0)

-		sysfatal("invalid magic found in index header");

+		sysfatal("invalid or corrupt index: invalid magic");

 	if(!Brdu32(&bio, &version) || version != 1)

-		sysfatal("failed to read index version or index version unsupported");

+		sysfatal("invalid or corrupt index: index version unsupported");

 	if(memcmp(Brdline(&bio, '\n'), index.sects[0].index, strlen(index.sects[0].index)) != 0)

 		sysfatal("invalid or corrupt index: index/section mismatch");

 	if(!Brdu32(&bio, &index.blocksize))

 		sysfatal("invalid or corrupt index: failed to read blocksize");

-	/* Section map, then arena map; see parseamap */

-	/* Parse both maps, overwrite the section map; we don't need it */

-	/* TODO(mandatory feature): support multiple index sections */

+	/* TODO(mandatory feature): support multiple index sections instead of dropping them */

+	/* The first line here skips the section map */

 	parsemap(&bio, &index.amap, &index.namap);

 	parsemap(&bio, &index.amap, &index.namap);

 	indexcalc();