From ef503140d2ce2138b414822e53e3686ba4b21162 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sat, 21 Jul 2018 11:29:25 +0000
Subject:  Adapt to skalibs-2.7.0.0, prepare for 2.3.0.3

---
 src/minidentd/minidentd.c          |  1 +
 src/sbearssl/sbearssl_ta_readdir.c | 18 +++++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/minidentd/minidentd.c b/src/minidentd/minidentd.c
index 6d0f6a0..67ce7eb 100644
--- a/src/minidentd/minidentd.c
+++ b/src/minidentd/minidentd.c
@@ -12,6 +12,7 @@
 #include <skalibs/buffer.h>
 #include <skalibs/strerr2.h>
 #include <skalibs/stralloc.h>
+#include <skalibs/env.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/tai.h>
diff --git a/src/sbearssl/sbearssl_ta_readdir.c b/src/sbearssl/sbearssl_ta_readdir.c
index 829d7a6..4093bcf 100644
--- a/src/sbearssl/sbearssl_ta_readdir.c
+++ b/src/sbearssl/sbearssl_ta_readdir.c
@@ -48,16 +48,12 @@ int sbearssl_ta_readdir (char const *dirfn, genalloc *taga, stralloc *tasa)
   return 0 ;
 
  fail:
-  {
-    int e = errno ;
-    dir_close(dir) ;
-    genalloc_free(sbearssl_cert, &certga) ;
-    stralloc_free(&certsa) ;
-    if (tagawasnull) genalloc_free(sbearssl_ta, taga) ;
-    else genalloc_setlen(sbearssl_ta, taga, tagabase) ;
-    if (tasawasnull) stralloc_free(tasa) ;
-    else tasa->len = tasabase ;
-    errno = e ;
-  }
+  dir_close(dir) ;
+  genalloc_free(sbearssl_cert, &certga) ;
+  stralloc_free(&certsa) ;
+  if (tagawasnull) genalloc_free(sbearssl_ta, taga) ;
+  else genalloc_setlen(sbearssl_ta, taga, tagabase) ;
+  if (tasawasnull) stralloc_free(tasa) ;
+  else tasa->len = tasabase ;
   return -1 ;
 }
-- 
cgit v1.2.3