From 153a646667ff5ae7578a6027938524db91c40821 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Thu, 5 Feb 2015 23:56:14 +0000 Subject: - Add siovec_trunc - Add openwritevnclose - replace buffer_read/write with fd_readsv/writesv - add localtmn_from_tain_g - refactor cdb_make - rewrite buffer_getvall and buffer_putvall, with a bugfix --- src/libstddjb/buffer_getv.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/libstddjb/buffer_getv.c') diff --git a/src/libstddjb/buffer_getv.c b/src/libstddjb/buffer_getv.c index 0f8f848..b3d237e 100644 --- a/src/libstddjb/buffer_getv.c +++ b/src/libstddjb/buffer_getv.c @@ -1,15 +1,12 @@ /* ISC license. */ -#include +#include #include -#include #include int buffer_getv (buffer *b, siovec_t const *v, unsigned int n) { - diuint w = DIUINT_ZERO ; - register int r = buffer_getvall(b, v, n, &w) ; - return r == -1 ? errno == EPIPE ? (errno = 0, 0) : -1 : - !r ? (errno = EWOULDBLOCK, -1) : - (int)(siovec_len(v, w.left) + w.right) ; + unsigned int w = 0 ; + register int r = unsanitize_read(buffer_getvall(b, v, n, &w)) ; + return r <= 0 ? r : w ; } -- cgit v1.3.1