1 files changed, 13 insertions, 42 deletions

diff --git a/src/cmd/vac/fns.h b/src/cmd/vac/fns.h
index f013f126..335d85c9 100644
--- a/src/cmd/vac/fns.h
+++ b/src/cmd/vac/fns.h
@@ -1,46 +1,17 @@
-Source	*sourceAlloc(Cache*, Lump *u, ulong block, int elem, int readonly);
-Source 	*sourceOpen(Source*, ulong entry, int readOnly);
-Source 	*sourceCreate(Source*, int psize, int dsize, int isdir, ulong entry);
-Lump	*sourceGetLump(Source*, ulong block, int readOnly, int lock);
-Lump	*sourceWalk(Source *r, ulong block, int readOnly, int *);
-int	sourceSetDepth(Source *r, uvlong size);
-int	sourceSetSize(Source *r, uvlong size);
-uvlong	sourceGetSize(Source *r);
-int	sourceSetDirSize(Source *r, ulong size);
-ulong	sourceGetDirSize(Source *r);
-void	sourceRemove(Source*);
-void	sourceFree(Source*);
-int	sourceGetVtEntry(Source *r, VtEntry *dir);
-ulong	sourceGetNumBlocks(Source *r);
+int	mbunpack(MetaBlock *mb, uchar *p, int n);
+void	mbinsert(MetaBlock *mb, int i, MetaEntry*);
+void	mbdelete(MetaBlock *mb, int i, MetaEntry*);
+void	mbpack(MetaBlock *mb);
+uchar	*mballoc(MetaBlock *mb, int n);
 
-Lump	*lumpWalk(Lump *u, int offset, int type, int size, int readOnly, int lock);
-int	lumpGetScore(Lump *u, int offset, uchar score[VtScoreSize]);
-void	lumpDecRef(Lump*, int unlock);
-Lump	*lumpIncRef(Lump*);
-void	lumpFreeEntry(Lump *u, int entry);
+int	meunpack(MetaEntry*, MetaBlock *mb, int i);
+int	mecmp(MetaEntry*, char *s);
+int	mecmpnew(MetaEntry*, char *s);
 
-Cache 	*cacheAlloc(VtSession *z, int blockSize, long nblocks);
-Lump 	*cacheAllocLump(Cache *c, int type, int size, int dir);
-void	cacheFree(Cache *c);
-long	cacheGetSize(Cache*);
-int	cacheSetSize(Cache*, long);
-int	cacheGetBlockSize(Cache *c);
-Lump 	*cacheGetLump(Cache *c, uchar score[VtScoreSize], int type, int size);
-void	cacheCheck(Cache*);
+int	vdsize(VacDir *dir);
+int	vdunpack(VacDir *dir, MetaEntry*);
+void	vdpack(VacDir *dir, MetaEntry*);
 
-int	mbUnpack(MetaBlock *mb, uchar *p, int n);
-void	mbInsert(MetaBlock *mb, int i, MetaEntry*);
-void	mbDelete(MetaBlock *mb, int i, MetaEntry*);
-void	mbPack(MetaBlock *mb);
-uchar	*mbAlloc(MetaBlock *mb, int n);
-
-int	meUnpack(MetaEntry*, MetaBlock *mb, int i);
-int	meCmp(MetaEntry*, char *s);
-int	meCmpNew(MetaEntry*, char *s);
-
-int	vdSize(VacDir *dir);
-int	vdUnpack(VacDir *dir, MetaEntry*);
-void	vdPack(VacDir *dir, MetaEntry*);
-
-VacFile *vfRoot(VacFS *fs, uchar *score);
+VacFile *_vacfileroot(VacFs *fs, VtFile *file);
 
+int	_vacfsnextqid(VacFs *fs, uvlong *qid);