Merging upstream version 0.6.

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

1 files changed, 6 insertions, 8 deletions

diff --git a/plzip.h b/plzip.h
index a0d15e3..afcf8ce 100644
--- a/plzip.h
+++ b/plzip.h
@@ -60,8 +60,6 @@ void xunlock( pthread_mutex_t * mutex );
 void xwait( pthread_cond_t * cond, pthread_mutex_t * mutex );
 void xsignal( pthread_cond_t * cond );
 void xbroadcast( pthread_cond_t * cond );
-void xcreate( pthread_t *thread, void *(*routine)(void *), void *arg );
-void xjoin( pthread_t thread );
 
 
 class Slot_tally
@@ -90,7 +88,7 @@ public:
     xlock( &mutex );
     ++check_counter;
     while( num_free <= 0 )
-      { ++wait_counter; xwait( &slot_av, &mutex ); }
+      { ++wait_counter; xwait( &slot_av, &mutex ); ++check_counter; }
     --num_free;
     xunlock( &mutex );
     }
@@ -121,9 +119,9 @@ int decompress( const int num_workers, const int num_slots,
 
 extern int verbosity;
 
-void show_error( const char * msg, const int errcode = 0, const bool help = false ) throw();
-void internal_error( const char * msg );
-int readblock( const int fd, uint8_t * buf, const int size ) throw();
-int writeblock( const int fd, const uint8_t * buf, const int size ) throw();
-
 void fatal();		// Terminate the process
+
+void show_error( const char * const msg, const int errcode = 0, const bool help = false ) throw();
+void internal_error( const char * const msg );
+int readblock( const int fd, uint8_t * const buf, const int size ) throw();
+int writeblock( const int fd, const uint8_t * const buf, const int size ) throw();