Adapt to skalibs-2.11.0.0, the real one

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

3 files changed, 9 insertions, 9 deletions

diff --git a/src/misc/skabus-dyntee-client.c b/src/misc/skabus-dyntee-client.c
index 6679e91..61f3788 100644
--- a/src/misc/skabus-dyntee-client.c
+++ b/src/misc/skabus-dyntee-client.c
@@ -14,7 +14,7 @@ int main (int argc, char const *const *argv)
   int fd ;
   PROG = "skabus-dyntee-client" ;
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "", &l) ;
diff --git a/src/misc/skabus-dyntee.c b/src/misc/skabus-dyntee.c
index 1fd389b..34a7e9a 100644
--- a/src/misc/skabus-dyntee.c
+++ b/src/misc/skabus-dyntee.c
@@ -34,7 +34,7 @@ int main (int argc, char const *const *argv)
   char const *rulesfile = 0 ;
   PROG = "skabus-dyntee" ;
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       register int opt = subgetopt_r(argc, argv, "Dd1Uc:b:u:g:G:t:T:i:x:", &l) ;
diff --git a/src/misc/skabus-dynteed.c b/src/misc/skabus-dynteed.c
index 90e0fe8..3c5bb0e 100644
--- a/src/misc/skabus-dynteed.c
+++ b/src/misc/skabus-dynteed.c
@@ -35,7 +35,7 @@
 #define SKABUS_DYNTEE_MAX 1000
 
 static int cont = 1 ;
-static tain_t lameduckdeadline ;
+static tain lameduckdeadline ;
 
 static unsigned int rulestype = 0 ;
 static char const *rules = 0 ;
@@ -45,7 +45,7 @@ typedef struct client_s client_t, *client_t_ref ;
 struct client_s
 {
   unsigned int xindex ;
-  tain_t deadline ;
+  tain deadline ;
   bufalloc ba ;
 } ;
 
@@ -102,7 +102,7 @@ static inline int new_connection (int fd)
 
 int main (int argc, char const *const *argv, char const *const *envp)
 {
-  tain_t readtto ;
+  tain readtto ;
   int spfd ;
   int flag1 = 0 ;
   unsigned int maxconn = 40 ;
@@ -110,7 +110,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   PROG = "skabus-dynteed" ;
 
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     unsigned int t = 0, T = 0 ;
     for (;;)
     {
@@ -150,13 +150,13 @@ int main (int argc, char const *const *argv, char const *const *envp)
   if (ndelay_on(0) < 0) strerr_diefu1sys(111, "set stdin non-blocking") ;
   spfd = selfpipe_init() ;
   if (spfd < 0) strerr_diefu1sys(111, "selfpipe_init") ;
-  if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ;
+  if (!sig_ignore(SIGPIPE)) strerr_diefu1sys(111, "ignore SIGPIPE") ;
   {
     sigset_t set ;
     sigemptyset(&set) ;
     sigaddset(&set, SIGTERM) ;
     sigaddset(&set, SIGHUP) ;
-    if (selfpipe_trapset(&set) < 0) strerr_diefu1sys(111, "trap signals") ;
+    if (!selfpipe_trapset(&set)) strerr_diefu1sys(111, "trap signals") ;
   }
 
   if (rulestype == 2)
@@ -178,7 +178,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
 
     for (;;)
     {
-      tain_t deadline ;
+      tain deadline ;
       int r = 2 ;
       iopause_fd x[2 + cont + numconn] ;
       x[0].fd = spfd ;