From: Heikki Levanto <heikki@indexdata.dk>
Date: Thu, 30 Sep 2004 09:53:04 +0000 (+0000)
Subject: Removed the rewind function from rsets, it was unused
X-Git-Tag: snippet.version.1~312
X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=d50126fa619f94079daa731d66c305e86a38a85a

Removed the rewind function from rsets, it was unused
Cleaned one api/t7.c, so it compiles with -Werror
---

diff --git a/rset/rsbetween.c b/rset/rsbetween.c
index 63901cd..86ca018 100644
--- a/rset/rsbetween.c
+++ b/rset/rsbetween.c
@@ -1,4 +1,4 @@
-/* $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
 
@@ -43,7 +43,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 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);
@@ -55,7 +54,6 @@ static const struct rset_control control =
     r_delete_between,
     r_open_between,
     r_close_between,
-    r_rewind_between,
     r_forward_between, 
     r_pos_between,
     r_read_between,
@@ -185,29 +183,6 @@ static void r_close_between (RSFD rfd)
     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)
diff --git a/rset/rsbool.c b/rset/rsbool.c
index b7f2ba6..baf8f8f 100644
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,4 +1,4 @@
-/* $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
 
@@ -35,7 +35,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_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);
@@ -49,7 +48,6 @@ static const struct rset_control control_and =
     r_delete,
     r_open,
     r_close,
-    r_rewind,
     r_forward, 
     r_pos,    
     r_read_and,
@@ -62,7 +60,6 @@ static const struct rset_control control_or =
     r_delete,
     r_open,
     r_close,
-    r_rewind,
     r_forward, 
     r_pos,
     r_read_or,
@@ -75,7 +72,6 @@ static const struct rset_control control_not =
     r_delete,
     r_open,
     r_close,
-    r_rewind,
     r_forward, 
     r_pos,
     r_read_not,
@@ -197,18 +193,6 @@ static void r_close (RSFD rfd)
 }
 
 
-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)
diff --git a/rset/rsisamb.c b/rset/rsisamb.c
index cd16cba..a7f2b49 100644
--- a/rset/rsisamb.c
+++ b/rset/rsisamb.c
@@ -1,4 +1,4 @@
-/* $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
 
@@ -33,7 +33,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_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);
@@ -45,7 +44,6 @@ static const struct rset_control control =
     r_delete,
     r_open,
     r_close,
-    r_rewind,
     r_forward, 
     r_pos,
     r_read,
@@ -112,12 +110,6 @@ static void r_close (RSFD rfd)
 }
 
 
-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);
diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index c7fb530..9679947 100644
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,4 +1,4 @@
-/* $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
 
@@ -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,
@@ -111,12 +109,6 @@ static void r_close (RSFD rfd)
 }
 
 
-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);
diff --git a/rset/rsisams.c b/rset/rsisams.c
index 683a545..e634d58 100644
--- a/rset/rsisams.c
+++ b/rset/rsisams.c
@@ -1,4 +1,4 @@
-/* $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
 
@@ -30,7 +30,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);
@@ -41,7 +40,6 @@ static const struct rset_control control =
     r_delete,
     r_open,
     r_close,
-    r_rewind,
     rset_default_forward,
     r_pos,
     r_read,
@@ -110,12 +108,6 @@ static void r_close (RSFD rfd)
     rfd_delete_base(rfd);
 }
 
-static void r_rewind (RSFD rfd)
-{   
-    logf (LOG_DEBUG, "rsisams_rewind");
-    abort ();
-}
-
 
 static int r_read (RSFD rfd, void *buf)
 {
diff --git a/rset/rsmultiandor.c b/rset/rsmultiandor.c
index e98c4a7..af87249 100644
--- a/rset/rsmultiandor.c
+++ b/rset/rsmultiandor.c
@@ -1,4 +1,4 @@
-/* $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
 
@@ -47,7 +47,6 @@ static RSFD r_open_and (RSET ct, int flag);
 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);
@@ -63,7 +62,6 @@ static const struct rset_control control_or =
     r_delete,
     r_open_or,
     r_close,
-    r_rewind,
     r_forward_or,
     r_pos,
     r_read_or,
@@ -75,7 +73,6 @@ static const struct rset_control control_and =
     r_delete,
     r_open_and,
     r_close,
-    r_rewind,
     r_forward_and,
     r_pos,
     r_read_and,
@@ -567,11 +564,6 @@ static void r_pos (RSFD rfd, double *current, double *total)
 }
 
 
-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)
 {
diff --git a/rset/rsnull.c b/rset/rsnull.c
index d10b274..0835cff 100644
--- a/rset/rsnull.c
+++ b/rset/rsnull.c
@@ -1,4 +1,4 @@
-/* $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
 
@@ -31,7 +31,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 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);
@@ -42,7 +41,6 @@ static const struct rset_control control =
     r_delete,
     r_open,
     r_close,
-    r_rewind,
     rset_default_forward,
     r_pos,
     r_read,
@@ -80,9 +78,6 @@ static void r_delete (RSET ct)
 {
 }
 
-static void r_rewind (RSFD rfd)
-{
-}
 
 static void r_pos (RSFD rfd, double *current, double *total)
 {
diff --git a/rset/rsprox.c b/rset/rsprox.c
index b55b53d..1089de9 100644
--- a/rset/rsprox.c
+++ b/rset/rsprox.c
@@ -1,4 +1,4 @@
-/* $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
 
@@ -35,7 +35,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_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);
@@ -47,7 +46,6 @@ static const struct rset_control control =
     r_delete,
     r_open,
     r_close,
-    r_rewind,
     r_forward,
     r_pos,
     r_read,
@@ -150,22 +148,6 @@ static void r_close (RSFD rfd)
     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);
diff --git a/rset/rstemp.c b/rset/rstemp.c
index f15200b..9448002 100644
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -1,4 +1,4 @@
-/* $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
 
@@ -37,10 +37,11 @@ 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);
+static void r_flush (RSFD rfd, int mk);
+static void r_reread (RSFD rfd);
 
 
 static const struct rset_control control = 
@@ -49,7 +50,6 @@ static const struct rset_control control =
     r_delete,
     r_open,
     r_close,
-    r_rewind,
     rset_default_forward,
     r_pos, 
     r_read,
@@ -139,8 +139,13 @@ static RSFD r_open (RSET ct, int flag)
         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;
 }
 
@@ -266,16 +271,6 @@ static void r_reread (RSFD 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)
 {