Code calls xfree() instead of free().

[idzebra-moved-to-github.git] / index / recindex.c

diff --git a/index/recindex.c b/index/recindex.c
index ab5e687..25a997f 100644 (file)
--- a/index/recindex.c
+++ b/index/recindex.c
@@ -1,10 +1,30 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1997, 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.19  1997-09-17 12:19:16  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * 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 +87,6 @@
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "recindxp.h"
 
@@ -88,11 +107,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);
     }
 }
@@ -246,7 +265,7 @@ static void rec_update_single (Records p, Record rec)
     rec_write_single (p, rec);
 }
 
-Records rec_open (int rw)
+Records rec_open (BFiles bfs, int rw)
 {
     Records p;
     int i, r;
@@ -256,7 +275,7 @@ Records rec_open (int rw)
     p->tmp_size = 1024;
     p->tmp_buf = xmalloc (p->tmp_size);
     p->index_fname = "recindex";
-    p->index_BFile = bf_open (p->index_fname, 128, rw);
+    p->index_BFile = bf_open (bfs, p->index_fname, 128, rw);
     if (p->index_BFile == NULL)
     {
         logf (LOG_FATAL|LOG_ERRNO, "open %s", p->index_fname);
@@ -306,7 +325,7 @@ Records rec_open (int rw)
     }
     for (i = 0; i<REC_BLOCK_TYPES; i++)
     {
-        if (!(p->data_BFile[i] = bf_open (p->data_fname[i],
+        if (!(p->data_BFile[i] = bf_open (bfs, p->data_fname[i],
                                           p->head.block_size[i],
                                           rw)))
         {
@@ -493,7 +512,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 +571,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);