X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fsortidx.c;h=4d17ad7de85dcce72e7644260a4310f84f22305d;hb=cc9f94a61cbd9dcc0df0cf7d0c7c41d2cec88189;hp=4980a9ad320002f7246d7bb1fa4c8c7f30659abf;hpb=5c693d36af8be6f6642257160b3c6441d2e2d762;p=idzebra-moved-to-github.git

diff --git a/index/sortidx.c b/index/sortidx.c
index 4980a9a..4d17ad7 100644
--- a/index/sortidx.c
+++ b/index/sortidx.c
@@ -1,7 +1,14 @@
-
+/*
+ * Copyright (C) 1998-2002, Index Data ApS
+ * All rights reserved.
+ * Sebastian Hammer, Adam Dickmeiss
+ *
+ * $Id: sortidx.c,v 1.6 2002-02-18 11:46:58 adam Exp $
+ */
+ 
 #include <string.h>
 
-#include <log.h>
+#include <yaz/log.h>
 #include <bfile.h>
 #include <sortidx.h>
 
@@ -29,12 +36,12 @@ struct sortIdx {
 
 SortIdx sortIdx_open (BFiles bfs, int write_flag)
 {
-    SortIdx si = xmalloc (sizeof(*si));
+    SortIdx si = (SortIdx) xmalloc (sizeof(*si));
     si->bfs = bfs;
     si->write_flag = write_flag;
     si->current_file = NULL;
     si->files = NULL;
-    si->entry_buf = xmalloc (SORT_IDX_ENTRYSIZE);
+    si->entry_buf = (char *) xmalloc (SORT_IDX_ENTRYSIZE);
     return si;
 }
 
@@ -65,22 +72,29 @@ int sortIdx_type (SortIdx si, int type)
 	    si->current_file = sf;
 	    return 0;
 	}
-    sf = xmalloc (sizeof(*sf));
+    sf = (struct sortFile *) xmalloc (sizeof(*sf));
     sf->type = type;
     sf->bf = NULL;
-    sf->next = si->files;
-    si->current_file = si->files = sf;
     sprintf (fname, "sort%d", type);
     logf (LOG_DEBUG, "sort idx %s wr=%d", fname, si->write_flag);
     sf->bf = bf_open (si->bfs, fname, SORT_IDX_BLOCKSIZE, si->write_flag);
     if (!sf->bf)
+    {
+        xfree (sf);
 	return -1;
+    }
     if (!bf_read (sf->bf, 0, 0, sizeof(sf->head), &sf->head))
     {
 	sf->head.sysno_max = 0;
 	if (!si->write_flag)
+        {
+            bf_close (sf->bf);
+            xfree (sf);
 	    return -1;
+        }
     }
+    sf->next = si->files;
+    si->current_file = si->files = sf;
     return 0;
 }