WS updates

[idzebra-moved-to-github.git] / rset / rsprox.c

diff --git a/rset/rsprox.c b/rset/rsprox.c
index 129e521..1a846d0 100644 (file)
--- a/rset/rsprox.c
+++ b/rset/rsprox.c
@@ -1,4 +1,4 @@
-/* $Id: rsprox.c,v 1.26 2005-03-30 09:25:24 adam Exp $
+/* $Id: rsprox.c,v 1.28 2005-05-03 09:11:36 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -54,8 +54,6 @@ static const struct rset_control control =
     r_write,
 };
 
-const struct rset_control *rset_kind_prox = &control;
-
 struct rset_prox_info {
     RSET *rset;   /* array of 'child' rsets */
     int rset_no;  /* how many of them */
@@ -74,10 +72,11 @@ struct rset_prox_rfd {
 };    
 
 
-RSET rsprox_create( NMEM nmem, const struct key_control *kcontrol, int scope,
-                   int rset_no, RSET *rset,
-                   int ordered, int exclusion,
-                   int relation, int distance)
+RSET rsprox_create(NMEM nmem, struct rset_key_control *kcontrol,
+                  int scope,
+                  int rset_no, RSET *rset,
+                  int ordered, int exclusion,
+                  int relation, int distance)
 {
     RSET rnew = rset_create_base(&control, nmem, kcontrol, scope,0);
     struct rset_prox_info *info;
@@ -94,7 +93,6 @@ RSET rsprox_create( NMEM nmem, const struct key_control *kcontrol, int scope,
     return rnew;
 }
 
-
 static void r_delete (RSET ct)
 {
     struct rset_prox_info *info = (struct rset_prox_info *) ct->priv;
@@ -104,7 +102,6 @@ static void r_delete (RSET ct)
         rset_delete(info->rset[i]);
 }
 
-
 static RSFD r_open (RSET ct, int flag)
 {
     struct rset_prox_info *info = (struct rset_prox_info *) ct->priv;
@@ -155,11 +152,11 @@ static void r_close (RSFD rfd)
     rfd_delete_base(rfd);
 }
 
-static int r_forward (RSFD rfd, void *buf, TERMID *term, const void *untilbuf)
+static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf)
 {
     struct rset_prox_info *info = (struct rset_prox_info *)(rfd->rset->priv);
-    struct rset_prox_rfd *p=(struct rset_prox_rfd *)(rfd->priv);
-    const struct key_control *kctrl = rfd->rset->keycontrol;
+    struct rset_prox_rfd *p = (struct rset_prox_rfd *)(rfd->priv);
+    const struct rset_key_control *kctrl = rfd->rset->keycontrol;
     int cmp = 0;
     int i;