diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-11 16:09:55 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-11 16:09:55 +0000 |
| commit | 5ad27a3dc4b957191e2e657d41656810138ba789 (patch) | |
| tree | 07e7e00ab43b74d6a3fdff9ad80e93882921adfa /src/clients/s6-dnsqr.c | |
| parent | f417b72c9489cd7c20b94eb8904a8911b7f6fd15 (diff) | |
| download | s6-dns-5ad27a3dc4b957191e2e657d41656810138ba789.tar.xz | |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/clients/s6-dnsqr.c')
| -rw-r--r-- | src/clients/s6-dnsqr.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/clients/s6-dnsqr.c b/src/clients/s6-dnsqr.c index f1bb896..ed66ff9 100644 --- a/src/clients/s6-dnsqr.c +++ b/src/clients/s6-dnsqr.c @@ -1,10 +1,9 @@ /* ISC license. */ +#include <string.h> #include <stdint.h> #include <errno.h> -#include <skalibs/uint16.h> -#include <skalibs/uint.h> -#include <skalibs/bytestr.h> +#include <skalibs/types.h> #include <skalibs/strerr2.h> #include <skalibs/sgetopt.h> #include <skalibs/buffer.h> @@ -28,7 +27,7 @@ int main (int argc, char const *const *argv) unsigned int t = 0 ; for (;;) { - register int opt = subgetopt_r(argc, argv, "12t:D:", &l) ; + int opt = subgetopt_r(argc, argv, "12t:D:", &l) ; if (opt == -1) break ; switch (opt) { @@ -48,7 +47,7 @@ int main (int argc, char const *const *argv) s6dns_domain_t d ; uint16_t qtype = s6dns_analyze_qtype_parse(argv[0]) ; if (!qtype) dieusage() ; - if (!s6dns_domain_fromstring_noqualify_encode(&d, argv[1], str_len(argv[1]))) + if (!s6dns_domain_fromstring_noqualify_encode(&d, argv[1], strlen(argv[1]))) strerr_diefu2sys(100, "encode ", argv[1]) ; dbh.external = where ; if (debuglevel & 1) dbh.post_recv = &s6dns_debug_dumpdt_post_recv ; |