summaryrefslogtreecommitdiff
path: root/src/libs6dns/s6dns_resolvenoq_aaaaa.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2021-08-04 11:24:03 +0000
committerLaurent Bercot <ska@appnovation.com>2021-08-04 11:24:03 +0000
commit29f70f35a48241eef0a690a00d5211f487972cba (patch)
tree7153e8f6623aed91a7d98a4961730bd161ac8a1a /src/libs6dns/s6dns_resolvenoq_aaaaa.c
parentffed76f91e3623f40d1ebffffc0bc728722c84f5 (diff)
downloads6-dns-29f70f35a48241eef0a690a00d5211f487972cba.tar.xz
Adapt to skalibs-2.11
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/libs6dns/s6dns_resolvenoq_aaaaa.c')
-rw-r--r--src/libs6dns/s6dns_resolvenoq_aaaaa.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libs6dns/s6dns_resolvenoq_aaaaa.c b/src/libs6dns/s6dns_resolvenoq_aaaaa.c
index 378a70a..7069304 100644
--- a/src/libs6dns/s6dns_resolvenoq_aaaaa.c
+++ b/src/libs6dns/s6dns_resolvenoq_aaaaa.c
@@ -11,7 +11,7 @@
#include <s6-dns/s6dns-message.h>
#include <s6-dns/s6dns-resolve.h>
-int s6dns_resolvenoq_aaaaa_r (genalloc *ips, char const *name, size_t len, s6dns_ip46list_t const *servers, s6dns_debughook_t const *dbh, tain_t const *deadline, tain_t *stamp)
+int s6dns_resolvenoq_aaaaa_r (genalloc *ips, char const *name, size_t len, s6dns_ip46list_t const *servers, s6dns_debughook_t const *dbh, tain const *deadline, tain *stamp)
{
stralloc sa[2] = { STRALLOC_ZERO, STRALLOC_ZERO } ;
s6dns_resolve_t blob[2] ;
@@ -33,7 +33,7 @@ int s6dns_resolvenoq_aaaaa_r (genalloc *ips, char const *name, size_t len, s6dns
errno = blob[1].status ? blob[1].status : blob[0].status ;
return 0 ;
}
- if (!genalloc_readyplus(ip46full_t, ips, (sa[0].len >> 4) + (sa[1].len >> 2)))
+ if (!genalloc_readyplus(ip46full, ips, (sa[0].len >> 4) + (sa[1].len >> 2)))
{
stralloc_free(&sa[0]) ;
stralloc_free(&sa[1]) ;
@@ -41,15 +41,15 @@ int s6dns_resolvenoq_aaaaa_r (genalloc *ips, char const *name, size_t len, s6dns
}
{
int e = (!!sa[0].len << 1) | !!sa[1].len ;
- size_t n = genalloc_len(ip46full_t, ips) ;
+ size_t n = genalloc_len(ip46full, ips) ;
size_t i = 0 ;
for (; i < (sa[0].len >> 4) ; i++)
- ip46full_from_ip6(genalloc_s(ip46full_t, ips) + n + i, sa[0].s + (i << 4)) ;
+ ip46full_from_ip6(genalloc_s(ip46full, ips) + n + i, sa[0].s + (i << 4)) ;
n += i ;
for (i = 0 ; i < (sa[1].len >> 2) ; i++)
- ip46full_from_ip4(genalloc_s(ip46full_t, ips) + n + i, sa[1].s + (i << 2)) ;
+ ip46full_from_ip4(genalloc_s(ip46full, ips) + n + i, sa[1].s + (i << 2)) ;
n += i ;
- genalloc_setlen(ip46full_t, ips, n) ;
+ genalloc_setlen(ip46full, ips, n) ;
stralloc_free(&sa[0]) ;
stralloc_free(&sa[1]) ;
return e ;