Merging upstream version 1.17~pre1.

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

1 files changed, 11 insertions, 11 deletions

diff --git a/decoder.h b/decoder.h
index 623e19b..c445ccf 100644
--- a/decoder.h
+++ b/decoder.h
@@ -1,5 +1,5 @@
 /*  Lzip - LZMA lossless data compressor
-    Copyright (C) 2008-2014 Antonio Diaz Diaz.
+    Copyright (C) 2008-2015 Antonio Diaz Diaz.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,12 +19,12 @@ class Range_decoder
   {
   enum { buffer_size = 16384 };
   unsigned long long partial_member_pos;
-  uint8_t * const buffer;	// input buffer
-  int pos;			// current pos in buffer
-  int stream_pos;		// when reached, a new block must be read
+  uint8_t * const buffer;	/* input buffer */
+  int pos;			/* current pos in buffer */
+  int stream_pos;		/* when reached, a new block must be read */
   uint32_t code;
   uint32_t range;
-  const int infd;		// input file descriptor
+  const int infd;		/* input file descriptor */
   bool at_stream_end;
 
   bool read_block();
@@ -213,23 +213,23 @@ class LZ_decoder
   Range_decoder & rdec;
   const unsigned dictionary_size;
   const int buffer_size;
-  uint8_t * const buffer;	// output buffer
-  int pos;			// current pos in buffer
-  int stream_pos;		// first byte not yet written to file
+  uint8_t * const buffer;	/* output buffer */
+  int pos;			/* current pos in buffer */
+  int stream_pos;		/* first byte not yet written to file */
   uint32_t crc_;
-  const int outfd;		// output file descriptor
+  const int outfd;		/* output file descriptor */
   const int member_version;
 
   void flush_data();
   bool verify_trailer( const Pretty_print & pp ) const;
 
-  uint8_t get_prev_byte() const
+  uint8_t peek1() const
     {
     const int i = ( ( pos > 0 ) ? pos : buffer_size ) - 1;
     return buffer[i];
     }
 
-  uint8_t get_byte( const int distance ) const
+  uint8_t peek( const int distance ) const
     {
     int i = pos - distance - 1;
     if( i < 0 ) i += buffer_size;