diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-08-10 18:24:46 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2021-08-10 18:24:46 +0000 |
| commit | 6696cee3bd309f61fc6c945ef747262a845e9267 (patch) | |
| tree | 6bb1a8f54ff0a590d375aece2af01009c94d9206 /src/init | |
| parent | 4a773dc6d9d36844501994720aca31a4f50d7d52 (diff) | |
| download | s6-linux-init-6696cee3bd309f61fc6c945ef747262a845e9267.tar.xz | |
Prepare for 1.0.6.4, adapt to skalibs-2.11.0.0
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/init')
| -rw-r--r-- | src/init/s6-linux-init-maker.c | 8 | ||||
| -rw-r--r-- | src/init/s6-linux-init-telinit.c | 2 | ||||
| -rw-r--r-- | src/init/s6-linux-init.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c index bc06836..2cfb35e 100644 --- a/src/init/s6-linux-init-maker.c +++ b/src/init/s6-linux-init-maker.c @@ -64,8 +64,8 @@ static gid_t mygid = -1 ; static char const *utmp_user = 0 ; #endif -typedef int writetobuf_func_t (buffer *, char const *) ; -typedef writetobuf_func_t *writetobuf_func_t_ref ; +typedef int writetobuf_func (buffer *, char const *) ; +typedef writetobuf_func *writetobuf_func_ref ; #define put_shebang(b) put_shebang_options((b), 0) @@ -383,7 +383,7 @@ static void auto_fifo (char const *base, char const *fifo) } } -static void auto_script (char const *base, char const *file, writetobuf_func_t_ref scriptf, char const *data) +static void auto_script (char const *base, char const *file, writetobuf_func_ref scriptf, char const *data) { char buf[4096] ; buffer b ; @@ -639,7 +639,7 @@ int main (int argc, char const *const *argv, char const *const *envp) { PROG = "s6-linux-init-maker" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, OPTION_STRING, &l) ; diff --git a/src/init/s6-linux-init-telinit.c b/src/init/s6-linux-init-telinit.c index 2baa6c2..65fb491 100644 --- a/src/init/s6-linux-init-telinit.c +++ b/src/init/s6-linux-init-telinit.c @@ -22,7 +22,7 @@ int main (int argc, char const *const *argv, char const *const *envp) char const *newargv[8] = { S6_EXTBINPREFIX "s6-sudo", "-e", "-T", "3600000", "--", RUNLEVELD_PATH, 0, 0 } ; PROG = "s6-linux-init-telinit" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "c:p:s:m:d:D:nNCB", &l) ; diff --git a/src/init/s6-linux-init.c b/src/init/s6-linux-init.c index 9e2d86e..6bf22b8 100644 --- a/src/init/s6-linux-init.c +++ b/src/init/s6-linux-init.c @@ -136,7 +136,7 @@ int main (int argc, char const **argv, char const *const *envp) } { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "c:p:s:m:d:D:nNCB", &l) ; |