Adapt to skalibs-2.11

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

7 files changed, 64 insertions, 64 deletions

diff --git a/src/include/s6-dns/dcache.h b/src/include/s6-dns/dcache.h
index 5209750..e70913f 100644
--- a/src/include/s6-dns/dcache.h
+++ b/src/include/s6-dns/dcache.h
@@ -24,8 +24,8 @@ struct dcache_node_s
 {
   dcache_key_t key ;
   uint16_t datalen ;
-  tain_t entry ;
-  tain_t expire ;
+  tain entry ;
+  tain expire ;
 } ;
 
 typedef struct dcache_s dcache_t, *dcache_t_ref ;
@@ -42,9 +42,9 @@ struct dcache_s
 
 extern void dcache_init (dcache_t *, uint64_t) ;
 extern dcache_node_t *dcache_search (dcache_t *, char const *, uint16_t) ;
-extern int dcache_add (dcache_t *, uint64_t, char const *, uint16_t, char const *, uint16_t, tain_t const *, tain_t const *) ;
+extern int dcache_add (dcache_t *, uint64_t, char const *, uint16_t, char const *, uint16_t, tain const *, tain const *) ;
 #define dcache_add_g(d, max, key, keylen, data, datalen, expire) dcache_add(d, max, key, keylen, data, datalen, (expire), &STAMP)
-extern void dcache_clean_expired (dcache_t *, tain_t const *) ;
+extern void dcache_clean_expired (dcache_t *, tain const *) ;
 #define dcache_clean_expired_g(d) dcache_clean_expired((d), &STAMP)
 extern void dcache_free (dcache_t *) ;
 
diff --git a/src/include/s6-dns/s6dns-analyze.h b/src/include/s6-dns/s6dns-analyze.h
index ed4fb17..554a294 100644
--- a/src/include/s6-dns/s6dns-analyze.h
+++ b/src/include/s6-dns/s6dns-analyze.h
@@ -7,34 +7,34 @@
 #include <skalibs/genwrite.h>
 #include <s6-dns/s6dns-message.h>
 
-typedef int s6dns_analyze_record_func_t (genwrite_t *, s6dns_message_rr_t const *, char const *, unsigned int, unsigned int) ;
-typedef s6dns_analyze_record_func_t *s6dns_analyze_record_func_t_ref ;
+typedef int s6dns_analyze_record_func (genwrite *, s6dns_message_rr_t const *, char const *, unsigned int, unsigned int) ;
+typedef s6dns_analyze_record_func *s6dns_analyze_record_func_ref ;
 
 typedef struct s6dns_analyze_rtypetable_s s6dns_analyze_rtypetable_t, *s6dns_analyze_rtypetable_t_ref ;
 struct s6dns_analyze_rtypetable_s
 {
   uint16_t rtype ;
   char const *string ;
-  s6dns_analyze_record_func_t_ref f ;
+  s6dns_analyze_record_func_ref f ;
 } ;
 
 extern uint16_t s6dns_analyze_qtype_parse (char const *) ;
 
 extern s6dns_analyze_rtypetable_t const *s6dns_analyze_rtypetable ;
 
-extern s6dns_analyze_record_func_t s6dns_analyze_record_a ;
-extern s6dns_analyze_record_func_t s6dns_analyze_record_aaaa ;
-extern s6dns_analyze_record_func_t s6dns_analyze_record_hinfo ;
-extern s6dns_analyze_record_func_t s6dns_analyze_record_soa ;
-extern s6dns_analyze_record_func_t s6dns_analyze_record_mx ;
-extern s6dns_analyze_record_func_t s6dns_analyze_record_srv ;
-extern s6dns_analyze_record_func_t s6dns_analyze_record_caa ;
-extern s6dns_analyze_record_func_t s6dns_analyze_record_domain ;
-extern s6dns_analyze_record_func_t s6dns_analyze_record_strings ;
-extern s6dns_analyze_record_func_t s6dns_analyze_record_unknown ;
+extern s6dns_analyze_record_func s6dns_analyze_record_a ;
+extern s6dns_analyze_record_func s6dns_analyze_record_aaaa ;
+extern s6dns_analyze_record_func s6dns_analyze_record_hinfo ;
+extern s6dns_analyze_record_func s6dns_analyze_record_soa ;
+extern s6dns_analyze_record_func s6dns_analyze_record_mx ;
+extern s6dns_analyze_record_func s6dns_analyze_record_srv ;
+extern s6dns_analyze_record_func s6dns_analyze_record_caa ;
+extern s6dns_analyze_record_func s6dns_analyze_record_domain ;
+extern s6dns_analyze_record_func s6dns_analyze_record_strings ;
+extern s6dns_analyze_record_func s6dns_analyze_record_unknown ;
 
