commit d23a617a8302ef9c6b9edb0a29e3bae4737d5f00
author rsc <devnull@localhost> Mon Mar 15 01:57:29 2004 +0000
committer rsc <devnull@localhost> Mon Mar 15 01:57:29 2004 +0000
tree 0b27efa3e256d681ded36367b0ecc41d58ed8d4c
parent 3d77c87e81bf16aeaf52ba0f523af6708c5c4964

Various small interface changes.

src/libventi/entry.c

diff --git a/src/libventi/entry.c b/src/libventi/entry.c
index 59c09e9..ca1d200 100644
--- a/src/libventi/entry.c
+++ b/src/libventi/entry.c
@@ -31,10 +31,10 @@
 	U16PUT(p, e->dsize);
 	p += 2;
 	depth = e->type&VtTypeDepthMask;
-	flags = (e->flags&~(VtEntryDir|VtEntryDepthShift));
-	flags |= depth << VtEntryDepthShift;
-	if(e->type - depth == VtEntryDir)
-		flags |= VtEntryDir;
+	flags = (e->flags&~(_VtEntryDir|_VtEntryDepthMask));
+	flags |= depth << _VtEntryDepthShift;
+	if(e->type - depth == VtDirType)
+		flags |= _VtEntryDir;
 	U8PUT(p, flags);
 	p++;
 	memset(p, 0, 5);
@@ -62,9 +62,9 @@
 	e->dsize = U16GET(p);
 	p += 2;
 	e->flags = U8GET(p);
-	e->type = (e->flags&VtEntryDir) ? VtDirType : VtDataType;
-	e->type += (e->flags & VtEntryDepthMask) >> VtEntryDepthShift;
-	e->flags &= ~(VtEntryDir|VtEntryDepthMask);
+	e->type = (e->flags&_VtEntryDir) ? VtDirType : VtDataType;
+	e->type += (e->flags & _VtEntryDepthMask) >> _VtEntryDepthShift;
+	e->flags &= ~(_VtEntryDir|_VtEntryDepthMask);
 	p++;
 	p += 5;
 	e->size = U48GET(p);