diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-08-09 23:55:41 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2021-08-09 23:55:41 +0000 |
| commit | d51d7cd47124b31ff703cd1f65d17ab936d93b6e (patch) | |
| tree | 24153944f39ccd6f419982bda8dbdedbae8010c9 /src | |
| parent | a7c2ccb1935f7f74d7c705abcc0ba657657fd779 (diff) | |
| download | s6-frontend-d51d7cd47124b31ff703cd1f65d17ab936d93b6e.tar.gz s6-frontend-d51d7cd47124b31ff703cd1f65d17ab936d93b6e.tar.xz s6-frontend-d51d7cd47124b31ff703cd1f65d17ab936d93b6e.zip | |
Adapt to skalibs-2.11.0.0
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/alias/s6-frontend-alias-chpst.c | 2 | ||||
| -rw-r--r-- | src/alias/s6-frontend-alias-sv.c | 8 | ||||
| -rw-r--r-- | src/alias/s6-frontend-alias.c | 10 | ||||
| -rw-r--r-- | src/config/s6-frontend-config-preprocess.c | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/alias/s6-frontend-alias-chpst.c b/src/alias/s6-frontend-alias-chpst.c index 05b3b07..5319ba6 100644 --- a/src/alias/s6-frontend-alias-chpst.c +++ b/src/alias/s6-frontend-alias-chpst.c @@ -154,7 +154,7 @@ int main (int argc, char const *const *argv) PROG = "s6-frontend-alias-chpst" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "vP012u:U:b:e:/:n:l:L:m:d:o:p:f:c:", &l) ; diff --git a/src/alias/s6-frontend-alias-sv.c b/src/alias/s6-frontend-alias-sv.c index 83ba177..8d2178b 100644 --- a/src/alias/s6-frontend-alias-sv.c +++ b/src/alias/s6-frontend-alias-sv.c @@ -20,14 +20,14 @@ #define dieusage() strerr_dieusage(100, USAGE) #define dienomem() strerr_diefu1sys(111, "stralloc_catb") -typedef int execfunc_t (char const *, char const *const *) ; -typedef execfunc_t *execfunc_t_ref ; +typedef int exec_func (char const *, char const *const *) ; +typedef exec_func *exec_func_ref ; typedef struct info_s info_t, *info_t_ref ; struct info_s { char const *name ; - execfunc_t_ref f ; + exec_func_ref f ; } ; static int dowait = 0 ; @@ -374,7 +374,7 @@ int main (int argc, char const *const *argv, char const *const *envp) } { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "vw:", &l) ; diff --git a/src/alias/s6-frontend-alias.c b/src/alias/s6-frontend-alias.c index f786bba..89d7e39 100644 --- a/src/alias/s6-frontend-alias.c +++ b/src/alias/s6-frontend-alias.c @@ -22,15 +22,15 @@ static unsigned int verbosity = 0 ; -typedef void execfunc_t (int, char const *const *) ; -typedef execfunc_t *execfunc_t_ref ; +typedef void exec_func (int, char const *const *) ; +typedef exec_func *exec_func_ref ; typedef struct info_s info_t, *info_t_ref ; struct info_s { char const *name ; char const *cmd ; - execfunc_t_ref f ; + exec_func_ref f ; } ; static int info_cmp (void const *a, void const *b) @@ -92,7 +92,7 @@ static void runsvdir (int argc, char const *const *argv) { char const *newargv[4] = { S6_EXTBINPREFIX "s6-svscan", "-t14000", 0, 0 } ; int dosetsid = 0 ; - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "P", &l) ; @@ -197,7 +197,7 @@ int main (int argc, char const **argv) if (!sabasename(&sa, name, strlen(name)) || !stralloc_0(&sa)) dienomem() ; if (!strcmp(sa.s, PROG)) { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "v", &l) ; diff --git a/src/config/s6-frontend-config-preprocess.c b/src/config/s6-frontend-config-preprocess.c index db09e24..e39ba84 100644 --- a/src/config/s6-frontend-config-preprocess.c +++ b/src/config/s6-frontend-config-preprocess.c @@ -265,7 +265,7 @@ int main (int argc, char const *const *argv, char const *const *envp) { PROG = "s6-frontend-config-preprocess" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "", &l) ; |