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_message_get_string_internal.c | |
| parent | f417b72c9489cd7c20b94eb8904a8911b7f6fd15 (diff) | |
| download | s6-dns-5ad27a3dc4b957191e2e657d41656810138ba789.tar.xz | |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/libs6dns/s6dns_message_get_string_internal.c')
| -rw-r--r-- | src/libs6dns/s6dns_message_get_string_internal.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libs6dns/s6dns_message_get_string_internal.c b/src/libs6dns/s6dns_message_get_string_internal.c index 7e4105b..9597c36 100644 --- a/src/libs6dns/s6dns_message_get_string_internal.c +++ b/src/libs6dns/s6dns_message_get_string_internal.c @@ -1,17 +1,16 @@ /* ISC license. */ -#include <sys/types.h> +#include <string.h> #include <errno.h> #include <skalibs/error.h> -#include <skalibs/bytestr.h> #include "s6dns-message-internal.h" int s6dns_message_get_string_internal (char *s, size_t max, char const *packet, unsigned int packetlen, unsigned int *pos) { - register unsigned char len = ((unsigned char const *)packet)[*pos] ; + unsigned char len = ((unsigned char const *)packet)[*pos] ; if (*pos + len + 1 > packetlen) return (errno = EPROTO, -1) ; if (len > max) return (errno = ENAMETOOLONG, -1) ; - byte_copy(s, len, packet + *pos + 1) ; + memcpy(s, packet + *pos + 1, len) ; *pos += len + 1 ; - return (int)len ; + return len ; } |