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-dnsqualify.c | |
parent | f417b72c9489cd7c20b94eb8904a8911b7f6fd15 (diff) | |
download | s6-dns-5ad27a3dc4b957191e2e657d41656810138ba789.tar.xz |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/clients/s6-dnsqualify.c')
-rw-r--r-- | src/clients/s6-dnsqualify.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/clients/s6-dnsqualify.c b/src/clients/s6-dnsqualify.c index 94405db..74d1c9b 100644 --- a/src/clients/s6-dnsqualify.c +++ b/src/clients/s6-dnsqualify.c @@ -1,7 +1,7 @@ /* ISC license. */ #include <sys/types.h> -#include <skalibs/bytestr.h> +#include <string.h> #include <skalibs/strerr2.h> #include <skalibs/buffer.h> #include <s6-dns/s6dns.h> @@ -14,7 +14,7 @@ int main (int argc, char const *const *argv) s6dns_domain_t d ; PROG = "s6-dnsqualify" ; if (argc < 2) dieusage() ; - if (!s6dns_domain_fromstring(&d, argv[1], str_len(argv[1]))) + if (!s6dns_domain_fromstring(&d, argv[1], strlen(argv[1]))) strerr_diefu2sys(100, "make a domain name from ", argv[1]) ; if (!s6dns_init()) strerr_diefu1sys(111, "s6dns_init") ; { @@ -25,10 +25,10 @@ int main (int argc, char const *const *argv) char buf[S6DNS_FMT_DOMAINLIST(n)] ; size_t len = s6dns_fmt_domainlist(buf, S6DNS_FMT_DOMAINLIST(n), list, n, "\n", 1) ; if (!len) strerr_diefu1sys(111, "format result") ; - if (buffer_put(buffer_1, buf, len) < 0) goto err ; + if (buffer_put(buffer_1, buf, len) < (ssize_t)len) goto err ; } } - if (buffer_putflush(buffer_1, "\n", 1) < 0) goto err ; + if (buffer_putflush(buffer_1, "\n", 1) < 1) goto err ; return 0 ; err: strerr_diefu1sys(111, "write to stdout") ; |