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

---
 src/libstddjb/child_spawn.c         | 4 ++--
 src/libstddjb/localtmn_scan.c       | 2 +-
 src/libstddjb/mininetstring_write.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/libstddjb')

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) ;
-- 
cgit v1.2.3