diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-01-08 18:52:14 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-01-08 18:52:14 +0000 |
| commit | 9be4af55521d653cfb1c5037412e937f800888c7 (patch) | |
| tree | e79c0cdf1cb15bde9c13e54a5bbf87ad34ce0013 /src/minutils/s6-uevent-spawner.c | |
| parent | 2ece041307a67f02ab1592f623d9d63cbed13489 (diff) | |
| download | s6-linux-utils-9be4af55521d653cfb1c5037412e937f800888c7.tar.xz | |
Types fix, first pass
Deeper fixes need to be done if the avltree.h API ever changes.
Diffstat (limited to 'src/minutils/s6-uevent-spawner.c')
| -rw-r--r-- | src/minutils/s6-uevent-spawner.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/minutils/s6-uevent-spawner.c b/src/minutils/s6-uevent-spawner.c index 6ccc4ce..e6c0927 100644 --- a/src/minutils/s6-uevent-spawner.c +++ b/src/minutils/s6-uevent-spawner.c @@ -46,8 +46,8 @@ static inline void on_event (char const *const *argv, char const *const *envp, c { posix_spawnattr_t attr ; posix_spawn_file_actions_t actions ; - unsigned int envlen = env_len(envp) ; - unsigned int n = envlen + 1 + byte_count(s, len, '\0') ; + size_t envlen = env_len(envp) ; + size_t n = envlen + 1 + byte_count(s, len, '\0') ; pid_t mypid ; int e ; char const *v[n] ; @@ -134,8 +134,8 @@ static inline void handle_stdin (stralloc *sa, char const *linevar, char const * { while (!pid) { - unsigned int start ; - register int r ; + size_t start ; + register ssize_t r ; if (!sa->len && linevar) if (!stralloc_cats(sa, linevar) || !stralloc_catb(sa, "=", 1)) dienomem() ; @@ -162,7 +162,8 @@ static inline void handle_stdin (stralloc *sa, char const *linevar, char const * static inline int make_ttos (char const *s) { - unsigned int tlife = 0, tterm = 0, tkill = 0, pos = 0 ; + size_t pos = 0 ; + unsigned int tlife = 0, tterm = 0, tkill = 0 ; pos += uint_scan(s + pos, &tlife) ; if (s[pos] && s[pos++] != ':') return 0 ; if (!tlife) return 1 ; |