Merging upstream version 1.2~rc1.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 4 insertions, 4 deletions

diff --git a/compress.cc b/compress.cc
index 942f1d3..f560be3 100644
--- a/compress.cc
+++ b/compress.cc
@@ -52,7 +52,7 @@ int readblock( const int fd, uint8_t * const buf, const int size )
     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;
+    else if( errno != EINTR ) break;
     errno = 0;
     }
   return size - rest;
@@ -70,7 +70,7 @@ int writeblock( const int fd, const uint8_t * const buf, const int size )
     {
     const int n = write( fd, buf + size - rest, rest );
     if( n > 0 ) rest -= n;
-    else if( n < 0 && errno != EINTR && errno != EAGAIN ) break;
+    else if( n < 0 && errno != EINTR ) break;
     errno = 0;
     }
   return size - rest;
@@ -421,7 +421,7 @@ extern "C" void * cworker( void * arg )
       }
 
     if( LZ_compress_close( encoder ) < 0 )
-      { pp( "LZ_compress_close failed" ); cleanup_and_fail(); }
+      { pp( "LZ_compress_close failed." ); cleanup_and_fail(); }
 
     if( verbosity >= 2 && packet->size > 0 ) show_progress( packet->size );
     packet->data = new_data;
@@ -440,7 +440,7 @@ void muxer( Packet_courier & courier, const Pretty_print & pp, const int outfd )
   while( true )
     {
     courier.deliver_packets( packet_vector );
-    if( packet_vector.size() == 0 ) break;		// all workers exited
+    if( packet_vector.empty() ) break;		// all workers exited
 
     for( unsigned i = 0; i < packet_vector.size(); ++i )
       {