Adapt to skalibs-2.11

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

5 files changed, 7 insertions, 7 deletions

diff --git a/src/skadns/skadns_cancel.c b/src/skadns/skadns_cancel.c
index c5062f6..3b8eff6 100644
--- a/src/skadns/skadns_cancel.c
+++ b/src/skadns/skadns_cancel.c
@@ -12,7 +12,7 @@
 #include <skalibs/textclient.h>
 #include <s6-dns/skadns.h>
 
-int skadns_cancel (skadns_t *a, uint16_t id, tain_t const *deadline, tain_t *stamp)
+int skadns_cancel (skadns_t *a, uint16_t id, tain const *deadline, tain *stamp)
 {
   int e = errno ;
   char pack[3] = "--q" ;
diff --git a/src/skadns/skadns_send.c b/src/skadns/skadns_send.c
index 69f533f..c4769e0 100644
--- a/src/skadns/skadns_send.c
+++ b/src/skadns/skadns_send.c
@@ -10,7 +10,7 @@
 #include <s6-dns/skadns.h>
 
 
-int skadns_send (skadns_t *a, uint16_t *u, s6dns_domain_t const *d, uint16_t qtype, tain_t const *limit, tain_t const *deadline, tain_t *stamp)
+int skadns_send (skadns_t *a, uint16_t *u, s6dns_domain_t const *d, uint16_t qtype, tain const *limit, tain const *deadline, tain *stamp)
 {
   static skadnsanswer_t const skadnsanswer_initial = { .status = EAGAIN, .data = 0, .len = 0 } ;
   uint32_t i ;
diff --git a/src/skadns/skadns_start.c b/src/skadns/skadns_start.c
index dbb7f63..0c67a77 100644
--- a/src/skadns/skadns_start.c
+++ b/src/skadns/skadns_start.c
@@ -3,7 +3,7 @@
 #include <skalibs/textclient.h>
 #include <s6-dns/skadns.h>
 
-int skadns_start (skadns_t *a, char const *path, tain_t const *deadline, tain_t *stamp)
+int skadns_start (skadns_t *a, char const *path, tain const *deadline, tain *stamp)
 {
   return textclient_start(&a->connection, path, 0, SKADNS_BANNER1, SKADNS_BANNER1_LEN, SKADNS_BANNER2, SKADNS_BANNER2_LEN, deadline, stamp) ;
 }
diff --git a/src/skadns/skadns_startf.c b/src/skadns/skadns_startf.c
index 29c44bf..bf20edd 100644
--- a/src/skadns/skadns_startf.c
+++ b/src/skadns/skadns_startf.c
@@ -4,7 +4,7 @@
 #include <skalibs/textclient.h>
 #include <s6-dns/skadns.h>
 
-int skadns_startf (skadns_t *a, tain_t const *deadline, tain_t *stamp)
+int skadns_startf (skadns_t *a, tain const *deadline, tain *stamp)
 {
   static char const *const cargv[2] = { SKADNSD_PROG, 0 } ;
   return textclient_startf(&a->connection, cargv, (char const *const *)environ, TEXTCLIENT_OPTION_WAITPID, SKADNS_BANNER1, SKADNS_BANNER1_LEN, SKADNS_BANNER2, SKADNS_BANNER2_LEN, deadline, stamp) ;
diff --git a/src/skadns/skadnsd.c b/src/skadns/skadnsd.c
index 7711bc1..c405574 100644
--- a/src/skadns/skadnsd.c
+++ b/src/skadns/skadnsd.c
@@ -64,7 +64,7 @@ static int parse_protocol (struct iovec const *v, void *context)
   {
     case 'Q' : /* send a query */
     {
-      tain_t limit ;
+      tain limit ;
       uint16_t qtype ;
       if (v->iov_len < 21) strerr_dief1x(100, "invalid client request") ;
       if (sp >= SKADNS_MAXCONCURRENCY)
@@ -116,7 +116,7 @@ int main (void)
   if (!s6dns_init()) strerr_diefu1sys(111, "s6dns_init") ;
 
   {
-    tain_t deadline ;
+    tain deadline ;
     tain_addsec_g(&deadline, 2) ;
     if (!textclient_server_01x_init_g(SKADNS_BANNER1, SKADNS_BANNER1_LEN, SKADNS_BANNER2, SKADNS_BANNER2_LEN, &deadline))
       strerr_diefu1sys(111, "sync with client") ;
@@ -137,7 +137,7 @@ int main (void)
     x[2].fd = textmessage_sender_fd(textmessage_sender_x) ;
     x[2].events = IOPAUSE_EXCEPT | (textmessage_sender_isempty(textmessage_sender_x) ? 0 : IOPAUSE_WRITE) ;
     {
-      tain_t deadline = TAIN_INFINITE ;
+      tain deadline = TAIN_INFINITE ;
       unsigned int i = 0 ;
       for (; i < sp ; i++)
       {