X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isams%2Fisams.c;h=9ddc0f03243f230b2d8ae846dc919fd71330cf85;hb=a8be496e66ed5ba01a42537e4aa29c6670cd3037;hp=c0ff3ef150307bc77dfe0dd3894882b9bad05f2e;hpb=4eb3b54bb2ca9af74f39f000d3d40dba99ded887;p=idzebra-moved-to-github.git diff --git a/isams/isams.c b/isams/isams.c index c0ff3ef..9ddc0f0 100644 --- a/isams/isams.c +++ b/isams/isams.c @@ -1,6 +1,6 @@ -/* $Id: isams.c,v 1.10 2004-12-13 20:51:31 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps +/* $Id: isams.c,v 1.12 2005-04-13 13:03:48 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -112,7 +112,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; @@ -184,7 +184,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));