summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-03-13 15:54:43 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-03-13 15:54:43 +0000
commit3f62636a98777125444f5bceff812428f6a73039 (patch)
tree923a0f0bcc9607ac8cde3fa9bb3125c6c2449a83 /src
parent81fbf8c30b4a6fd3a91ba2d986f35541015ae1e6 (diff)
downloadskalibs-3f62636a98777125444f5bceff812428f6a73039.tar.xz
Applied Roman Kimov's fixesv2.3.1.3
Diffstat (limited to 'src')
-rw-r--r--src/libstddjb/child_spawn.c4
-rw-r--r--src/libstddjb/localtmn_scan.c2
-rw-r--r--src/libstddjb/mininetstring_write.c2
-rw-r--r--src/libunixonacid/unixmessage_receive.c2
-rw-r--r--src/sysdeps/trysplice.c1
5 files changed, 5 insertions, 6 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) ;
diff --git a/src/libunixonacid/unixmessage_receive.c b/src/libunixonacid/unixmessage_receive.c
index 5fa16c4..885a7bc 100644
--- a/src/libunixonacid/unixmessage_receive.c
+++ b/src/libunixonacid/unixmessage_receive.c
@@ -49,7 +49,6 @@ static int unixmessage_receiver_fill (unixmessage_receiver_t *b)
.msg_control = b->fds_ok & 1 ? ancilbuf : 0,
.msg_controllen = b->fds_ok & 1 ? sizeof(ancilbuf) : 0
} ;
- unsigned int auxlen ;
int r = -1 ;
if (cbuffer_isfull(&b->mainb) || ((b->fds_ok & 1) && cbuffer_isfull(&b->auxb)))
return (errno = ENOBUFS, -1) ;
@@ -68,6 +67,7 @@ static int unixmessage_receiver_fill (unixmessage_receiver_t *b)
struct cmsghdr *c = CMSG_FIRSTHDR(&msghdr) ;
if (c)
{
+ unsigned int auxlen ;
if (c->cmsg_level != SOL_SOCKET
|| c->cmsg_type != SCM_RIGHTS) return (errno = EPROTO, -1) ;
auxlen = (unsigned int)(c->cmsg_len - (CMSG_DATA(c) - (unsigned char *)c)) ;
diff --git a/src/sysdeps/trysplice.c b/src/sysdeps/trysplice.c
index 6b566b8..a408f13 100644
--- a/src/sysdeps/trysplice.c
+++ b/src/sysdeps/trysplice.c
@@ -10,7 +10,6 @@
int main (void)
{
- char buf[N] ;
int p[2] ;
int fd ;
if (pipe(p) < 0) return 111 ;