aboutsummaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2026-03-18 01:57:01 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2026-03-18 01:57:01 +0000
commit24637cd3776cda5fd0a919ba9343ba86d82d3e04 (patch)
treedac9d66860d763fedc999ace6e1a5f37d3add229 /src/include
parent4cdcab0506e76666800d2bc111c602bb3154cc30 (diff)
downloads6-24637cd3776cda5fd0a919ba9343ba86d82d3e04.tar.gz
More fixes, ftrigr_string addition, doc update
Diffstat (limited to 'src/include')
-rw-r--r--src/include/s6/ftrigr.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/include/s6/ftrigr.h b/src/include/s6/ftrigr.h
index 30a7ca6..2e0f340 100644
--- a/src/include/s6/ftrigr.h
+++ b/src/include/s6/ftrigr.h
@@ -3,7 +3,6 @@
#ifndef S6_FTRIGR_H
#define S6_FTRIGR_H
-#include <sys/uio.h>
#include <stdint.h>
#include <skalibs/tai.h>
@@ -21,6 +20,13 @@ struct ftrigr_s
} ;
#define FTRIGR_ZERO { .client = SASSCLIENT_ZERO, .data = GENALLOC_ZERO }
+typedef struct ftrigr_string_s ftrigr_string, *ftrigr_string_ref ;
+struct ftrigr_string_s
+{
+ char *s ;
+ uint32_t len ;
+} ;
+
extern int ftrigr_startf (ftrigr *, tain const *, tain *) ;
#define ftrigr_startf_g(a, deadline) ftrigr_startf(a, (deadline), &STAMP)
extern int ftrigr_start (ftrigr *, unsigned int) ;
@@ -28,8 +34,7 @@ extern void ftrigr_end (ftrigr *) ;
#define ftrigr_fd(a) sassclient_fd(&(a)->client)
extern int ftrigr_update (ftrigr *) ;
-extern int ftrigr_peek (ftrigr *, uint32_t, struct iovec *) ;
-extern int ftrigr_peek1 (ftrigr *, uint32_t, char *) ;
+extern int ftrigr_peek (ftrigr *, uint32_t, ftrigr_string *) ;
extern int ftrigr_ack (ftrigr *, uint32_t) ;
extern void ftrigr_release (ftrigr *, uint32_t) ;
@@ -41,7 +46,7 @@ extern int ftrigr_unsubscribe (ftrigr *, uint32_t, tain const *, tain *) ;
extern int ftrigr_wait_and (ftrigr *, uint32_t const *, unsigned int, tain const *, tain *) ;
#define ftrigr_wait_and_g(a, list, len, deadline) ftrigr_wait_and(a, list, len, (deadline), &STAMP)
-extern int ftrigr_wait_or (ftrigr *, uint32_t const *, unsigned int, struct iovec *, tain const *, tain *) ;
+extern int ftrigr_wait_or (ftrigr *, uint32_t const *, unsigned int, ftrigr_string *, tain const *, tain *) ;
#define ftrigr_wait_or_g(a, list, n, v, deadline) ftrigr_wait_or(a, list, n, v, (deadline), &STAMP)
#endif