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/libs6dns/s6dns_domain_tostring.c | |
| parent | f417b72c9489cd7c20b94eb8904a8911b7f6fd15 (diff) | |
| download | s6-dns-5ad27a3dc4b957191e2e657d41656810138ba789.tar.xz | |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/libs6dns/s6dns_domain_tostring.c')
| -rw-r--r-- | src/libs6dns/s6dns_domain_tostring.c | 7 |
1 files changed, 3 insertions, 4 deletions
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 ; } } |