projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added ord_list_print.
[idzebra-moved-to-github.git]
/
isams
/
isams.c
diff --git
a/isams/isams.c
b/isams/isams.c
index
08d0b0f
..
92704ea
100644
(file)
--- a/
isams/isams.c
+++ b/
isams/isams.c
@@
-1,8
+1,5
@@
-/* $Id: isams.c,v 1.9 2004-12-08 14:02:37 adam 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) 1995-2008 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
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
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,7
+23,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <string.h>
#include <stdio.h>
#include <string.h>
#include <stdio.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
#include <idzebra/isams.h>
typedef struct {
#include <idzebra/isams.h>
typedef struct {
@@
-111,7
+109,7
@@
int isams_close (ISAMS is)
return 0;
}
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;
{
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;
}
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));
{
ISAMS_PP pp = (ISAMS_PP) xmalloc (sizeof(*pp));
@@
-250,3
+248,11
@@
int isams_read_item (ISAMS_PP pp, char **dst)
}
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+