-/*
- * Copyright (c) 1996-1998, Index Data.
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto
- *
- */
+/* $Id: merge.c,v 1.23 2003-06-23 15:36:11 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 <stdlib.h>
#include <assert.h>
int dirty; /* block is different from that on file */
};
+#if 0
static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
int last)
{
if (!last)
mb[i].dirty = 1;
}
+#endif
static void flush_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
char *r_buf, int *firstpos, int cat, int last,
return mb[ptr].offset + fill - off;
}
-ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data)
+ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data)
{
char i_item[128], *i_item_ptr;
/*
* $Log: merge.c,v $
- * Revision 1.20 1999-11-30 13:48:04 adam
+ * Revision 1.23 2003-06-23 15:36:11 adam
+ * Implemented isamb_unlink.
+ *
+ * Revision 1.22 2003/03/05 16:41:10 adam
+ * Fix GCC warnings
+ *
+ * Revision 1.21 2002/08/02 19:26:56 adam
+ * Towards GPL
+ *
+ * Revision 1.20 1999/11/30 13:48:04 adam
* Improved installation. Updated for inclusion of YAZ header files.
*
* Revision 1.19 1999/07/14 12:12:07 heikki