diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-01-25 15:52:18 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-01-25 15:52:18 +0000 |
commit | 00c9cb1b22cc17c4db573e0e613a5f116ff0092e (patch) | |
tree | 53178b2c52c6e97c6193f73378f3c5e5a781a914 /src/libstddjb/netstring_appendv.c | |
parent | 2746b131aa482ac17c94bc6b82e58dbcc1b752cf (diff) | |
download | skalibs-00c9cb1b22cc17c4db573e0e613a5f116ff0092e.tar.xz |
More work on the types. This commit builds but has errors.
Rework src/headers entirely: build skalibs/types.h
Convert skalibs/fmtscan.h types.
Propagate changes until it builds.
There are a lot of incompatible pointer issues remaining, those will be fixed with the buffer overhaul.
Diffstat (limited to 'src/libstddjb/netstring_appendv.c')
-rw-r--r-- | src/libstddjb/netstring_appendv.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/libstddjb/netstring_appendv.c b/src/libstddjb/netstring_appendv.c index 1fc1406..1d9c290 100644 --- a/src/libstddjb/netstring_appendv.c +++ b/src/libstddjb/netstring_appendv.c @@ -1,26 +1,27 @@ /* ISC license. */ -#include <skalibs/uint.h> +#include <sys/types.h> +#include <skalibs/uint64.h> #include <skalibs/bytestr.h> #include <skalibs/siovec.h> #include <skalibs/stralloc.h> #include <skalibs/netstring.h> -int netstring_appendv (stralloc *sa, siovec_t const *v, unsigned int n) +int netstring_appendv (stralloc *sa, struct iovec const *v, unsigned int n) { - char fmt[UINT_FMT] ; - unsigned int len = 0, pos ; + char fmt[UINT64_FMT] ; + size_t len = 0, pos ; register unsigned int i = 0 ; - for (; i < n ; i++) len += v[i].len ; - pos = uint_fmt(fmt, len) ; + for (; i < n ; i++) len += v[i].iov_len ; + pos = uint64_fmt(fmt, len) ; if (!stralloc_readyplus(sa, len + pos + 2)) return 0 ; fmt[pos] = ':' ; byte_copy(sa->s + sa->len, pos+1, fmt) ; sa->len += pos+1 ; for (i = 0 ; i < n ; i++) { - byte_copy(sa->s + sa->len, v[i].len, v[i].s) ; - sa->len += v[i].len ; + byte_copy(sa->s + sa->len, v[i].iov_len, (char const *)v[i].iov_base) ; + sa->len += v[i].iov_len ; } sa->s[sa->len++] = ',' ; return 1 ; |