diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-03-13 15:54:43 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-03-13 15:54:43 +0000 |
| commit | 3f62636a98777125444f5bceff812428f6a73039 (patch) | |
| tree | 923a0f0bcc9607ac8cde3fa9bb3125c6c2449a83 /src/libstddjb | |
| parent | 81fbf8c30b4a6fd3a91ba2d986f35541015ae1e6 (diff) | |
| download | skalibs-3f62636a98777125444f5bceff812428f6a73039.tar.xz | |
Applied Roman Kimov's fixesv2.3.1.3
Diffstat (limited to 'src/libstddjb')
| -rw-r--r-- | src/libstddjb/child_spawn.c | 4 | ||||
| -rw-r--r-- | src/libstddjb/localtmn_scan.c | 2 | ||||
| -rw-r--r-- | src/libstddjb/mininetstring_write.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libstddjb/child_spawn.c b/src/libstddjb/child_spawn.c index a9938c7..922c777 100644 --- a/src/libstddjb/child_spawn.c +++ b/src/libstddjb/child_spawn.c @@ -57,7 +57,7 @@ pid_t child_spawn (char const *prog, char const *const *argv, char const *const for (i = 0 ; i < n ; i++) if ((ndelay_on(p[i][i & 1]) < 0) || (coe(p[i][i & 1]) < 0)) { - e = errno ; goto errsp ; + e = errno ; goto errp ; } for (i = 2 ; i < n ; i++) { @@ -183,8 +183,8 @@ pid_t child_spawn (char const *prog, char const *const *argv, char const *const errsp0: fd_close(syncpipe[0]) ; #endif - i = n ; errp: + i = n ; while (i--) { fd_close(p[i][1]) ; diff --git a/src/libstddjb/localtmn_scan.c b/src/libstddjb/localtmn_scan.c index 087c642..fa5cbcd 100644 --- a/src/libstddjb/localtmn_scan.c +++ b/src/libstddjb/localtmn_scan.c @@ -14,7 +14,7 @@ unsigned int localtmn_scan (char const *s, localtmn_t *l) { register unsigned int b = uint32_scan(s, &m.nano) ; if (!b) return 0 ; - s += b ; n += b ; + n += b ; } *l = m ; return n ; diff --git a/src/libstddjb/mininetstring_write.c b/src/libstddjb/mininetstring_write.c index 6b31f17..cb3c30e 100644 --- a/src/libstddjb/mininetstring_write.c +++ b/src/libstddjb/mininetstring_write.c @@ -8,7 +8,7 @@ int mininetstring_write (int fd, char const *s, uint16 len, uint32 *w) { - if (!w) + if (!*w) { char pack[2] ; uint16_pack_big(pack, len) ; |