Adapt to skalibs-2.11.0.0

Signed-off-by: Laurent Bercot <ska@appnovation.com>

8 files changed, 20 insertions, 20 deletions

diff --git a/src/tls/s6-tlsc-io.c b/src/tls/s6-tlsc-io.c
index 3c9df58..0070f8e 100644
--- a/src/tls/s6-tlsc-io.c
+++ b/src/tls/s6-tlsc-io.c
@@ -16,13 +16,13 @@
 #define USAGE "s6-tlsc-io [ -v verbosity ] [ -d notif ] [ -S | -s ] [ -Y | -y ] [ -K timeout ] [ -k servername ] fdr fdw"
 #define dieusage() strerr_dieusage(100, USAGE)
 
-static inline void doit (int *, tain_t const *tto, uint32_t, uint32_t, unsigned int, char const *, unsigned int) gccattr_noreturn ;
+static inline void doit (int *, tain const *tto, uint32_t, uint32_t, unsigned int, char const *, unsigned int) gccattr_noreturn ;
 
 #ifdef S6_NETWORKING_USE_TLS
 
 #include <s6-networking/stls.h>
 
-static inline void doit (int *fds, tain_t const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, char const *servername, unsigned int notif)
+static inline void doit (int *fds, tain const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, char const *servername, unsigned int notif)
 {
   struct tls *ctx = stls_client_init_and_handshake(fds + 2, tto, preoptions, servername) ;
   if (notif)
@@ -53,7 +53,7 @@ static int handshake_cb (br_ssl_engine_context *ctx, sbearssl_handshake_cbarg *c
   return 1 ;
 }
 
-static inline void doit (int *fds, tain_t const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, char const *servername, unsigned int notif)
+static inline void doit (int *fds, tain const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, char const *servername, unsigned int notif)
 {
   sbearssl_handshake_cbarg cbarg = SBEARSSL_HANDSHAKE_CBARG_ZERO ;
   if (!random_init()) strerr_diefu1sys(111, "initialize random device") ;
@@ -71,7 +71,7 @@ static inline void doit (int *fds, tain_t const *tto, uint32_t preoptions, uint3
 int main (int argc, char const *const *argv, char const *const *envp)
 {
   char const *servername = 0 ;
-  tain_t tto ;
+  tain tto ;
   int fds[4] = { 0, 1, 0, 1 } ;
   unsigned int verbosity = 1 ;
   unsigned int notif = 0 ;
@@ -80,7 +80,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
 
   PROG = "s6-tlsc-io" ;
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     unsigned int t = 0 ;
     for (;;)
     {
@@ -111,7 +111,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
     fds[1] = u ;
   }
 
-  if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ;
+  if (!sig_ignore(SIGPIPE)) strerr_diefu1sys(111, "ignore SIGPIPE") ;
   tain_now_set_stopwatch_g() ;
   doit(fds, &tto, preoptions, options, verbosity, servername, notif) ;
 }
diff --git a/src/tls/s6-tlsc.c b/src/tls/s6-tlsc.c
index 08a2ab2..97e0d79 100644
--- a/src/tls/s6-tlsc.c
+++ b/src/tls/s6-tlsc.c
@@ -41,7 +41,7 @@ int main (int argc, char const *const *argv)
 
   PROG = "s6-tlsc" ;
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "SsYyv:K:k:Zz6:7:", &l) ;
diff --git a/src/tls/s6-tlsclient.c b/src/tls/s6-tlsclient.c
index 06ef4da..aadddfb 100644
--- a/src/tls/s6-tlsclient.c
+++ b/src/tls/s6-tlsclient.c
@@ -26,7 +26,7 @@ struct options_s
   unsigned int ximeout ;
   unsigned int yimeout ;
   unsigned int kimeout ;
-  ip46full_t localip ;
+  ip46full localip ;
   uint16_t localport ;
   unsigned int verbosity : 2 ;
   unsigned int flag4 : 1 ;
@@ -69,7 +69,7 @@ int main (int argc, char const *const *argv)
   options_t o = OPTIONS_ZERO ;
   PROG = "s6-tlsclient" ;
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "qQv46DdHhRrnNt:l:T:i:p:SsYyK:k:Zz", &l) ;
@@ -124,7 +124,7 @@ int main (int argc, char const *const *argv)
 
   if (!o.servername && !o.flagH)
   {
-    ip46full_t ip ;
+    ip46full ip ;
     if (!ip46full_scan(argv[0], &ip))
       o.servername = argv[0] ;
   }
diff --git a/src/tls/s6-tlsd-io.c b/src/tls/s6-tlsd-io.c
index f4a58ce..c8641b2 100644
--- a/src/tls/s6-tlsd-io.c
+++ b/src/tls/s6-tlsd-io.c
@@ -16,13 +16,13 @@
 #define USAGE "s6-tlsd-io [ -v verbosity ] [ -d notif ] [ -S | -s ] [ -Y | -y ] [ -K timeout ] [ -k snilevel ] fdr fdw"
 #define dieusage() strerr_dieusage(100, USAGE)
 
-static inline void doit (int *, tain_t const *tto, uint32_t, uint32_t, unsigned int, unsigned int) gccattr_noreturn ;
+static inline void doit (int *, tain const *tto, uint32_t, uint32_t, unsigned int, unsigned int) gccattr_noreturn ;
 
 #ifdef S6_NETWORKING_USE_TLS
 
 #include <s6-networking/stls.h>
 
-static inline void doit (int *fds, tain_t const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, unsigned int notif)
+static inline void doit (int *fds, tain const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, unsigned int notif)
 {
   struct tls *ctx = stls_server_init_and_handshake(fds + 2, tto, preoptions) ;
   if (notif)
@@ -51,7 +51,7 @@ static int handshake_cb (br_ssl_engine_context *ctx, sbearssl_handshake_cbarg *c
   return 1 ;
 }
 
-static inline void doit (int *fds, tain_t const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, unsigned int notif)
+static inline void doit (int *fds, tain const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, unsigned int notif)
 {
   sbearssl_handshake_cbarg cbarg = SBEARSSL_HANDSHAKE_CBARG_ZERO ;
   if (!random_init()) strerr_diefu1sys(111, "initialize random device") ;
@@ -68,7 +68,7 @@ static inline void doit (int *fds, tain_t const *tto, uint32_t preoptions, uint3
 
 int main (int argc, char const *const *argv)
 {
-  tain_t tto ;
+  tain tto ;
   int fds[4] = { 0, 1, 0, 1 } ;
   unsigned int verbosity = 1 ;
   unsigned int notif = 0 ;
@@ -77,7 +77,7 @@ int main (int argc, char const *const *argv)
 
   PROG = "s6-tlsd-io" ;
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     unsigned int t = 0 ;
     for (;;)
     {
@@ -115,7 +115,7 @@ int main (int argc, char const *const *argv)
     fds[1] = u ;
   }
 
-  if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ;
+  if (!sig_ignore(SIGPIPE)) strerr_diefu1sys(111, "ignore SIGPIPE") ;
   tain_now_set_stopwatch_g() ;
   doit(fds, &tto, preoptions, options, verbosity, notif) ;
 }
diff --git a/src/tls/s6-tlsd.c b/src/tls/s6-tlsd.c
index 9432bd7..b32bedd 100644
--- a/src/tls/s6-tlsd.c
+++ b/src/tls/s6-tlsd.c
@@ -38,7 +38,7 @@ int main (int argc, char const *const *argv)
 
   PROG = "s6-tlsd (parent)" ;
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "SsYyv:K:Zzk:", &l) ;
diff --git a/src/tls/s6-tlsserver.c b/src/tls/s6-tlsserver.c
index 646ce64..2ee8a5c 100644
--- a/src/tls/s6-tlsserver.c
+++ b/src/tls/s6-tlsserver.c
@@ -90,7 +90,7 @@ int main (int argc, char const *const *argv)
   options_t o = OPTIONS_ZERO ;
   PROG = "s6-tlsserver" ;
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "qQv461c:C:b:G:g:u:UWwDdHhRrPpl:eB:t:i:x:SsYyK:Zzk:", &l) ;
diff --git a/src/tls/s6-ucspitlsc.c b/src/tls/s6-ucspitlsc.c
index fd5bc86..d2bad3d 100644
--- a/src/tls/s6-ucspitlsc.c
+++ b/src/tls/s6-ucspitlsc.c
@@ -58,7 +58,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
 
   PROG = "s6-ucspitlsc (parent)" ;
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "SsYyv:K:Zzk:6:7:", &l) ;
diff --git a/src/tls/s6-ucspitlsd.c b/src/tls/s6-ucspitlsd.c
index d24cf99..0539d7e 100644
--- a/src/tls/s6-ucspitlsd.c
+++ b/src/tls/s6-ucspitlsd.c
@@ -55,7 +55,7 @@ int main (int argc, char const *const *argv)
 
   PROG = "s6-ucspitlsd (parent)" ;
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "SsYyv:K:Zzk:", &l) ;