-extern s6dns_analyze_record_func_t s6dns_analyze_record ;
+extern s6dns_analyze_record_func s6dns_analyze_record ;
 
-extern int s6dns_analyze_packet (genwrite_t *, char const *, unsigned int, int) ;
+extern int s6dns_analyze_packet (genwrite *, char const *, unsigned int, int) ;
 
 #endif
diff --git a/src/include/s6-dns/s6dns-debug.h b/src/include/s6-dns/s6dns-debug.h
index acc5818..06da4b6 100644
--- a/src/include/s6-dns/s6dns-debug.h
+++ b/src/include/s6-dns/s6dns-debug.h
@@ -5,9 +5,9 @@
 
 #include <s6-dns/s6dns-engine.h>
 
-extern s6dns_debughook_func_t s6dns_debug_dumpdt_post_recv ;
-extern s6dns_debughook_func_t s6dns_debug_dumpdt_pre_send ;
-extern s6dns_debughook_func_t s6dns_debug_dumpdt_post_send ;
+extern s6dns_debughook_func s6dns_debug_dumpdt_post_recv ;
+extern s6dns_debughook_func s6dns_debug_dumpdt_pre_send ;
+extern s6dns_debughook_func s6dns_debug_dumpdt_post_send ;
 
 #define S6DNS_DEBUG_DUMPDT_INIT(gp) { &s6dns_debug_dumpdt_post_recv, &s6dns_debug_dumpdt_pre_send, &s6dns_debug_dumpdt_post_send, (gp) }
 extern s6dns_debughook_t const s6dns_debug_dumpdt_stdout ;
diff --git a/src/include/s6-dns/s6dns-engine.h b/src/include/s6-dns/s6dns-engine.h
index 13cfe3a..4884fd9 100644
--- a/src/include/s6-dns/s6dns-engine.h
+++ b/src/include/s6-dns/s6dns-engine.h
@@ -18,15 +18,15 @@ typedef struct s6dns_engine_s s6dns_engine_t, *s6dns_engine_t_ref ;
 
  /* Debug function hooks */
 
-typedef int s6dns_debughook_func_t (s6dns_engine_t const *, void *) ;
-typedef s6dns_debughook_func_t *s6dns_debughook_func_t_ref ;
+typedef int s6dns_debughook_func (s6dns_engine_t const *, void *) ;
+typedef s6dns_debughook_func *s6dns_debughook_func_ref ;
 
 typedef struct s6dns_debughook_s s6dns_debughook_t, *s6dns_debughook_t_ref ;
 struct s6dns_debughook_s
 {
-  s6dns_debughook_func_t_ref post_recv ;
-  s6dns_debughook_func_t_ref pre_send ;
-  s6dns_debughook_func_t_ref post_send ;
+  s6dns_debughook_func_ref post_recv ;
+  s6dns_debughook_func_ref pre_send ;
+  s6dns_debughook_func_ref post_send ;
   void *external ;
 } ;
 #define S6DNS_DEBUGHOOK_ZERO { .post_recv = 0, .pre_send = 0, .post_send = 0, .external = 0 }
