summaryrefslogtreecommitdiff
path: root/src/libs6dns/s6dns_fmt_soa.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-03-11 16:09:55 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-03-11 16:09:55 +0000
commit5ad27a3dc4b957191e2e657d41656810138ba789 (patch)
tree07e7e00ab43b74d6a3fdff9ad80e93882921adfa /src/libs6dns/s6dns_fmt_soa.c
parentf417b72c9489cd7c20b94eb8904a8911b7f6fd15 (diff)
downloads6-dns-5ad27a3dc4b957191e2e657d41656810138ba789.tar.xz
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/libs6dns/s6dns_fmt_soa.c')
-rw-r--r--src/libs6dns/s6dns_fmt_soa.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/libs6dns/s6dns_fmt_soa.c b/src/libs6dns/s6dns_fmt_soa.c
index b07ae14..b9e0a42 100644
--- a/src/libs6dns/s6dns_fmt_soa.c
+++ b/src/libs6dns/s6dns_fmt_soa.c
@@ -1,9 +1,8 @@
/* ISC license. */
-#include <sys/types.h>
+#include <string.h>
#include <errno.h>
-#include <skalibs/uint32.h>
-#include <skalibs/bytestr.h>
+#include <skalibs/types.h>
#include <s6-dns/s6dns-message.h>
#include <s6-dns/s6dns-fmt.h>
@@ -11,7 +10,7 @@ size_t s6dns_fmt_soa (char *s, size_t max, s6dns_message_rr_soa_t const *soa)
{
size_t len = 0 ;
char fmt[UINT32_FMT] ;
- register size_t r = s6dns_domain_tostring(s + len, max - len, &soa->mname) ;
+ size_t r = s6dns_domain_tostring(s + len, max - len, &soa->mname) ;
if (!r) return 0 ;
len += r ;
if (len >= max) return (errno = ENAMETOOLONG, 0) ;
@@ -23,23 +22,23 @@ size_t s6dns_fmt_soa (char *s, size_t max, s6dns_message_rr_soa_t const *soa)
s[len++] = ' ' ;
r = uint32_fmt(fmt, soa->serial) ;
if (len + r >= max) return (errno = ENAMETOOLONG, 0) ;
- byte_copy(s + len, r, fmt) ;
+ memcpy(s + len, fmt, r) ;
len += r ; s[len++] = ' ' ;
r = uint32_fmt(fmt, soa->refresh) ;
if (len + r >= max) return (errno = ENAMETOOLONG, 0) ;
- byte_copy(s + len, r, fmt) ;
+ memcpy(s + len, fmt, r) ;
len += r ; s[len++] = ' ' ;
r = uint32_fmt(fmt, soa->retry) ;
if (len + r >= max) return (errno = ENAMETOOLONG, 0) ;
- byte_copy(s + len, r, fmt) ;
+ memcpy(s + len, fmt, r) ;
len += r ; s[len++] = ' ' ;
r = uint32_fmt(fmt, soa->expire) ;
if (len + r >= max) return (errno = ENAMETOOLONG, 0) ;
- byte_copy(s + len, r, fmt) ;
+ memcpy(s + len, fmt, r) ;
len += r ; s[len++] = ' ' ;
r = uint32_fmt(fmt, soa->minimum) ;
if (len + r > max) return (errno = ENAMETOOLONG, 0) ;
- byte_copy(s + len, r, fmt) ;
+ memcpy(s + len, fmt, r) ;
len += r ;
return len ;
}