o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Various small interface changes.

Browse source
This commit is contained in:
rsc 2004-03-15 01:57:29 +00:00
parent 3d77c87e81
commit d23a617a83
6 changed files with 64 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/libventi/file.c
View file

@ -21,25 +21,6 @@ enum
MaxBlock = (1UL<<31),
};
struct VtFile
{
QLock lk;
int ref;
int local;
VtBlock *b; /* block containing this file */
uchar score[VtScoreSize]; /* score of block containing this file */
/* immutable */
VtCache *c;
int mode;
u32int gen;
int dsize;
int dir;
VtFile *parent;
int epb; /* entries per block in parent */
u32int offset; /* entry offset in parent */
};
static char EBadEntry[] = "bad VtEntry";
static char ENotDir[] = "walk in non-directory";
static char ETooBig[] = "file too big";
@ -109,7 +90,7 @@ vtfilealloc(VtCache *c, VtBlock *b, VtFile *p, u32int offset, int mode)
r->mode = mode;
r->dsize = e.dsize;
r->gen = e.gen;
r->dir = (e.flags & VtEntryDir) != 0;
r->dir = (e.type & VtTypeBaseMask) == VtDirType;
r->ref = 1;
r->parent = p;
if(p){
@ -169,8 +150,7 @@ vtfilecreateroot(VtCache *c, int psize, int dsize, int type)
e.flags = VtEntryActive;
e.psize = psize;
e.dsize = dsize;
if(type == VtDirType)
e.flags |= VtEntryDir;
e.type = type;
memmove(e.score, vtzeroscore, VtScoreSize);
return vtfileopenroot(c, &e);
@ -679,13 +659,15 @@ static int
mkindices(VtEntry *e, u32int bn, int *index)
{
int i, np;
u32int obn;
obn = bn;
memset(index, 0, VtPointerDepth*sizeof(int));
np = e->psize/VtScoreSize;
for(i=0; bn > 0; i++){
if(i >= VtPointerDepth){
werrstr(EBadAddr);
werrstr("bad address 0x%lux", (ulong)bn);
return -1;
}
index[i] = bn % np;
@ -715,7 +697,7 @@ vtfileblock(VtFile *r, u32int bn, int mode)
return nil;
if(i > DEPTH(e.type)){
if(mode == VtOREAD){
werrstr(EBadAddr);
werrstr("bad address 0x%lux", (ulong)bn);
goto Err;
}
index[i] = 0;
@ -746,7 +728,7 @@ Err:
}
int
vtfileblockhash(VtFile *r, u32int bn, uchar score[VtScoreSize])
vtfileblockscore(VtFile *r, u32int bn, uchar score[VtScoreSize])
{
VtBlock *b, *bb;
int index[VtPointerDepth+1];