@@ -40,8 +40,8 @@ extern s6dns_debughook_t const s6dns_debughook_zero ;
 struct s6dns_engine_s
 {
   stralloc sa ; /* 2 bytes (qlen) + qlen bytes (query) + answers */
-  tain_t deadline ;
-  tain_t localdeadline ;
+  tain deadline ;
+  tain localdeadline ;
   unsigned int querylen ;
   int fd ;
   uint32_t protostate ;
@@ -84,22 +84,22 @@ extern void s6dns_engine_freen (s6dns_engine_t *, unsigned int) ;
 
 #define s6dns_engine_init(dt, servers, options, q, qlen, qtype, deadline, stamp) s6dns_engine_init_r(dt, servers, options, q, qlen, qtype, &s6dns_debughook_zero, deadline, stamp)
 #define s6dns_engine_init_g(dt, servers, options, q, qlen, qtype, deadline) s6dns_engine_init(dt, servers, options, q, qlen, qtype, (deadline), &STAMP)
-extern int s6dns_engine_init_r (s6dns_engine_t *, s6dns_ip46list_t const *, uint32_t, char const *, unsigned int, uint16_t, s6dns_debughook_t const *, tain_t const *, tain_t const *) ;
+extern int s6dns_engine_init_r (s6dns_engine_t *, s6dns_ip46list_t const *, uint32_t, char const *, unsigned int, uint16_t, s6dns_debughook_t const *, tain const *, tain const *) ;
 #define s6dns_engine_init_r_g(dt, servers, options, q, qlen, qtype, dbh, deadline) s6dns_engine_init_r(dt, servers, options, q, qlen, qtype, dbh, (deadline), &STAMP)
 
 
  /* Call before iopause() */
 
-extern void s6dns_engine_nextdeadline (s6dns_engine_t const *, tain_t *) ;
+extern void s6dns_engine_nextdeadline (s6dns_engine_t const *, tain *) ;
 #define s6dns_engine_isreadable(dt) ((dt)->flagreading)
 #define s6dns_engine_iswritable(dt) ((dt)->flagwriting)
 
 
  /* Call after iopause(): _timeout if iopause returns 0, _event otherwise */
 
-extern int s6dns_engine_timeout (s6dns_engine_t *, tain_t const *) ;
+extern int s6dns_engine_timeout (s6dns_engine_t *, tain const *) ;
 #define s6dns_engine_timeout_g(dt) s6dns_engine_timeout((dt), &STAMP)
-extern int s6dns_engine_event (s6dns_engine_t *, tain_t const *) ;
+extern int s6dns_engine_event (s6dns_engine_t *, tain const *) ;
 #define s6dns_engine_event_g(dt) s6dns_engine_event((dt), &STAMP)
 
 #define s6dns_engine_packet(dt) ((dt)->sa.s + (dt)->querylen)
diff --git a/src/include/s6-dns/s6dns-message.h b/src/include/s6-dns/s6dns-message.h
index 0b75f62..eb9c378 100644
--- a/src/include/s6-dns/s6dns-message.h
+++ b/src/include/s6-dns/s6dns-message.h
@@ -135,8 +135,8 @@ struct s6dns_message_rr_s
   uint16_t rdlength ;
 } ;
 
-typedef int s6dns_message_rr_func_t (s6dns_message_rr_t const *, char const *, unsigned int, unsigned int, unsigned int, void *) ;
-typedef s6dns_message_rr_func_t *s6dns_message_rr_func_t_ref ;
+typedef int s6dns_message_rr_func (s6dns_message_rr_t const *, char const *, unsigned int, unsigned int, unsigned int, void *) ;
+typedef s6dns_message_rr_func *s6dns_message_rr_func_ref ;
 
 
  /* mpag: structure to encode several variable-length results */
@@ -162,20 +162,20 @@ struct s6dns_dpag_s
 #define S6DNS_DPAG_ZERO { .ds = GENALLOC_ZERO, .rtype = 0 }
 
 
-extern s6dns_message_rr_func_t s6dns_message_parse_answer_strings ;
-extern s6dns_message_rr_func_t s6dns_message_parse_answer_domain ;
-extern s6dns_message_rr_func_t s6dns_message_parse_answer_a ;
-extern s6dns_message_rr_func_t s6dns_message_parse_answer_aaaa ;
-extern s6dns_message_rr_func_t s6dns_message_parse_answer_mx ;
-extern s6dns_message_rr_func_t s6dns_message_parse_answer_hinfo ;
-extern s6dns_message_rr_func_t s6dns_message_parse_answer_soa ;
-extern s6dns_message_rr_func_t s6dns_message_parse_answer_srv ;
-extern s6dns_message_rr_func_t s6dns_message_parse_answer_caa ;
+extern s6dns_message_rr_func s6dns_message_parse_answer_strings ;
+extern s6dns_message_rr_func s6dns_message_parse_answer_domain ;
+extern s6dns_message_rr_func s6dns_message_parse_answer_a ;
+extern s6dns_message_rr_func s6dns_message_parse_answer_aaaa ;
+extern s6dns_message_rr_func s6dns_message_parse_answer_mx ;
+extern s6dns_message_rr_func s6dns_message_parse_answer_hinfo ;
+extern s6dns_message_rr_func s6dns_message_parse_answer_soa ;
+extern s6dns_message_rr_func s6dns_message_parse_answer_srv ;
+extern s6dns_message_rr_func s6dns_message_parse_answer_caa ;
 
 
  /* The actual parsing function */
 
