From 5ad27a3dc4b957191e2e657d41656810138ba789 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sat, 11 Mar 2017 16:09:55 +0000 Subject: Adapt to skalibs-2.5.0.0 --- src/libs6dns/s6dns_fmt_srv.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/libs6dns/s6dns_fmt_srv.c') 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 +#include #include -#include -#include +#include #include #include @@ -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 ; -- cgit v1.3.1