improve ordq

src/lib/ordq.c

@@ -79,49 +79,83 @@ void ordq_fini(ordq_t* q)
     mylock_fini(&(q->lock));
 }
 
-static ordq_item_t* ordq_get_(ordq_t* q, ordq_skip_fn_t skipfn)
+static ordq_item_t* ordq_get_(ordq_t* q, ordq_skip_fn_t skipfn, va_list ap)
 {
-    ordq_item_t** p = &(q->head);
+    ordq_item_t** p  = NULL;
+    ordq_item_t*  it = NULL;
+
+    p = &(q->head);
 
     while ((*p) != NULL) {
-        if ((skipfn == NULL) || !skipfn(q->ctx, (*p)->data)) {
-            ordq_item_t* it = (*p);
-            *p              = it->next;
-            it->next        = NULL;
-            return it;
+        va_list ap1;
+        int     rc = 0;
+
+        if (skipfn == NULL) {
+            break;
+        }
+
+        va_copy(ap1, ap);
+        rc = skipfn((*p)->data, ap1);
+        va_end(ap1);
+
+        if (!rc) {
+            break;
         }
 
         p = &((*p)->next);
     }
 
-    return NULL;
-}
-
-ordq_item_t* ordq_get(ordq_t* q, ordq_skip_fn_t skipfn)
-{
-    ordq_item_t* it;
-
-    mylock_lock(&(q->lock));
-    it = ordq_get_(q, skipfn);
-    mylock_unlock(&(q->lock));
+    it = *p;
+    if (it != NULL) {
+        *p       = it->next;
+        it->next = NULL;
+    }
 
     return it;
 }
 
-ordq_item_t* ordq_peek(ordq_t* q, ordq_skip_fn_t skipfn)
+ordq_item_t* ordq_get(ordq_t* q, ordq_skip_fn_t skipfn, ...)
+{
+    ordq_item_t* it;
+    va_list      ap;
+
+    va_start(ap, skipfn);
+    mylock_lock(&(q->lock));
+    it = ordq_get_(q, skipfn, ap);
+    mylock_unlock(&(q->lock));
+    va_end(ap);
+
+    return it;
+}
+
+ordq_item_t* ordq_peek(ordq_t* q, ordq_skip_fn_t skipfn, ...)
 {
     ordq_item_t* it = NULL;
+    va_list      ap;
 
+    va_start(ap, skipfn);
     mylock_lock(&(q->lock));
     it = q->head;
     while (it != NULL) {
-        if ((skipfn == NULL) || !skipfn(q->ctx, it->data)) {
+        int     rc = 0;
+        va_list ap1;
+
+        if (skipfn == NULL) {
+            break;
+        }
+
+        va_copy(ap1, ap);
+        rc = skipfn(it->data, ap1);
+        va_end(ap1);
+
+        if (!rc) {
             break;
         }
 
         it = it->next;
     }
     mylock_unlock(&(q->lock));
+    va_end(ap);
 
     return it;
 }

src/lib/testsuite/test_ordq.c

@@ -1,4 +1,5 @@
 #include <math.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -46,7 +47,7 @@ static void test_ordq_get(void)
     return;
 }
 
-static int test_skip(void* ctx, void* data)
+static int test_skip(void* data, va_list ap)
 {
     int val = (int)(long)data;
 
@@ -124,7 +125,7 @@ static void test_ordq_peek(void)
     return;
 }
 
-static int test_skip2(void* ctx, void* data)
+static int test_skip2(void* data, va_list ap)
 {
     int val = (int)(long)data;