Adapt to skalibs-2.5.0.0

1 files changed, 14 insertions, 13 deletions

diff --git a/src/clients/s6-dnssrv.c b/src/clients/s6-dnssrv.c
index 47f5df0..ecc3db6 100644
--- a/src/clients/s6-dnssrv.c
+++ b/src/clients/s6-dnssrv.c
@@ -1,9 +1,9 @@
 /* ISC license. */
 
 #include <sys/types.h>
+#include <string.h>
 #include <errno.h>
-#include <skalibs/uint.h>
-#include <skalibs/bytestr.h>
+#include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/strerr2.h>
 #include <skalibs/buffer.h>
@@ -26,7 +26,7 @@ int main (int argc, char const *const *argv)
   PROG = "s6-dnssrv" ;
   for (;;)
   {
-    register int opt = subgetopt(argc, argv, "qt:") ;
+    int opt = subgetopt(argc, argv, "qt:") ;
     if (opt == -1) break ;
     switch (opt)
     {
@@ -44,19 +44,20 @@ int main (int argc, char const *const *argv)
   tain_add_g(&deadline, &deadline) ;
   if (!s6dns_init()) strerr_diefu1sys(111, "s6dns_init") ;
   {
-    size_t n0 = str_len(argv[0]) ;
-    size_t n1 = str_len(argv[1]) ;
-    size_t n2 = str_len(argv[2]) ;
+    size_t n0 = strlen(argv[0]) ;
+    size_t n1 = strlen(argv[1]) ;
+    size_t n2 = strlen(argv[2]) ;
+    int r ;
     char name[n0 + n1 + n2 + 5] ;
     name[0] = '_' ;
-    byte_copy(name + 1, n0, argv[0]) ;
+    memcpy(name + 1, argv[0], n0) ;
     name[n0 + 1] = '.' ;
     name[n0 + 2] = '_' ;
-    byte_copy(name + n0 + 3, n1, argv[1]) ;
+    memcpy(name + n0 + 3, argv[1], n1) ;
     name[n0 + n1 + 3] = '.' ;
-    byte_copy(name + n0 + n1 + 4, n2, argv[2]) ;
+    memcpy(name + n0 + n1 + 4, argv[2], n2) ;
     name[n0 + n1 + n2 + 4] = 0 ;
-    register int r = s6dns_resolve_srv_g(&srvs, name, n0 + n1 + n2 + 4, flagqualify, &deadline) ;
+    r = s6dns_resolve_srv_g(&srvs, name, n0 + n1 + n2 + 4, flagqualify, &deadline) ;
     if (r < 0) strerr_diefu2sys((errno == ETIMEDOUT) ? 99 : 111, "resolve ", argv[0]) ;
     if (!r) strerr_diefu4x(2, "resolve ", name, ": ", s6dns_constants_error_str(errno)) ;
   }
@@ -65,10 +66,10 @@ int main (int argc, char const *const *argv)
   for (i = 0 ; i < genalloc_len(s6dns_message_rr_srv_t, &srvs) ; i++)
   {
     char buf[S6DNS_FMT_SRV] ;
-    register size_t len = s6dns_fmt_srv(buf, S6DNS_FMT_SRV, genalloc_s(s6dns_message_rr_srv_t, &srvs) + i) ;
+    size_t len = s6dns_fmt_srv(buf, S6DNS_FMT_SRV, genalloc_s(s6dns_message_rr_srv_t, &srvs) + i) ;
     if (!len) strerr_diefu1sys(111, "format result") ;
-    if (buffer_put(buffer_1, buf, len) < 0) goto err ;
-    if (buffer_put(buffer_1, "\n", 1) < 0) goto err ;
+    if (buffer_put(buffer_1, buf, len) < (ssize_t)len) goto err ;
+    if (buffer_put(buffer_1, "\n", 1) < 1) goto err ;
   }
   if (!buffer_flush(buffer_1)) goto err ;
   return 0 ;