diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-12 11:59:43 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-12 11:59:43 +0000 |
| commit | c60ebd422171808ad58b936914055397bb205bef (patch) | |
| tree | 7db3e5728d72ad209f8e22b9eb9f337e0b0c3e58 /src/libs6/s6lockd.c | |
| parent | e28fe5908a91d8795ca9923d64eeed7d3e898434 (diff) | |
| download | s6-c60ebd422171808ad58b936914055397bb205bef.tar.xz | |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/libs6/s6lockd.c')
| -rw-r--r-- | src/libs6/s6lockd.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/libs6/s6lockd.c b/src/libs6/s6lockd.c index e8c8cb6..5899b46 100644 --- a/src/libs6/s6lockd.c +++ b/src/libs6/s6lockd.c @@ -1,12 +1,10 @@ /* ISC license. */ -#include <sys/types.h> #include <stdint.h> #include <unistd.h> #include <errno.h> #include <signal.h> -#include <skalibs/uint16.h> -#include <skalibs/uint32.h> +#include <skalibs/types.h> #include <skalibs/allreadwrite.h> #include <skalibs/error.h> #include <skalibs/strerr2.h> @@ -39,7 +37,7 @@ static genalloc a = GENALLOC_ZERO ; /* array of s6lockio_t */ static void s6lockio_free (s6lockio_t *p) { - register int e = errno ; + int e = errno ; fd_close(p->p[1]) ; fd_close(p->p[0]) ; kill(p->pid, SIGTERM) ; @@ -49,7 +47,7 @@ static void s6lockio_free (s6lockio_t *p) static void cleanup (void) { - register size_t i = genalloc_len(s6lockio_t, &a) ; + size_t i = genalloc_len(s6lockio_t, &a) ; for (; i ; i--) s6lockio_free(genalloc_s(s6lockio_t, &a) + i - 1) ; genalloc_setlen(s6lockio_t, &a, 0) ; } @@ -79,7 +77,7 @@ static void answer (char c) static void remove (unsigned int i) { - register size_t n = genalloc_len(s6lockio_t, &a) - 1 ; + size_t n = genalloc_len(s6lockio_t, &a) - 1 ; s6lockio_free(genalloc_s(s6lockio_t, &a) + i) ; genalloc_s(s6lockio_t, &a)[i] = genalloc_s(s6lockio_t, &a)[n] ; genalloc_setlen(s6lockio_t, &a, n) ; @@ -117,7 +115,7 @@ static int parse_protocol (unixmessage_t const *m, void *context) { case '>' : /* release */ { - register size_t i = genalloc_len(s6lockio_t, &a) ; + size_t i = genalloc_len(s6lockio_t, &a) ; for (; i ; i--) if (genalloc_s(s6lockio_t, &a)[i-1].id == id) break ; if (i) { @@ -211,7 +209,7 @@ int main (int argc, char const *const *argv) for (;;) { - register size_t n = genalloc_len(s6lockio_t, &a) ; + size_t n = genalloc_len(s6lockio_t, &a) ; iopause_fd x[4 + n] ; unsigned int i = 0 ; int r ; @@ -224,7 +222,7 @@ int main (int argc, char const *const *argv) x[3].fd = sfd ; x[3].events = IOPAUSE_READ ; for (; i < n ; i++) { - register s6lockio_t_ref p = genalloc_s(s6lockio_t, &a) + i ; + s6lockio_t *p = genalloc_s(s6lockio_t, &a) + i ; x[4+i].fd = p->p[0] ; x[4+i].events = IOPAUSE_READ ; if (p->limit.sec.x && tain_less(&p->limit, &deadline)) deadline = p->limit ; @@ -243,7 +241,7 @@ int main (int argc, char const *const *argv) { for (i = 0 ; i < n ; i++) { - register s6lockio_t_ref p = genalloc_s(s6lockio_t, &a) + i ; + s6lockio_t *p = genalloc_s(s6lockio_t, &a) + i ; if (p->limit.sec.x && !tain_future(&p->limit)) break ; } if (i < n) @@ -274,12 +272,12 @@ int main (int argc, char const *const *argv) /* scan children for successes */ for (i = 0 ; i < genalloc_len(s6lockio_t, &a) ; i++) { - register s6lockio_t *p = genalloc_s(s6lockio_t, &a) + i ; + s6lockio_t *p = genalloc_s(s6lockio_t, &a) + i ; if (p->p[0] < 0) continue ; if (x[p->xindex].revents & IOPAUSE_READ) { char c ; - register ssize_t r = sanitize_read(fd_read(p->p[0], &c, 1)) ; + ssize_t r = sanitize_read(fd_read(p->p[0], &c, 1)) ; if (!r) continue ; if (r < 0) { |