Towards GPL

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

diff --git a/index/sortidx.c b/index/sortidx.c
index 4980a9a..9524b97 100644 (file)
--- a/index/sortidx.c
+++ b/index/sortidx.c
@@ -1,7 +1,30 @@
+/* $Id: sortidx.c,v 1.7 2002-08-02 19:26:55 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
 
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
+ 
 #include <string.h>
 
-#include <log.h>
+#include <yaz/log.h>
 #include <bfile.h>
 #include <sortidx.h>
 
@@ -29,12 +52,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 +88,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;
 }