diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-12 11:59:43 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-12 11:59:43 +0000 |
| commit | c60ebd422171808ad58b936914055397bb205bef (patch) | |
| tree | 7db3e5728d72ad209f8e22b9eb9f337e0b0c3e58 /src/libs6/s6_accessrules_keycheck_ip6.c | |
| parent | e28fe5908a91d8795ca9923d64eeed7d3e898434 (diff) | |
| download | s6-c60ebd422171808ad58b936914055397bb205bef.tar.gz | |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/libs6/s6_accessrules_keycheck_ip6.c')
| -rw-r--r-- | src/libs6/s6_accessrules_keycheck_ip6.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libs6/s6_accessrules_keycheck_ip6.c b/src/libs6/s6_accessrules_keycheck_ip6.c index cd7fe02..93418d3 100644 --- a/src/libs6/s6_accessrules_keycheck_ip6.c +++ b/src/libs6/s6_accessrules_keycheck_ip6.c @@ -1,8 +1,7 @@ /* ISC license. */ -#include <sys/types.h> -#include <skalibs/uint.h> -#include <skalibs/bytestr.h> +#include <string.h> +#include <skalibs/types.h> #include <skalibs/bitarray.h> #include <skalibs/fmtscan.h> #include <s6/accessrules.h> @@ -12,11 +11,11 @@ s6_accessrules_result_t s6_accessrules_keycheck_ip6 (void const *key, void *data char fmt[IP6_FMT + UINT_FMT + 6] = "ip6/" ; char ip6[16] ; unsigned int i = 0 ; - byte_copy(ip6, 16, (char const *)key) ; + memcpy(ip6, (char const *)key, 16) ; for (; i <= 128 ; i++) { size_t len ; - register s6_accessrules_result_t r ; + s6_accessrules_result_t r ; if (i) bitarray_clear(ip6, 128 - i) ; len = 4 + ip6_fmt(fmt+4, ip6) ; fmt[len++] = '_' ; |