X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=isams%2Fisams.c;h=557fc8ce4279a1095274955fd034ac83e61694ee;hp=01817b2f43d9ae6b896f955c71a6f6731c578e65;hb=a66b7d79383ae700f3358731eecfe2aafed0e90d;hpb=5437b50633032595afe6f87dc0f989bc92a5aea8

diff --git a/isams/isams.c b/isams/isams.c
index 01817b2..557fc8c 100644
--- a/isams/isams.c
+++ b/isams/isams.c
@@ -1,8 +1,5 @@
-/* $Id: isams.c,v 1.8 2004-11-19 10:27:11 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2010 Index Data
 
 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
@@ -15,9 +12,9 @@ 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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
@@ -26,8 +23,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <string.h>
 #include <stdio.h>
 
-#include <yaz/ylog.h>
-#include <isams.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
+#include <idzebra/isams.h>
 
 typedef struct {
     int last_offset;
@@ -111,7 +109,7 @@ int isams_close (ISAMS is)
     return 0;
 }
 
-ISAMS_P isams_merge (ISAMS is, ISAMS_I data)
+ISAM_P isams_merge (ISAMS is, ISAMS_I data)
 {
     char i_item[128];
     int i_more, i_mode;
@@ -183,7 +181,7 @@ ISAMS_P isams_merge (ISAMS is, ISAMS_I data)
     return first_block * is->block_size + first_offset;
 }
 
-ISAMS_PP isams_pp_open (ISAMS is, ISAMS_P pos)
+ISAMS_PP isams_pp_open (ISAMS is, ISAM_P pos)
 {
     ISAMS_PP pp = (ISAMS_PP) xmalloc (sizeof(*pp));
 
@@ -250,3 +248,12 @@ int isams_read_item (ISAMS_PP pp, char **dst)
 }
 
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+