diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-11 12:16:25 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-11 12:16:25 +0000 |
| commit | 1b5312d5c01fd5e12b938cfe65cda562e822619d (patch) | |
| tree | 60f086613e97aae5cb2635b8b9e3251c7b3c55cf /src/skaembutils/s6-printenv.c | |
| parent | ac77200b30d6c8bbe9093655dd0f8d8bf6e88feb (diff) | |
| download | s6-portable-utils-1b5312d5c01fd5e12b938cfe65cda562e822619d.tar.xz | |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/skaembutils/s6-printenv.c')
| -rw-r--r-- | src/skaembutils/s6-printenv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/skaembutils/s6-printenv.c b/src/skaembutils/s6-printenv.c index 85a252d..9f2698e 100644 --- a/src/skaembutils/s6-printenv.c +++ b/src/skaembutils/s6-printenv.c @@ -1,6 +1,6 @@ /* ISC license. */ -#include <skalibs/bytestr.h> +#include <string.h> #include <skalibs/sgetopt.h> #include <skalibs/buffer.h> #include <skalibs/strerr2.h> @@ -17,7 +17,7 @@ int main (int argc, char const *const *argv, char const *const *envp) subgetopt_t l = SUBGETOPT_ZERO ; for (;;) { - register int opt = subgetopt_r(argc, argv, "nd:0", &l) ; + int opt = subgetopt_r(argc, argv, "nd:0", &l) ; if (opt == -1) break ; switch (opt) { @@ -40,8 +40,8 @@ int main (int argc, char const *const *argv, char const *const *envp) } else { - unsigned int written = 0 ; /* XXX */ - if (!netstring_put(buffer_1, *envp, str_len(*envp), &written)) + size_t written = 0 ; + if (!netstring_put(buffer_1, *envp, strlen(*envp), &written)) strerr_diefu1sys(111, "write a netstring to stdout") ; } } |