X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=96799476a777c1fdf59c8f5da827ab90172e5d47;hb=6ec32a146d639c16e9929435fdbfd8d915e918b3;hp=5761a9b398822086d7d7135f82d7429f8304d2be;hpb=56131846f59919027a4d3c59efb485afb6efb0de;p=idzebra-moved-to-github.git diff --git a/rset/rsisamc.c b/rset/rsisamc.c index 5761a9b..9679947 100644 --- a/rset/rsisamc.c +++ b/rset/rsisamc.c @@ -1,4 +1,4 @@ -/* $Id: rsisamc.c,v 1.24 2004-09-01 15:01:32 heikki Exp $ +/* $Id: rsisamc.c,v 1.26 2004-09-30 09:53:05 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -32,7 +32,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA static RSFD r_open (RSET ct, int flag); static void r_close (RSFD rfd); static void r_delete (RSET ct); -static void r_rewind (RSFD rfd); static int r_read (RSFD rfd, void *buf); static int r_write (RSFD rfd, const void *buf); static void r_pos (RSFD rfd, double *current, double *total); @@ -43,7 +42,6 @@ static const struct rset_control control = r_delete, r_open, r_close, - r_rewind, rset_default_forward, r_pos, r_read, @@ -62,10 +60,10 @@ struct rset_isamc_info { ISAMC_P pos; }; -RSET rsisamc_create( NMEM nmem, const struct key_control *kcontrol, +RSET rsisamc_create( NMEM nmem, const struct key_control *kcontrol, int scope, ISAMC is, ISAMC_P pos) { - RSET rnew=rset_create_base(&control, nmem, kcontrol); + RSET rnew=rset_create_base(&control, nmem, kcontrol, scope); struct rset_isamc_info *info; info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info)); info->is=is; @@ -111,12 +109,6 @@ static void r_close (RSFD rfd) } -static void r_rewind (RSFD rfd) -{ - logf (LOG_DEBUG, "rsisamc_rewind"); - abort (); -} - static int r_read (RSFD rfd, void *buf) { struct rset_pp_info *p=(struct rset_pp_info *)(rfd->priv);