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_fmt_domainlist.c | |
| parent | f417b72c9489cd7c20b94eb8904a8911b7f6fd15 (diff) | |
| download | s6-dns-5ad27a3dc4b957191e2e657d41656810138ba789.tar.xz | |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/libs6dns/s6dns_fmt_domainlist.c')
| -rw-r--r-- | src/libs6dns/s6dns_fmt_domainlist.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libs6dns/s6dns_fmt_domainlist.c b/src/libs6dns/s6dns_fmt_domainlist.c index 625e149..22d6f77 100644 --- a/src/libs6dns/s6dns_fmt_domainlist.c +++ b/src/libs6dns/s6dns_fmt_domainlist.c @@ -1,24 +1,23 @@ /* ISC license. */ -#include <sys/types.h> +#include <string.h> #include <errno.h> -#include <skalibs/bytestr.h> #include <s6-dns/s6dns-domain.h> #include <s6-dns/s6dns-fmt.h> size_t s6dns_fmt_domainlist (char *s, size_t max, s6dns_domain_t const *list, unsigned int n, char const *delim, size_t delimlen) { size_t len = 0 ; - register unsigned int i = 0 ; + unsigned int i = 0 ; for (; i < n ; i++) { - register unsigned int r = s6dns_domain_tostring(s + len, max - len, list + i) ; + unsigned int r = s6dns_domain_tostring(s + len, max - len, list + i) ; if (!r) return 0 ; len += r ; if (i+1 < n) { if (len + delimlen > max) return (errno = ENAMETOOLONG, 0) ; - byte_copy(s + len, delimlen, delim) ; + memcpy(s + len, delim, delimlen) ; len += delimlen ; } } |