Add cancellation to iterators over avltree(n) and genset(dyn)

1 files changed, 8 insertions, 8 deletions

diff --git a/src/libdatastruct/gensetdyn_iter.c b/src/libdatastruct/gensetdyn_iter.c
index 51d598b..586aa11 100644
--- a/src/libdatastruct/gensetdyn_iter.c
+++ b/src/libdatastruct/gensetdyn_iter.c
@@ -4,23 +4,23 @@
 #include <skalibs/functypes.h>
 #include <skalibs/gensetdyn.h>
 
-unsigned int gensetdyn_iter (gensetdyn *g, iterfunc_t_ref f, void *stuff)
+unsigned int gensetdyn_iter_nocancel (gensetdyn *g, unsigned int n, iterfunc_t_ref f, void *stuff)
 {
  /*
     XXX: we may be called by a freeing function, so we cannot alloc -
     XXX: so pray that the bitarray fits in the stack.
  */
-  unsigned char bits[bitarray_div8(g->storage.len)] ;
-  unsigned int i = 0, j = 0, n = 0, m = gensetdyn_n(g) ;
+  unsigned char bits[bitarray_div8(n)] ;
+  unsigned int i = 0, j = 0, m = gensetdyn_n(g) ;
   register unsigned int *fl = genalloc_s(unsigned int, &g->freelist) ;
   register unsigned int sp = genalloc_len(unsigned int, &g->freelist) ;
-  bitarray_setn(bits, 0, g->storage.len) ;
+  bitarray_setn(bits, 0, n) ;
   
-  for (; i < sp ; i++) bitarray_clear(bits, fl[i]) ;
-  for (i = 0 ; (i < g->storage.len) && (j < m) ; i++) if (bitarray_peek(bits, i))
+  for (; i < sp ; i++) if (fl[i] < n) bitarray_clear(bits, fl[i]) ;
+  for (i = 0 ; (i < n) && (j < m) ; i++) if (bitarray_peek(bits, i))
   {
     j++ ;
-    if ((*f)(gensetdyn_p(g, i), stuff)) n++ ;
+    if (!(*f)(gensetdyn_p(g, i), stuff)) break ;
   }
-  return n ;
+  return i ;
 }