diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2019-09-06 13:03:11 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2019-09-06 13:03:11 +0000 |
| commit | 296cdd194fb36e4b080690f5f24228925722bf57 (patch) | |
| tree | 497124e5faea03f6583aa1a2deb5e8953cf68aa8 /src/conn-tools | |
| parent | 2f8e7b245b7fe187c41ea3655fce7551cfd7a48c (diff) | |
| download | s6-296cdd194fb36e4b080690f5f24228925722bf57.tar.xz | |
Adapt to new stopwatch API
Diffstat (limited to 'src/conn-tools')
| -rw-r--r-- | src/conn-tools/s6-ioconnect.c | 3 | ||||
| -rw-r--r-- | src/conn-tools/s6-sudoc.c | 3 | ||||
| -rw-r--r-- | src/conn-tools/s6-sudod.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/conn-tools/s6-ioconnect.c b/src/conn-tools/s6-ioconnect.c index 49d682c..eebb752 100644 --- a/src/conn-tools/s6-ioconnect.c +++ b/src/conn-tools/s6-ioconnect.c @@ -106,8 +106,7 @@ int main (int argc, char const *const *argv) 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") ; - tain_now_set_stopwatch() ; - tain_now_g() ; + 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) diff --git a/src/conn-tools/s6-sudoc.c b/src/conn-tools/s6-sudoc.c index 79d32f0..c8cb747 100644 --- a/src/conn-tools/s6-sudoc.c +++ b/src/conn-tools/s6-sudoc.c @@ -53,8 +53,7 @@ int main (int argc, char const *const *argv, char const *const *envp) if (!fd_sanitize() || !fd_ensure_open(2, 1)) strerr_diefu1sys(111, "sanitize stdin/stdout/stderr") ; - tain_now_set_stopwatch() ; - tain_now_g() ; + tain_now_set_stopwatch_g() ; tain_add_g(&deadline, &deadline) ; { size_t r ; diff --git a/src/conn-tools/s6-sudod.c b/src/conn-tools/s6-sudod.c index 9cc7148..8b2b9aa 100644 --- a/src/conn-tools/s6-sudod.c +++ b/src/conn-tools/s6-sudod.c @@ -55,8 +55,7 @@ int main (int argc, char const *const *argv, char const *const *envp) if ((ndelay_on(0) < 0) || (ndelay_on(1) < 0)) strerr_diefu1sys(111, "make socket non-blocking") ; - tain_now_set_stopwatch() ; - tain_now_g() ; + tain_now_set_stopwatch_g() ; tain_add_g(&deadline, &deadline) ; buffer_putnoflush(buffer_1small, S6_SUDO_BANNERB, S6_SUDO_BANNERB_LEN) ; if (!buffer_timed_flush_g(buffer_1small, &deadline)) |