X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=index%2Frecindex.c;h=a6dfbe9d5b4a9621dfbd918d73a7b7dca9f34223;hb=edf09fc5529eae3e8214a432058b4c07b2b8d2f9;hp=ab5e687f2c5978d9311b883c33e05fabb1699dec;hpb=740306b2fbf734d67ab9cd99c11568c576c3c32b;p=idzebra-moved-to-github.git

diff --git a/index/recindex.c b/index/recindex.c
index ab5e687..a6dfbe9 100644
--- a/index/recindex.c
+++ b/index/recindex.c
@@ -1,10 +1,26 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1996, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recindex.c,v $
- * Revision 1.14  1996-02-01 20:48:15  adam
+ * Revision 1.18  1997-07-15 16:28:42  adam
+ * Bug fix: storeData didn't work with files with multiple records.
+ * Bug fix: fixed memory management with records; not really well
+ *  thought through.
+ *
+ * Revision 1.17  1997/02/12 20:39:46  adam
+ * Implemented options -f <n> that limits the log to the first <n>
+ * records.
+ * Changed some log messages also.
+ *
+ * Revision 1.16  1996/06/04 10:19:00  adam
+ * Minor changes - removed include of ctype.h.
+ *
+ * Revision 1.15  1996/05/13  14:23:06  adam
+ * Work on compaction of set/use bytes in dictionary.
+ *
+ * Revision 1.14  1996/02/01  20:48:15  adam
  * The total size of records are always checked in rec_cache_insert to
  * reduce memory usage.
  *
@@ -67,7 +83,6 @@
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "recindxp.h"
 
@@ -88,11 +103,11 @@ static void rec_write_head (Records p)
 
 static void rec_tmp_expand (Records p, int size, int dst_type)
 {
-    if (p->tmp_size < size + 256 ||
+    if (p->tmp_size < size + 2048 ||
         p->tmp_size < p->head.block_size[dst_type]*2)
     {
         xfree (p->tmp_buf);
-        p->tmp_size = size + p->head.block_size[dst_type]*2 + 256;
+        p->tmp_size = size + p->head.block_size[dst_type]*2 + 2048;
         p->tmp_buf = xmalloc (p->tmp_size);
     }
 }
@@ -493,7 +508,7 @@ Record rec_new (Records p)
 
     assert (p);
     rec = xmalloc (sizeof(*rec));
-    if (p->head.index_free == 0)
+    if (1 || p->head.index_free == 0)
         sysno = (p->head.index_last)++;
     else
     {
@@ -552,6 +567,9 @@ void rec_put (Records p, Record *recpp)
 void rec_rm (Record *recpp)
 {
     int i;
+
+    if (!*recpp)
+        return ;
     for (i = 0; i < REC_NO_INFO; i++)
         xfree ((*recpp)->info[i]);
     xfree (*recpp);