1 files changed, 6 insertions, 7 deletions
diff --git a/src/libs6dns/s6dns_fmt_srv.c b/src/libs6dns/s6dns_fmt_srv.c
index 33bfd49..ee0d337 100644
--- a/src/libs6dns/s6dns_fmt_srv.c
+++ b/src/libs6dns/s6dns_fmt_srv.c
@@ -1,9 +1,8 @@
 /* ISC license. */
 
-#include <sys/types.h>
+#include <string.h>
 #include <errno.h>
-#include <skalibs/uint16.h>
-#include <skalibs/bytestr.h>
+#include <skalibs/types.h>
 #include <s6-dns/s6dns-message.h>
 #include <s6-dns/s6dns-fmt.h>
 
@@ -11,17 +10,17 @@ size_t s6dns_fmt_srv (char *s, size_t max, s6dns_message_rr_srv_t const *srv)
 {
   size_t len = 0 ;
   char fmt[UINT16_FMT] ;
-  register size_t r = uint16_fmt(fmt, srv->priority) ;
+  size_t r = uint16_fmt(fmt, srv->priority) ;
   if (len + r >= max) return (errno = ENAMETOOLONG, 0) ;
-  byte_copy(s + len, r, fmt) ;
+  memcpy(s + len, fmt, r) ;
   len += r ; s[len++] = ' ' ;
   r = uint16_fmt(fmt, srv->weight) ;
   if (len + r >= max) return (errno = ENAMETOOLONG, 0) ;
-  byte_copy(s + len, r, fmt) ;
+  memcpy(s + len, fmt, r) ;
   len += r ; s[len++] = ' ' ;
   r = uint16_fmt(fmt, srv->port) ;
   if (len + r >= max) return (errno = ENAMETOOLONG, 0) ;
-  byte_copy(s + len, r, fmt) ;
+  memcpy(s + len, fmt, r) ;
   len += r ; s[len++] = ' ' ;
   r = s6dns_domain_tostring(s + len, max - len, &srv->target) ;
   if (!r) return 0 ;