From f6d5fcfa0fa2a62f9583fa44dbee035c0adfcc88 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 22 Apr 2016 11:54:31 +0000
Subject:  Fix closecb support wherever a unixmessage may get dropped; add
 closecb support to unixconnection

---
 src/libdatastruct/genset_iter.c          | 19 -------------------
 src/libdatastruct/genset_iter_nocancel.c | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 src/libdatastruct/genset_iter.c
 create mode 100644 src/libdatastruct/genset_iter_nocancel.c

(limited to 'src/libdatastruct')

diff --git a/src/libdatastruct/genset_iter.c b/src/libdatastruct/genset_iter.c
deleted file mode 100644
index f78945d..0000000
--- a/src/libdatastruct/genset_iter.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ISC license. */
-
-#include <skalibs/bitarray.h>
-#include <skalibs/functypes.h>
-#include <skalibs/genset.h>
-
-unsigned int genset_iter_nocancel (genset *g, unsigned int n, iterfunc_t_ref f, void *stuff)
-{
-  unsigned char bits[bitarray_div8(n)] ;
-  unsigned int i = 0, j = 0, m = genset_n(g) ;
-  bitarray_setn(bits, 0, n) ;
-  for (; i < g->sp ; i++) if (g->freelist[i] < n) bitarray_clear(bits, g->freelist[i]) ;
-  for (i = 0 ; (i < n) && (j < m) ; i++) if (bitarray_peek(bits, i))
-  {
-    j++ ;
-    if (!(*f)(g->storage + i * g->esize, stuff)) break ;
-  }
-  return i ;
-}
diff --git a/src/libdatastruct/genset_iter_nocancel.c b/src/libdatastruct/genset_iter_nocancel.c
new file mode 100644
index 0000000..f78945d
--- /dev/null
+++ b/src/libdatastruct/genset_iter_nocancel.c
@@ -0,0 +1,19 @@
+/* ISC license. */
+
+#include <skalibs/bitarray.h>
+#include <skalibs/functypes.h>
+#include <skalibs/genset.h>
+
+unsigned int genset_iter_nocancel (genset *g, unsigned int n, iterfunc_t_ref f, void *stuff)
+{
+  unsigned char bits[bitarray_div8(n)] ;
+  unsigned int i = 0, j = 0, m = genset_n(g) ;
+  bitarray_setn(bits, 0, n) ;
+  for (; i < g->sp ; i++) if (g->freelist[i] < n) bitarray_clear(bits, g->freelist[i]) ;
+  for (i = 0 ; (i < n) && (j < m) ; i++) if (bitarray_peek(bits, i))
+  {
+    j++ ;
+    if (!(*f)(g->storage + i * g->esize, stuff)) break ;
+  }
+  return i ;
+}
-- 
cgit v1.3.1