From 5ad27a3dc4b957191e2e657d41656810138ba789 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sat, 11 Mar 2017 16:09:55 +0000
Subject:  Adapt to skalibs-2.5.0.0

---
 src/libs6dns/s6dns_domain_tostring.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/libs6dns/s6dns_domain_tostring.c')

diff --git a/src/libs6dns/s6dns_domain_tostring.c b/src/libs6dns/s6dns_domain_tostring.c
index d5de7ae..e11715b 100644
--- a/src/libs6dns/s6dns_domain_tostring.c
+++ b/src/libs6dns/s6dns_domain_tostring.c
@@ -1,13 +1,12 @@
 /* ISC license. */
 
-#include <sys/types.h>
+#include <string.h>
 #include <errno.h>
-#include <skalibs/bytestr.h>
 #include <s6-dns/s6dns-domain.h>
 
 unsigned int s6dns_domain_tostring (char *s, size_t max, s6dns_domain_t const *d)
 {
-  if ((unsigned int)d->len + 1 > max) return (errno = ENAMETOOLONG, 0) ;
+  if ((size_t)d->len + 1 > max) return (errno = ENAMETOOLONG, 0) ;
   if (!d->len || (d->s[0] != '.')) return (errno = EINVAL, 0) ;
   if (d->len == 1)
   {
@@ -16,7 +15,7 @@ unsigned int s6dns_domain_tostring (char *s, size_t max, s6dns_domain_t const *d
   }
   else
   {
-    byte_copy(s, d->len - 1, d->s + 1) ;
+    memcpy(s, d->s + 1, d->len - 1) ;
     return d->len - 1 ;
   }
 }
-- 
cgit v1.3.1