From 00c9cb1b22cc17c4db573e0e613a5f116ff0092e Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 25 Jan 2017 15:52:18 +0000 Subject: 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. --- src/libstddjb/netstring_put.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/libstddjb/netstring_put.c') diff --git a/src/libstddjb/netstring_put.c b/src/libstddjb/netstring_put.c index 5a27b25..692d2fc 100644 --- a/src/libstddjb/netstring_put.c +++ b/src/libstddjb/netstring_put.c @@ -1,34 +1,35 @@ /* ISC license. */ +#include #include +#include #include #include -#include -int netstring_put (buffer *b, char const *s, unsigned int len, unsigned int *written) +int netstring_put (buffer *b, char const *s, size_t len, size_t *written) { - char fmt[UINT_FMT] ; - unsigned int n = uint_fmt(fmt, len) ; + char fmt[UINT64_FMT] ; + size_t n = uint64_fmt(fmt, len) ; if (*written > len + n + 2) return (errno = EINVAL, 0) ; fmt[n] = ':' ; if (*written < n + 1) { - unsigned int w = *written ; - int r = buffer_putall(b, fmt, n+1, &w) ; + size_t w = *written ; + ssize_t r = buffer_putall(b, fmt, n+1, &w) ; if (r < 0) return (*written = w, 0) ; *written = n+1 ; } if (*written < n+1 + len) { - unsigned int w = *written - (n+1) ; - int r = buffer_putall(b, s, len, &w) ; + size_t w = *written - (n+1) ; + ssize_t r = buffer_putall(b, s, len, &w) ; *written = w + (n+1) ; if (r < 0) return (*written = n+1 + w, 0) ; *written = n+1 + len ; } { - unsigned int w = 0 ; - int r = buffer_putall(b, ",", 1, &w) ; + size_t w = 0 ; + ssize_t r = buffer_putall(b, ",", 1, &w) ; if (r < 0) return 0 ; } *written = 0 ; -- cgit v1.3.1