#include "trie.h"
#include "index.h"
-#include "malloc.h"
+#include "alloc.h"
#define alignof(typ) ( offsetof(struct { char c; typ t; }, t) )
MAXDEPTH(NODE(ib->t, n->children[1])));
n->totalsize =
- (ELEMENT(ib->t, n->element)->blocks +
+ (ELEMENT(ib->t, n->element)->size +
(n->children[0] ? NODE(ib->t, n->children[0])->totalsize : 0) +
(n->children[1] ? NODE(ib->t, n->children[1])->totalsize : 0));
}
} else {
if (left)
ret += left->totalsize;
- ret += tf->blocks;
+ ret += tf->size;
node = right;
}
}
if (left && size < left->totalsize) {
node = left;
} else if (!right ||
- size < (left ? left->totalsize : 0) + tf->blocks) {
+ size < (left ? left->totalsize : 0) + tf->size) {
return tf->atime;
} else {
if (left)
size -= left->totalsize;
- size -= tf->blocks;
+ size -= tf->size;
node = right;
}
}