diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-02-05 23:56:14 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-02-05 23:56:14 +0000 |
commit | 153a646667ff5ae7578a6027938524db91c40821 (patch) | |
tree | 429f092f8254acbb207302d9dd8c790bc596322f /src/libstddjb/buffer_getv.c | |
parent | cea441e894405c6d28e302ae4360e9f848b37797 (diff) | |
download | skalibs-153a646667ff5ae7578a6027938524db91c40821.tar.xz |
- 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
Diffstat (limited to 'src/libstddjb/buffer_getv.c')
-rw-r--r-- | src/libstddjb/buffer_getv.c | 11 |
1 files changed, 4 insertions, 7 deletions
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 <errno.h> +#include <skalibs/allreadwrite.h> #include <skalibs/buffer.h> -#include <skalibs/diuint.h> #include <skalibs/siovec.h> 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 ; } |