diff options
author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-08 04:26:17 +0000 |
---|---|---|
committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-08 04:26:17 +0000 |
commit | 8e7d86c466470db9ed54f711046d5e96d3f6ee5a (patch) | |
tree | 10d31ee9b2f6731aa0abadd8ce54bf988befbf71 /zutils.cc | |
parent | Adding debian version 1.0~rc7-2. (diff) | |
download | zutils-8e7d86c466470db9ed54f711046d5e96d3f6ee5a.tar.xz zutils-8e7d86c466470db9ed54f711046d5e96d3f6ee5a.zip |
Merging upstream version 1.0.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'zutils.cc')
-rw-r--r-- | zutils.cc | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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; } |