X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisams.c;h=683a54592a057d90b9374ffd51c327bb9c21f199;hb=5e9aca2e8f33fe023b6b9da6df55642f96efcb50;hp=e6031e1f23e0e4de0aa9859475a307a92bb564d3;hpb=70effaa5a4a18f1bef9c6111dc082bb8714e4c19;p=idzebra-moved-to-github.git diff --git a/rset/rsisams.c b/rset/rsisams.c index e6031e1..683a545 100644 --- a/rset/rsisams.c +++ b/rset/rsisams.c @@ -1,4 +1,4 @@ -/* $Id: rsisams.c,v 1.11 2004-08-31 10:43:39 heikki Exp $ +/* $Id: rsisams.c,v 1.13 2004-09-09 10:08:06 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -25,7 +25,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#include +#include static RSFD r_open (RSET ct, int flag); static void r_close (RSFD rfd); @@ -60,18 +60,15 @@ struct rset_isams_info { }; -RSET rsisams_create( NMEM nmem, int key_size, - int (*cmp)(const void *p1, const void *p2), +RSET rsisams_create( NMEM nmem, const struct key_control *kcontrol, int scope, ISAMS is, ISAMS_P pos) { - RSET rnew=rset_create_base(&control, nmem); + RSET rnew=rset_create_base(&control, nmem, kcontrol, scope); struct rset_isams_info *info; info = (struct rset_isams_info *) nmem_malloc(rnew->nmem,sizeof(*info)); - assert(key_size); /* FIXME - these belong to the general rset */ - assert(cmp); + rnew->priv=info; info->is=is; info->pos=pos; - rnew->priv=info; return rnew; }