From 560efe7382b3ec435391d3f2fcda03cb08787ab9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 8 Nov 2015 05:26:11 +0100 Subject: Adding upstream version 1.0. Signed-off-by: Daniel Baumann --- zutils.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'zutils.cc') diff --git a/zutils.cc b/zutils.cc index 798da03..850504a 100644 --- a/zutils.cc +++ b/zutils.cc @@ -54,13 +54,13 @@ int readblock( const int fd, uint8_t * const buf, const int size ) errno = 0; while( rest > 0 ) { - errno = 0; const int n = read( fd, buf + size - rest, rest ); if( n > 0 ) rest -= n; else if( n == 0 ) break; // EOF else if( errno != EINTR && errno != EAGAIN ) break; + errno = 0; } - return ( rest > 0 ) ? size - rest : size; + return size - rest; } @@ -73,12 +73,12 @@ int writeblock( const int fd, const uint8_t * const buf, const int size ) errno = 0; while( rest > 0 ) { - errno = 0; const int n = write( fd, buf + size - rest, rest ); if( n > 0 ) rest -= n; else if( n < 0 && errno != EINTR && errno != EAGAIN ) break; + errno = 0; } - return ( rest > 0 ) ? size - rest : size; + return size - rest; } -- cgit v1.2.3