-/* $Id: rsbetween.c,v 1.25 2004-09-09 10:08:06 heikki Exp $
+/* $Id: rsbetween.c,v 1.26 2004-09-30 09:53:04 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
static RSFD r_open_between (RSET ct, int flag);
static void r_close_between (RSFD rfd);
static void r_delete_between (RSET ct);
-static void r_rewind_between (RSFD rfd);
static int r_forward_between(RSFD rfd, void *buf, const void *untilbuf);
static int r_read_between (RSFD rfd, void *buf);
static int r_write_between (RSFD rfd, const void *buf);
r_delete_between,
r_open_between,
r_close_between,
- r_rewind_between,
r_forward_between,
r_pos_between,
r_read_between,
rfd_delete_base(rfd);
}
-static void r_rewind_between (RSFD rfd)
-{
- struct rset_between_info *info =(struct rset_between_info *)rfd->rset->priv;
- struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
-
-#if RSBETWEEN_DEBUG
- logf (LOG_DEBUG, "rsbetween_rewind");
-#endif
- rset_rewind (p->rfd_l);
- rset_rewind (p->rfd_m);
- rset_rewind (p->rfd_r);
- p->more_l = rset_read (p->rfd_l, p->buf_l);
- p->more_m = rset_read (p->rfd_m, p->buf_m);
- p->more_r = rset_read (p->rfd_r, p->buf_r);
- if (info->rset_attr)
- {
- rset_rewind (p->rfd_attr);
- p->more_attr = rset_read (p->rfd_attr, p->buf_attr);
- }
- p->level=0;
- p->hits=0;
-}
-
static int r_forward_between(RSFD rfd, void *buf, const void *untilbuf)
-/* $Id: rsbool.c,v 1.47 2004-09-09 10:08:06 heikki Exp $
+/* $Id: rsbool.c,v 1.48 2004-09-30 09:53:05 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
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_forward(RSFD rfd, void *buf, const void *untilbuf);
static void r_pos (RSFD rfd, double *current, double *total);
static int r_read_and (RSFD rfd, void *buf);
r_delete,
r_open,
r_close,
- r_rewind,
r_forward,
r_pos,
r_read_and,
r_delete,
r_open,
r_close,
- r_rewind,
r_forward,
r_pos,
r_read_or,
r_delete,
r_open,
r_close,
- r_rewind,
r_forward,
r_pos,
r_read_not,
}
-static void r_rewind (RSFD rfd)
-{
- /* struct rset_bool_info *info = (struct rset_bool_info*)(rfd->rset->priv); */
- struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
-
- logf (LOG_DEBUG, "rsbool_rewind");
- rset_rewind (p->rfd_l);
- rset_rewind (p->rfd_r);
- p->more_l = rset_read (p->rfd_l, p->buf_l);
- p->more_r = rset_read (p->rfd_r, p->buf_r);
- p->hits=0;
-}
static int r_forward (RSFD rfd, void *buf,
const void *untilbuf)
-/* $Id: rsisamb.c,v 1.22 2004-09-09 10:08:06 heikki Exp $
+/* $Id: rsisamb.c,v 1.23 2004-09-30 09:53:05 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
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_forward(RSFD rfd, void *buf, const void *untilbuf);
static void r_pos (RSFD rfd, double *current, double *total);
static int r_read (RSFD rfd, void *buf);
r_delete,
r_open,
r_close,
- r_rewind,
r_forward,
r_pos,
r_read,
}
-static void r_rewind (RSFD rfd)
-{
- logf (LOG_DEBUG, "rsisamb_rewind");
- abort ();
-}
-
static int r_forward(RSFD rfd, void *buf, const void *untilbuf)
{
struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv);
-/* $Id: rsisamc.c,v 1.25 2004-09-09 10:08:06 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
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);
r_delete,
r_open,
r_close,
- r_rewind,
rset_default_forward,
r_pos,
r_read,
}
-static void r_rewind (RSFD rfd)
-{
- logf (LOG_FATAL, "rsisamc_rewind");
- abort ();
-}
-
static int r_read (RSFD rfd, void *buf)
{
struct rset_pp_info *p=(struct rset_pp_info *)(rfd->priv);
-/* $Id: rsisams.c,v 1.13 2004-09-09 10:08:06 heikki Exp $
+/* $Id: rsisams.c,v 1.14 2004-09-30 09:53:05 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
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);
r_delete,
r_open,
r_close,
- r_rewind,
rset_default_forward,
r_pos,
r_read,
rfd_delete_base(rfd);
}
-static void r_rewind (RSFD rfd)
-{
- logf (LOG_DEBUG, "rsisams_rewind");
- abort ();
-}
-
static int r_read (RSFD rfd, void *buf)
{
-/* $Id: rsmultiandor.c,v 1.4 2004-09-29 11:00:57 heikki Exp $
+/* $Id: rsmultiandor.c,v 1.5 2004-09-30 09:53:05 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
static RSFD r_open_or (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_and (RSFD rfd, void *buf);
static int r_read_or (RSFD rfd, void *buf);
static int r_write (RSFD rfd, const void *buf);
r_delete,
r_open_or,
r_close,
- r_rewind,
r_forward_or,
r_pos,
r_read_or,
r_delete,
r_open_and,
r_close,
- r_rewind,
r_forward_and,
r_pos,
r_read_and,
}
-static void r_rewind (RSFD rfd)
-{
- assert(!"rewind not implemented yet");
- /* FIXME - rewind all parts, rebalance heap, clear hits */
-}
static int r_write (RSFD rfd, const void *buf)
{
-/* $Id: rsnull.c,v 1.26 2004-09-09 10:08:06 heikki Exp $
+/* $Id: rsnull.c,v 1.27 2004-09-30 09:53:05 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
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 void r_pos (RSFD rfd, double *current, double *total);
static int r_read (RSFD rfd, void *buf);
static int r_write (RSFD rfd, const void *buf);
r_delete,
r_open,
r_close,
- r_rewind,
rset_default_forward,
r_pos,
r_read,
{
}
-static void r_rewind (RSFD rfd)
-{
-}
static void r_pos (RSFD rfd, double *current, double *total)
{
-/* $Id: rsprox.c,v 1.16 2004-09-09 10:08:06 heikki Exp $
+/* $Id: rsprox.c,v 1.17 2004-09-30 09:53:05 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
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_forward(RSFD rfd, void *buf, const void *untilbuf);
static int r_read (RSFD rfd, void *buf);
static int r_write (RSFD rfd, const void *buf);
r_delete,
r_open,
r_close,
- r_rewind,
r_forward,
r_pos,
r_read,
rfd_delete_base(rfd);
}
-static void r_rewind (RSFD rfd)
-{
- struct rset_prox_info *info = (struct rset_prox_info *)(rfd->rset->priv);
- struct rset_prox_rfd *p=(struct rset_prox_rfd *)(rfd->priv);
- int i;
-
- logf (LOG_DEBUG, "rsprox_rewind");
-
- for (i = 0; i < info->rset_no; i++)
- {
- rset_rewind (p->rfd[i]);
- p->more[i] = rset_read (p->rfd[i], p->buf[i]);
- }
- p->hits=0;
-}
-
static int r_forward (RSFD rfd, void *buf, const void *untilbuf)
{
struct rset_prox_info *info = (struct rset_prox_info *)(rfd->rset->priv);
-/* $Id: rstemp.c,v 1.49 2004-09-09 10:08:06 heikki Exp $
+/* $Id: rstemp.c,v 1.50 2004-09-30 09:53:05 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
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);
+static void r_flush (RSFD rfd, int mk);
+static void r_reread (RSFD rfd);
static const struct rset_control control =
r_delete,
r_open,
r_close,
- r_rewind,
rset_default_forward,
r_pos,
r_read,
prfd= (struct rset_temp_rfd *) nmem_malloc(ct->nmem, sizeof(*prfd));
rfd->priv=(void *)prfd;
prfd->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size);
- }
- r_rewind (rfd);
+ } else
+ prfd= rfd->priv;
+ r_flush (rfd, 0);
+ prfd->pos_cur = 0;
+ info->pos_buf = 0;
+ r_reread (rfd);
+ prfd->cur=0;
return rfd;
}
info->pos_border = info->pos_end;
}
-static void r_rewind (RSFD rfd)
-{
- struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) (rfd->priv);
- struct rset_temp_info *info = (struct rset_temp_info *)(rfd->rset->priv);
- r_flush (rfd, 0);
- mrfd->pos_cur = 0;
- info->pos_buf = 0;
- r_reread (rfd);
- mrfd->cur=0;
-}
static int r_read (RSFD rfd, void *buf)
{