-extern int s6dns_message_parse (s6dns_message_header_t_ref, char const *, unsigned int, s6dns_message_rr_func_t_ref, void *) ;
+extern int s6dns_message_parse (s6dns_message_header_t_ref, char const *, unsigned int, s6dns_message_rr_func_ref, void *) ;
 
 
  /* Internals of this function, for lower level access */
diff --git a/src/include/s6-dns/s6dns-resolve.h b/src/include/s6-dns/s6dns-resolve.h
index 7369ffd..3e8b8c6 100644
--- a/src/include/s6-dns/s6dns-resolve.h
+++ b/src/include/s6-dns/s6dns-resolve.h
@@ -45,7 +45,7 @@
 
 #define s6dns_resolve_core(d, qtype, deadline, stamp) s6dns_resolve_core_r(d, qtype, &s6dns_engine_here, &s6dns_rci_here.servers, &s6dns_debughook_zero, deadline, stamp)
 #define s6dns_resolve_core_g(d, qtype, deadline) s6dns_resolve_core(d, qtype, (deadline), &STAMP)
-extern int s6dns_resolve_core_r (s6dns_domain_t const *, uint16_t, s6dns_engine_t *, s6dns_ip46list_t const *, s6dns_debughook_t const *, tain_t const *, tain_t *) ;
+extern int s6dns_resolve_core_r (s6dns_domain_t const *, uint16_t, s6dns_engine_t *, s6dns_ip46list_t const *, s6dns_debughook_t const *, tain const *, tain *) ;
 #define s6dns_resolve_core_r_g(d, qtype, dt, servers, dbh, deadline) s6dns_resolve_core_r(d, qtype, dt, servers, dbh, (deadline), &STAMP)
 
 
