summaryrefslogtreecommitdiff
path: root/src/clients/s6-dnstxt.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2019-09-06 10:51:27 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2019-09-06 10:51:27 +0000
commitbe796e67efda6fbcc6ac07c3b213e3e276b8d7f0 (patch)
treeb4aabd39f8a657159fc4d0f3061fd8c3bbc5ecc8 /src/clients/s6-dnstxt.c
parent5bee815f7f9045db667bf9a1b0d5fddd94c704e4 (diff)
downloads6-dns-be796e67efda6fbcc6ac07c3b213e3e276b8d7f0.tar.xz
Adapt to new stopwatch API
Diffstat (limited to 'src/clients/s6-dnstxt.c')
-rw-r--r--src/clients/s6-dnstxt.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/clients/s6-dnstxt.c b/src/clients/s6-dnstxt.c
index 622f9bb..22e9776 100644
--- a/src/clients/s6-dnstxt.c
+++ b/src/clients/s6-dnstxt.c
@@ -21,7 +21,7 @@ int main (int argc, char const *const *argv)
stralloc quoted = STRALLOC_ZERO ;
stralloc sa = STRALLOC_ZERO ;
genalloc offsets = GENALLOC_ZERO ; /* array of size_t */
- tain_t deadline, stamp ;
+ tain_t deadline ;
size_t n ;
size_t i = 0 ;
unsigned int t = 0 ;
@@ -42,14 +42,13 @@ int main (int argc, char const *const *argv)
}
argc -= subgetopt_here.ind ; argv += subgetopt_here.ind ;
if (argc < 1) dieusage() ;
-
- tain_now_set_stopwatch() ;
- tain_now(&stamp) ;
if (t) tain_from_millisecs(&deadline, t) ; else deadline = tain_infinite_relative ;
- tain_add(&deadline, &deadline, &stamp) ;
+
+ tain_now_set_stopwatch_g() ;
+ tain_add_g(&deadline, &deadline) ;
if (!s6dns_init()) strerr_diefu1sys(111, "s6dns_init") ;
{
- int r = s6dns_resolve_txt(&sa, &offsets, argv[0], strlen(argv[0]), flagqualify, &deadline, &stamp) ;
+ int r = s6dns_resolve_txt_g(&sa, &offsets, argv[0], strlen(argv[0]), flagqualify, &deadline) ;
if (r < 0) strerr_diefu2sys((errno == ETIMEDOUT) ? 99 : 111, "resolve ", argv[0]) ;
if (!r) strerr_diefu4x(2, "resolve ", argv[0], ": ", s6dns_constants_error_str(errno)) ;
}