From 3f62636a98777125444f5bceff812428f6a73039 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 13 Mar 2015 15:54:43 +0000
Subject:  Applied Roman Kimov's fixes

---
 AUTHORS                                 | 1 +
 doc/index.html                          | 2 +-
 doc/upgrade.html                        | 6 ++++++
 package/info                            | 2 +-
 src/libstddjb/child_spawn.c             | 4 ++--
 src/libstddjb/localtmn_scan.c           | 2 +-
 src/libstddjb/mininetstring_write.c     | 2 +-
 src/libunixonacid/unixmessage_receive.c | 2 +-
 src/sysdeps/trysplice.c                 | 1 -
 9 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 45adacf..6c1c83c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,3 +19,4 @@ Thanks to:
   Frans Haarman <franshaarman@gmail.com>
   Vincent De Ribou <vins_bozo@yahoo.fr>
   Jorge Almeida <jalmeida@math.ist.utl.pt>
+  Roman I Khimov <khimov@altell.ru>
diff --git a/doc/index.html b/doc/index.html
index e0f8432..01528ed 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -59,7 +59,7 @@ with a standard C development environment </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of skalibs is <a href="skalibs-2.3.1.2.tar.gz">2.3.1.2</a>. </li>
+ <li> The current released version of skalibs is <a href="skalibs-2.3.1.3.tar.gz">2.3.1.3</a>. </li>
  <li> Alternatively, you can checkout a copy of the skalibs git repository:
 <pre> git clone git://git.skarnet.org/skalibs </pre> </li>
 </ul>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index a1dacdb..cf46aee 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -17,6 +17,12 @@
 
 <h1> What has changed in skalibs </h1>
 
+<h2> in 2.3.1.3 </h2>
+
+<ul>
+ <li> Bugfix release, no functional changes. </li>
+</ul>
+
 <h2> in 2.3.1.2 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 4b16262..39e636e 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=skalibs
-version=2.3.1.2
+version=2.3.1.3
 category=prog
 package_macro_name=SKALIBS
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 ;
-- 
cgit v1.2.3