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/pipe-tools | |
| parent | e28fe5908a91d8795ca9923d64eeed7d3e898434 (diff) | |
| download | s6-c60ebd422171808ad58b936914055397bb205bef.tar.xz | |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/pipe-tools')
| -rw-r--r-- | src/pipe-tools/s6-ftrig-listen.c | 7 | ||||
| -rw-r--r-- | src/pipe-tools/s6-ftrig-listen1.c | 7 | ||||
| -rw-r--r-- | src/pipe-tools/s6-ftrig-wait.c | 4 | ||||
| -rw-r--r-- | src/pipe-tools/s6-mkfifodir.c | 4 |
4 files changed, 10 insertions, 12 deletions
diff --git a/src/pipe-tools/s6-ftrig-listen.c b/src/pipe-tools/s6-ftrig-listen.c index 112c853..f0ef2bf 100644 --- a/src/pipe-tools/s6-ftrig-listen.c +++ b/src/pipe-tools/s6-ftrig-listen.c @@ -1,12 +1,11 @@ /* ISC license. */ -#include <sys/types.h> #include <stdint.h> #include <errno.h> #include <signal.h> #include <unistd.h> #include <skalibs/sgetopt.h> -#include <skalibs/uint.h> +#include <skalibs/types.h> #include <skalibs/strerr2.h> #include <skalibs/tai.h> #include <skalibs/iopause.h> @@ -43,7 +42,7 @@ int main (int argc, char const **argv, char const *const *envp) unsigned int t = 0 ; for (;;) { - register int opt = subgetopt(argc, argv, "aot:") ; + int opt = subgetopt(argc, argv, "aot:") ; if (opt == -1) break ; switch (opt) { @@ -85,7 +84,7 @@ int main (int argc, char const **argv, char const *const *envp) for (;;) { - register int r ; + int r ; i = 0 ; while (i < idlen) { diff --git a/src/pipe-tools/s6-ftrig-listen1.c b/src/pipe-tools/s6-ftrig-listen1.c index f5f7814..e9a5e82 100644 --- a/src/pipe-tools/s6-ftrig-listen1.c +++ b/src/pipe-tools/s6-ftrig-listen1.c @@ -1,12 +1,11 @@ /* ISC license. */ -#include <sys/types.h> #include <stdint.h> #include <errno.h> #include <signal.h> #include <unistd.h> #include <skalibs/sgetopt.h> -#include <skalibs/uint.h> +#include <skalibs/types.h> #include <skalibs/strerr2.h> #include <skalibs/tai.h> #include <skalibs/iopause.h> @@ -40,7 +39,7 @@ int main (int argc, char const *const *argv, char const *const *envp) unsigned int t = 0 ; for (;;) { - register int opt = subgetopt(argc, argv, "t:") ; + int opt = subgetopt(argc, argv, "t:") ; if (opt == -1) break ; switch (opt) { @@ -73,7 +72,7 @@ int main (int argc, char const *const *argv, char const *const *envp) for (;;) { char dummy ; - register int r = ftrigr_check(&a, id, &dummy) ; + int r = ftrigr_check(&a, id, &dummy) ; if (r < 0) strerr_diefu1sys(111, "ftrigr_check") ; if (r) break ; r = iopause_g(x, 2, &deadline) ; diff --git a/src/pipe-tools/s6-ftrig-wait.c b/src/pipe-tools/s6-ftrig-wait.c index 40d458e..5aca73c 100644 --- a/src/pipe-tools/s6-ftrig-wait.c +++ b/src/pipe-tools/s6-ftrig-wait.c @@ -4,7 +4,7 @@ #include <errno.h> #include <skalibs/allreadwrite.h> #include <skalibs/sgetopt.h> -#include <skalibs/uint.h> +#include <skalibs/types.h> #include <skalibs/strerr2.h> #include <skalibs/tai.h> #include <s6/ftrigr.h> @@ -22,7 +22,7 @@ int main (int argc, char const *const *argv) unsigned int t = 0 ; for (;;) { - register int opt = subgetopt(argc, argv, "t:") ; + int opt = subgetopt(argc, argv, "t:") ; if (opt == -1) break ; switch (opt) { diff --git a/src/pipe-tools/s6-mkfifodir.c b/src/pipe-tools/s6-mkfifodir.c index 268d822..cad7d06 100644 --- a/src/pipe-tools/s6-mkfifodir.c +++ b/src/pipe-tools/s6-mkfifodir.c @@ -2,7 +2,7 @@ #include <sys/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/gidstuff.h> +#include <skalibs/types.h> #include <skalibs/strerr2.h> #include <s6/ftrigw.h> @@ -16,7 +16,7 @@ int main (int argc, char const *const *argv) PROG = "s6-mkfifodir" ; for (;;) { - register int opt = subgetopt_r(argc, argv, "fg:", &l) ; + int opt = subgetopt_r(argc, argv, "fg:", &l) ; if (opt == -1) break ; switch (opt) { |