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_qualify.c | |
parent | f417b72c9489cd7c20b94eb8904a8911b7f6fd15 (diff) | |
download | s6-dns-5ad27a3dc4b957191e2e657d41656810138ba789.tar.xz |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/libs6dns/s6dns_domain_qualify.c')
-rw-r--r-- | src/libs6dns/s6dns_domain_qualify.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libs6dns/s6dns_domain_qualify.c b/src/libs6dns/s6dns_domain_qualify.c index 8f036be..ae66978 100644 --- a/src/libs6dns/s6dns_domain_qualify.c +++ b/src/libs6dns/s6dns_domain_qualify.c @@ -1,8 +1,7 @@ /* 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_qualify (s6dns_domain_t *list, s6dns_domain_t const *d, char const *rules, unsigned int rulesnum) @@ -15,14 +14,14 @@ unsigned int s6dns_domain_qualify (s6dns_domain_t *list, s6dns_domain_t const *d } else { - register unsigned int i = 0 ; + unsigned int i = 0 ; for (; i < rulesnum ; i++) { - size_t n = str_len(rules) ; + size_t n = strlen(rules) ; if (d->len + n >= 254) return (errno = ENAMETOOLONG, 0) ; list[i] = *d ; list[i].s[d->len] = '.' ; - byte_copy(list[i].s + d->len + 1, n, rules) ; + memcpy(list[i].s + d->len + 1, rules, n) ; list[i].len += n+1 ; rules += n+1 ; } |