Refactor ftrig using sass; clean up API a bit, update its users

1 files changed, 10 insertions, 15 deletions

diff --git a/src/libs6/ftrigr_wait_or.c b/src/libs6/ftrigr_wait_or.c
index efe6e14..0ed41b7 100644
--- a/src/libs6/ftrigr_wait_or.c
+++ b/src/libs6/ftrigr_wait_or.c
@@ -1,32 +1,27 @@
 /* ISC license. */
 
+#include <sys/uio.h>
 #include <errno.h>
 
 #include <skalibs/iopause.h>
 
 #include <s6/ftrigr.h>
 
-#include <skalibs/posixishard.h>
-
-int ftrigr_wait_or (ftrigr_t *a, uint16_t const *idlist, unsigned int n, tain const *deadline, tain *stamp, char *c)
+int ftrigr_wait_or (ftrigr *a, uint32_t const *list, unsigned int n, struct iovec *v, tain const *deadline, tain *stamp)
 {
-  iopause_fd x = { -1, IOPAUSE_READ | IOPAUSE_EXCEPT, 0 } ;
-  x.fd = ftrigr_fd(a) ;
-  if (x.fd < 0) return -1 ;
+  iopause_fd x = { .fd = ftrigr_fd(a), .events = IOPAUSE_READ } ;
   for (;;)
   {
-    unsigned int i = 0 ;
     int r ;
-    for (; i < n ; i++)
+    for (unsigned int i = 0 ; i < n ; i++)
     {
-      r = ftrigr_check(a, idlist[i], c) ;
-      if (r < 0) return r ;
-      else if (r) return i ;
+      r = ftrigr_peek(a, list[i], v) ;
+      if (r == -1) return -1 ;
+      if (r) return i ;
     }
     r = iopause_stamp(&x, 1, deadline, stamp) ;
-    if (r < 0) return 0 ;
-    else if (!r) return (errno = ETIMEDOUT, -1) ;
-    else if (ftrigr_update(a) < 0) return -1 ;
+    if (r == -1) return -1 ;
+    if (!r) return (errno = ETIMEDOUT, -1) ;
+    if (ftrigr_update(a) == -1) return -1 ;
   }
-  return (errno = EPROTO, -1) ; /* can't happen */
 }