summaryrefslogtreecommitdiff
path: root/src/conn-tools/s6-ioconnect.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2021-08-09 23:42:35 +0000
committerLaurent Bercot <ska@appnovation.com>2021-08-09 23:42:35 +0000
commitaaea6322e9e765969f452764e51ca1ddd9783264 (patch)
tree4e863537677e0266a79c4045c47a5e6b9f64a1a8 /src/conn-tools/s6-ioconnect.c
parentce2977ee9195612730bc8713f142c95f79605e75 (diff)
downloads6-aaea6322e9e765969f452764e51ca1ddd9783264.tar.xz
skalibs-2.11.0.0 API change
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/conn-tools/s6-ioconnect.c')
-rw-r--r--src/conn-tools/s6-ioconnect.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/conn-tools/s6-ioconnect.c b/src/conn-tools/s6-ioconnect.c
index b838162..7fab16e 100644
--- a/src/conn-tools/s6-ioconnect.c
+++ b/src/conn-tools/s6-ioconnect.c
@@ -73,11 +73,11 @@ static void handle_signals (void)
int main (int argc, char const *const *argv)
{
- tain_t tto ;
+ tain tto ;
unsigned int i, j ;
PROG = "s6-ioconnect" ;
{
- subgetopt_t l = SUBGETOPT_ZERO ;
+ subgetopt l = SUBGETOPT_ZERO ;
unsigned int t = 0 ;
for (;;)
{
@@ -105,16 +105,16 @@ int main (int argc, char const *const *argv)
if (ndelay_on(a[i][j].fd) == -1) strerr_diefu1sys(111, "ndelay_on") ;
if (!iobuffer_init(&b[i], a[i][0].fd, a[i][1].fd)) strerr_diefu1sys(111, "iobuffer_init") ;
}
- if (sig_ignore(SIGPIPE) == -1) strerr_diefu1sys(111, "sig_ignore") ;
+ if (!sig_ignore(SIGPIPE)) strerr_diefu1sys(111, "sig_ignore") ;
tain_now_set_stopwatch_g() ;
x[0].fd = selfpipe_init() ;
if (x[0].fd < 0) strerr_diefu1sys(111, "selfpipe_init") ;
- if (selfpipe_trap(SIGTERM) < 0)
+ if (!selfpipe_trap(SIGTERM))
strerr_diefu1sys(111, "trap SIGTERM") ;
for (;;)
{
- tain_t deadline ;
+ tain deadline ;
unsigned int xlen = 1 ;
int r ;