|
 |
ad5a0c |
diff -u -r1.20 invlib.c
|
|
|
ad5a0c |
--- src/invlib.c 12 Mar 2012 17:57:55 -0000 1.20
|
|
|
ad5a0c |
+++ src/invlib.c 10 Jul 2012 19:57:51 -0000
|
|
|
ad5a0c |
@@ -169,8 +169,8 @@
|
|
|
ad5a0c |
numpost = 1;
|
|
|
ad5a0c |
|
|
|
ad5a0c |
/* set up as though a block had come and gone, i.e., set up for new block */
|
|
|
ad5a0c |
- /* FIXME HBB: magic number alert (16) */
|
|
|
ad5a0c |
- amtused = 16; /* leave no space - init 3 words + one for luck */
|
|
|
ad5a0c |
+ /* 3 longs needed for: numinvitems, next block, and previous block */
|
|
|
ad5a0c |
+ amtused = 3 * sizeof(long);
|
|
|
ad5a0c |
numinvitems = 0;
|
|
|
ad5a0c |
numlogblk = 0;
|
|
|
ad5a0c |
lastinblk = sizeof(t_logicalblk);
|
|
|
ad5a0c |
@@ -371,8 +371,10 @@
|
|
|
ad5a0c |
zipf[0]++;
|
|
|
ad5a0c |
#endif
|
|
|
ad5a0c |
len = strlen(thisterm);
|
|
|
ad5a0c |
+ /* length of term rounded up to long boundary */
|
|
|
ad5a0c |
wdlen = (len + (sizeof(long) - 1)) / sizeof(long);
|
|
|
ad5a0c |
- /* HBB FIXME 20060419: magic number: 3 */
|
|
|
ad5a0c |
+ /* each term needs 2 longs for its iteminfo and
|
|
|
ad5a0c |
+ * 1 long for its offset */
|
|
|
ad5a0c |
numwilluse = (wdlen + 3) * sizeof(long);
|
|
|
ad5a0c |
/* new block if at least 1 item in block */
|
|
|
ad5a0c |
if (numinvitems && numwilluse + amtused > sizeof(t_logicalblk)) {
|
|
|
ad5a0c |
@@ -435,7 +437,8 @@
|
|
|
ad5a0c |
invcannotwrite(indexfile);
|
|
|
ad5a0c |
return(0);
|
|
|
ad5a0c |
}
|
|
|
ad5a0c |
- amtused = 16;
|
|
|
ad5a0c |
+ /* 3 longs needed for: numinvitems, next block, and previous block */
|
|
|
ad5a0c |
+ amtused = 3 * sizeof(long);
|
|
|
ad5a0c |
numlogblk++;
|
|
|
ad5a0c |
/* check if had to back up, if so do it */
|
|
|
ad5a0c |
if (backupflag) {
|
|
|
ad5a0c |
@@ -468,7 +471,7 @@
|
|
|
ad5a0c |
while (tptr3 > tptr)
|
|
|
ad5a0c |
*--tptr2 = *--tptr3;
|
|
|
ad5a0c |
lastinblk -= j;
|
|
|
ad5a0c |
- amtused += (8 * backupflag + j);
|
|
|
ad5a0c |
+ amtused += ((2 * sizeof(long)) * backupflag + j);
|
|
|
ad5a0c |
for (i = 3; i < (backupflag * 2 + 2); i += 2) {
|
|
|
ad5a0c |
iteminfo.packword[0] = logicalblk.invblk[i];
|
|
|
ad5a0c |
iteminfo.e.offset += (tptr2 - tptr3);
|