@@ -58,7 +58,7 @@ extern int s6dns_resolve_core_r (s6dns_domain_t const *, uint16_t, s6dns_engine_
 
 #define s6dns_resolve_parse(d, qtype, parsefunc, parsedata, deadline, stamp) s6dns_resolve_parse_r(d, qtype, parsefunc, parsedata, &s6dns_engine_here, &s6dns_rci_here.servers, &s6dns_debughook_zero, deadline, stamp)
 #define s6dns_resolve_parse_g(d, qtype, parsefunc, parsedata, deadline) s6dns_resolve_parse(d, qtype, parsefunc, parsedata, (deadline), &STAMP)
-extern int s6dns_resolve_parse_r (s6dns_domain_t const *, uint16_t, s6dns_message_rr_func_t_ref, void *, s6dns_engine_t *, s6dns_ip46list_t const *, s6dns_debughook_t const *, tain_t const *, tain_t *) ;
+extern int s6dns_resolve_parse_r (s6dns_domain_t const *, uint16_t, s6dns_message_rr_func_ref, void *, s6dns_engine_t *, s6dns_ip46list_t const *, s6dns_debughook_t const *, tain const *, tain *) ;
 #define s6dns_resolve_parse_r_g(d, qtype, parsefunc, parsedata, dt, servers, dbh, deadline) s6dns_resolve_parse_r(d, qtype, parsefunc, parsedata, dt, servers, dbh, (deadline), &STAMP)
 
 
@@ -68,7 +68,7 @@ extern int s6dns_resolve_parse_r (s6dns_domain_t const *, uint16_t, s6dns_messag
 
 #define s6dns_resolvenoq(name, len, qtype, parsefunc, parsedata, deadline, stamp) s6dns_resolvenoq_r(name, len, qtype, parsefunc, parsedata, &s6dns_engine_here, &s6dns_rci_here.servers, &s6dns_debughook_zero, deadline, stamp)
 #define s6dns_resolvenoq_g(name, len, qtype, parsefunc, parsedata, deadline) s6dns_resolvenoq(name, len, qtype, parsefunc, parsedata, (deadline), &STAMP)
-extern int s6dns_resolvenoq_r (char const *, size_t, uint16_t, s6dns_message_rr_func_t_ref, void *, s6dns_engine_t *, s6dns_ip46list_t const *, s6dns_debughook_t const *, tain_t const *, tain_t *) ;
+extern int s6dns_resolvenoq_r (char const *, size_t, uint16_t, s6dns_message_rr_func_ref, void *, s6dns_engine_t *, s6dns_ip46list_t const *, s6dns_debughook_t const *, tain const *, tain *) ;
 #define s6dns_resolvenoq_r_g(name, len, qtype, parsefunc, parsedata, dt, servers, dbh, deadline) s6dns_resolvenoq_r(name, len, qtype, parsefunc, parsedata, dt, servers, dbh, (deadline), &STAMP)
 
 
@@ -79,7 +79,7 @@ extern int s6dns_resolvenoq_r (char const *, size_t, uint16_t, s6dns_message_rr_
 
 #define s6dns_resolveq(name, len, qtype, parsefunc, parsedata, deadline, stamp) s6dns_resolveq_r(name, len, qtype, parsefunc, parsedata, &s6dns_rci_here, &s6dns_debughook_zero, deadline, stamp)
 #define s6dns_resolveq_g(name, len, qtype, parsefunc, parsedata, deadline) s6dns_resolveq(name, len, qtype, parsefunc, parsedata, (deadline), &STAMP)
-extern int s6dns_resolveq_r (char const *, size_t, uint16_t, s6dns_message_rr_func_t_ref, void *, s6dns_rci_t const *, s6dns_debughook_t const *, tain_t const *, tain_t *) ;
+extern int s6dns_resolveq_r (char const *, size_t, uint16_t, s6dns_message_rr_func_ref, void *, s6dns_rci_t const *, s6dns_debughook_t const *, tain const *, tain *) ;
 #define s6dns_resolveq_r_g(name, len, qtype, parsefunc, parsedata, rci, dbh, deadline) s6dns_resolveq_r(name, len, qtype, parsefunc, parsedata, rci, dbh, (deadline), &STAMP)
 
 
@@ -98,12 +98,12 @@ extern int s6dns_resolveq_r (char const *, size_t, uint16_t, s6dns_message_rr_fu
 
 #define s6dns_resolvenoq_aaaaa(ips, name, len, deadline, stamp) s6dns_resolvenoq_aaaaa_r(ips, name, len, &s6dns_rci_here.servers, &s6dns_debughook_zero, deadline, stamp)
 #define s6dns_resolvenoq_aaaaa_g(ips, name, len, deadline) s6dns_resolvenoq_aaaaa(ips, name, len, (deadline), &STAMP)
-extern int s6dns_resolvenoq_aaaaa_r(genalloc *, char const *, size_t, s6dns_ip46list_t const *, s6dns_debughook_t const *, tain_t const *, tain_t *) ;
+extern int s6dns_resolvenoq_aaaaa_r(genalloc *, char const *, size_t, s6dns_ip46list_t const *, s6dns_debughook_t const *, tain const *, tain *) ;
 #define s6dns_resolvenoq_aaaaa_r_g(ips, name, len, servers, dbh, deadline) s6dns_resolvenoq_aaaaa_r(ips, name, len, servers, dbh, (deadline), &STAMP)
 
 #define s6dns_resolveq_aaaaa(ips, name, len, deadline, stamp) s6dns_resolveq_aaaaa_r(ips, name, len, &s6dns_rci_here, &s6dns_debughook_zero, deadline, stamp)
 #define s6dns_resolveq_aaaaa_g(ips, name, len, deadline) s6dns_resolveq_aaaaa(ips, name, len, (deadline), &STAMP)
-extern int s6dns_resolveq_aaaaa_r(genalloc *, char const *, size_t, s6dns_rci_t const *, s6dns_debughook_t const *, tain_t const *, tain_t *) ;
+extern int s6dns_resolveq_aaaaa_r(genalloc *, char const *, size_t, s6dns_rci_t const *, s6dns_debughook_t const *, tain const *, tain *) ;
 #define s6dns_resolveq_aaaaa_r_g(ips, name, len, rci, dbh, deadline) s6dns_resolvenoq_aaaaa_r(ips, name, len, rci, dbh, (deadline), &STAMP)
 
 
@@ -145,12 +145,12 @@ extern int s6dns_resolveq_aaaaa_r(genalloc *, char const *, size_t, s6dns_rci_t
 
 #define s6dns_resolve_name4(ds, ip, deadline, stamp) s6dns_resolve_name4_r(ds, ip, &s6dns_engine_here, &s6dns_rci_here.servers, &s6dns_debughook_zero, deadline, stamp)
 #define s6dns_resolve_name4_g(ds, ip, deadline) s6dns_resolve_name4(ds, ip, (deadline), &STAMP)
-extern int s6dns_resolve_name4_r (genalloc *, char const *, s6dns_engine_t *, s6dns_ip46list_t const *, s6dns_debughook_t const *, tain_t const *, tain_t *) ;
+extern int s6dns_resolve_name4_r (genalloc *, char const *, s6dns_engine_t *, s6dns_ip46list_t const *, s6dns_debughook_t const *, tain const *, tain *) ;
 #define s6dns_resolve_name4_r_g(ds, ip, dt, servers, dbh, deadline) s6dns_resolve_name4_r(ds, ip, dt, servers, dbh, (deadline), &STAMP)
 
 #define s6dns_resolve_name6(ds, ip6, deadline, stamp) s6dns_resolve_name6_r(ds, ip6, &s6dns_engine_here, &s6dns_rci_here.servers, &s6dns_debughook_zero, deadline, stamp)
 #define s6dns_resolve_name6_g(ds, ip6, deadline) s6dns_resolve_name6(ds, ip6, (deadline), &STAMP)
-extern int s6dns_resolve_name6_r (genalloc *, char const *, s6dns_engine_t *, s6dns_ip46list_t const *, s6dns_debughook_t const *, tain_t const *, tain_t *) ;
+extern int s6dns_resolve_name6_r (genalloc *, char const *, s6dns_engine_t *, s6dns_ip46list_t const *, s6dns_debughook_t const *, tain const *, tain *) ;
 #define s6dns_resolve_name6_r_g(ds, ip6, dt, servers, dbh, deadline) s6dns_resolve_name6_r(ds, ip6, dt, servers, dbh, (deadline), &STAMP)
 
 #define s6dns_resolve_name46(ds, i, deadline, stamp) s6dns_resolve_name46_r(ds, i, &s6dns_engine_here, &s6dns_rci_here.servers, &s6dns_debughook_zero, deadline, stamp)
@@ -206,12 +206,12 @@ extern int s6dns_resolve_name6_r (genalloc *, char const *, s6dns_engine_t *, s6
 
 #define s6dns_resolve_dpag(ds, name, len, qtype, qualif, deadline, stamp) s6dns_resolve_dpag_r(ds, name, len, qtype, qualif, &s6dns_engine_here, &s6dns_rci_here, &s6dns_debughook_zero, deadline, stamp)
 #define s6dns_resolve_dpag_g(ds, name, len, qtype, qualif, deadline) s6dns_resolve_dpag(ds, name, len, qtype, qualif, (deadline), &STAMP)
-extern int s6dns_resolve_dpag_r (genalloc *, char const *, unsigned int, uint16_t, int, s6dns_engine_t *, s6dns_rci_t const *, s6dns_debughook_t const *, tain_t const *, tain_t *) ;
+extern int s6dns_resolve_dpag_r (genalloc *, char const *, unsigned int, uint16_t, int, s6dns_engine_t *, s6dns_rci_t const *, s6dns_debughook_t const *, tain const *, tain *) ;
 #define s6dns_resolve_dpag_r_g(ds, name, len, qtype, qualif, dt, rci, dbh, deadline) s6dns_resolve_dpag_r(ds, name, len, qtype, qualif, dt, rci, dbh, (deadline), &STAMP)
 
 #define s6dns_resolve_mpag(sa, offsets, name, len, qtype, parsefunc, qualif, deadline, stamp) s6dns_resolve_mpag_r(sa, offsets, name, len, qtype, parsefunc, qualif, &s6dns_engine_here, &s6dns_rci_here, &s6dns_debughook_zero, deadline, stamp)
 #define s6dns_resolve_mpag_g(sa, offsets, name, len, qtype, parsefunc, qualif, deadline) s6dns_resolve_mpag(sa, offsets, name, len, qtype, parsefunc, qualif, (deadline), &STAMP)
-extern int s6dns_resolve_mpag_r (stralloc *, genalloc *, char const *, unsigned int, uint16_t, s6dns_message_rr_func_t_ref, int, s6dns_engine_t *, s6dns_rci_t const *, s6dns_debughook_t const *, tain_t const *, tain_t *) ;
+extern int s6dns_resolve_mpag_r (stralloc *, genalloc *, char const *, unsigned int, uint16_t, s6dns_message_rr_func_ref, int, s6dns_engine_t *, s6dns_rci_t const *, s6dns_debughook_t const *, tain const *, tain *) ;
 #define s6dns_resolve_mpag_r_g(sa, offsets, name, len, qtype, parsefunc, qualif, dt, rci, dbh, deadline) s6dns_resolve_mpag_r(sa, offsets, name, len, qtype, parsefunc, qualif, dt, rci, dbh, (deadline), &STAMP)
 
 
@@ -223,15 +223,15 @@ extern int s6dns_resolve_mpag_r (stralloc *, genalloc *, char const *, unsigned
     asynchronous resolution, use the skadns library.
  */
 
-extern int s6dns_resolven_loop (s6dns_engine_t *, unsigned int, unsigned int, tain_t const *, tain_t *) ;
+extern int s6dns_resolven_loop (s6dns_engine_t *, unsigned int, unsigned int, tain const *, tain *) ;
 #define s6dns_resolven_loop_g(list, n, zor, deadline) s6dns_resolven(list, n, zor, (deadline), &STAMP)
 
 typedef struct s6dns_resolve_s s6dns_resolve_t, *s6dns_resolve_t_ref ;
 struct s6dns_resolve_s
 {
   s6dns_domain_t q ;
-  tain_t deadline ;
-  s6dns_message_rr_func_t_ref parsefunc ;
+  tain deadline ;
+  s6dns_message_rr_func_ref parsefunc ;
   void *data ;
   uint32_t options ;
   int status ;
@@ -240,7 +240,7 @@ struct s6dns_resolve_s
 
 #define s6dns_resolven_parse(list, n, deadline, stamp) s6dns_resolven_parse_r(list, n, &s6dns_rci_here.servers, &s6dns_debughook_zero, deadline, stamp)
 #define s6dns_resolven_parse_g(list, n, deadline) s6dns_resolven_parse(list, n, (deadline), &STAMP)
-extern int s6dns_resolven_parse_r (s6dns_resolve_t *, unsigned int, s6dns_ip46list_t const *, s6dns_debughook_t const *, tain_t const *, tain_t *) ;
+extern int s6dns_resolven_parse_r (s6dns_resolve_t *, unsigned int, s6dns_ip46list_t const *, s6dns_debughook_t const *, tain const *, tain *) ;
 #define s6dns_resolven_parse_r_g(list, n, servers, dbh, deadline) s6dns_resolven_parse_r(list, n, servers, dbh, (deadline), &STAMP)
 
 #endif
diff --git a/src/include/s6-dns/skadns.h b/src/include/s6-dns/skadns.h
index 1b506d9..8f27d2e 100644
--- a/src/include/s6-dns/skadns.h
+++ b/src/include/s6-dns/skadns.h
@@ -31,7 +31,7 @@ struct skadnsanswer_s
 typedef struct skadns_s skadns_t, *skadns_t_ref ;
 struct skadns_s
 {
-  textclient_t connection ;
+  textclient connection ;
   genalloc list ; /* array of uint16_t */
   gensetdyn q ; /* set of skadnsanswer_t */
 } ;
@@ -41,18 +41,18 @@ extern skadns_t const skadns_zero ;
 
  /* Starting and ending a session */
 
-extern int skadns_start (skadns_t *, char const *, tain_t const *, tain_t *) ;
+extern int skadns_start (skadns_t *, char const *, tain const *, tain *) ;
 #define skadns_start_g(a, path, deadline) skadns_start(a, path, (deadline), &STAMP)
-extern int skadns_startf (skadns_t *, tain_t const *, tain_t *) ;
+extern int skadns_startf (skadns_t *, tain const *, tain *) ;
 #define skadns_startf_g(a, deadline) skadns_startf(a, (deadline), &STAMP)
 extern void skadns_end (skadns_t *) ;
 
                 
  /* Synchronous functions */
  
-extern int skadns_send (skadns_t *, uint16_t *, s6dns_domain_t const *, uint16_t, tain_t const *, tain_t const *, tain_t *) ;
+extern int skadns_send (skadns_t *, uint16_t *, s6dns_domain_t const *, uint16_t, tain const *, tain const *, tain *) ;
 #define skadns_send_g(a, id, d, qtype, limit, deadline) skadns_send(a, id, d, qtype, limit, (deadline), &STAMP)
-extern int skadns_cancel (skadns_t *, uint16_t, tain_t const *, tain_t *) ;
+extern int skadns_cancel (skadns_t *, uint16_t, tain const *, tain *) ;
 #define skadns_cancel_g(a, id, deadline) skadns_cancel(a, id, (deadline), &STAMP)