zstdlib 0.1.1-x64-mingw32 → 0.1.2-x64-mingw32

data/ext/zstdlib/ruby/zlib-2.3/{zlib.c → zstdlib.c}

@@ -1,3 +1,4 @@
+#include <zstd.h>
 /*
  * zlib.c - An interface for zlib.
  *
@@ -7,7 +8,7 @@
  */
 
 #include <ruby.h>
-#include <zlib.h>
+#include <zstd_zlibwrapper.h>
 #include <time.h>
 #include <ruby/io.h>
 #include <ruby/thread.h>
@@ -251,48 +252,48 @@ static VALUE rb_gzreader_readlines(int, VALUE*, VALUE);
  * Using the wrapper to compress strings with default parameters is quite
  * simple:
  *
- *   require "zlib"
+ *   require "zstdlib"
  *
  *   data_to_compress = File.read("don_quixote.txt")
  *
  *   puts "Input size: #{data_to_compress.size}"
  *   #=> Input size: 2347740
  *
- *   data_compressed = Zlib::Deflate.deflate(data_to_compress)
+ *   data_compressed = Zstdlib::Deflate.deflate(data_to_compress)
  *
  *   puts "Compressed size: #{data_compressed.size}"
  *   #=> Compressed size: 887238
  *
- *   uncompressed_data = Zlib::Inflate.inflate(data_compressed)
+ *   uncompressed_data = Zstdlib::Inflate.inflate(data_compressed)
  *
  *   puts "Uncompressed data is: #{uncompressed_data}"
  *   #=> Uncompressed data is: The Project Gutenberg EBook of Don Quixote...
  *
  * == Class tree
  *
- * - Zlib::Deflate
- * - Zlib::Inflate
- * - Zlib::ZStream
- * - Zlib::Error
- *   - Zlib::StreamEnd
- *   - Zlib::NeedDict
- *   - Zlib::DataError
- *   - Zlib::StreamError
- *   - Zlib::MemError
- *   - Zlib::BufError
- *   - Zlib::VersionError
+ * - Zstdlib::Deflate
+ * - Zstdlib::Inflate
+ * - Zstdlib::ZStream
+ * - Zstdlib::Error
+ *   - Zstdlib::StreamEnd
+ *   - Zstdlib::NeedDict
+ *   - Zstdlib::DataError
+ *   - Zstdlib::StreamError
+ *   - Zstdlib::MemError
+ *   - Zstdlib::BufError
+ *   - Zstdlib::VersionError
  *
  * (if you have GZIP_SUPPORT)
- * - Zlib::GzipReader
- * - Zlib::GzipWriter
- * - Zlib::GzipFile
- * - Zlib::GzipFile::Error
- *   - Zlib::GzipFile::LengthError
- *   - Zlib::GzipFile::CRCError
- *   - Zlib::GzipFile::NoFooter
+ * - Zstdlib::GzipReader
+ * - Zstdlib::GzipWriter
+ * - Zstdlib::GzipFile
+ * - Zstdlib::GzipFile::Error
+ *   - Zstdlib::GzipFile::LengthError
+ *   - Zstdlib::GzipFile::CRCError
+ *   - Zstdlib::GzipFile::NoFooter
  *
  */
-void Init_zlib(void);
+void Init_zstdlib(void);
 
 /*--------- Exceptions --------*/
 
@@ -352,9 +353,22 @@ finalizer_warn(const char *msg)
 
 
 /*-------- module Zlib --------*/
+/* 
+ * Document-method: Zstdlib.zstd_version 
+ * 
+ * Returns the string which represents the version of zstd library. 
+ */ 
+  static VALUE 
+  rb_zstd_version(VALUE klass) 
+  { 
+      VALUE str; 
+      str = rb_str_new2(ZSTD_versionString()); 
+      OBJ_TAINT(str); 
+      return str; 
+  }
 
 /*
- * Document-method: Zlib.zlib_version
+ * Document-method: Zstdlib.zlib_version
  *
  * Returns the string which represents the version of zlib library.
  */
@@ -415,9 +429,9 @@ do_checksum(int argc, VALUE *argv, uLong (*func)(uLong, const Bytef*, uInt))
 }
 
 /*
- * Document-method: Zlib.adler32
+ * Document-method: Zstdlib.adler32
  *
- * call-seq: Zlib.adler32(string, adler)
+ * call-seq: Zstdlib.adler32(string, adler)
  *
  * Calculates Adler-32 checksum for +string+, and returns updated value of
  * +adler+. If +string+ is omitted, it returns the Adler-32 initial value. If
@@ -425,10 +439,10 @@ do_checksum(int argc, VALUE *argv, uLong (*func)(uLong, const Bytef*, uInt))
  *
  * Example usage:
  *
- *   require "zlib"
+ *   require "zstdlib"
  *
  *   data = "foo"
- *   puts "Adler32 checksum: #{Zlib.adler32(data).to_s(16)}"
+ *   puts "Adler32 checksum: #{Zstdlib.adler32(data).to_s(16)}"
  *   #=> Adler32 checksum: 2820145
  *
  */
@@ -440,9 +454,9 @@ rb_zlib_adler32(int argc, VALUE *argv, VALUE klass)
 
 #ifdef HAVE_ADLER32_COMBINE
 /*
- * Document-method: Zlib.adler32_combine
+ * Document-method: Zstdlib.adler32_combine
  *
- * call-seq: Zlib.adler32_combine(adler1, adler2, len2)
+ * call-seq: Zstdlib.adler32_combine(adler1, adler2, len2)
  *
  * Combine two Adler-32 check values in to one.  +alder1+ is the first Adler-32
  * value, +adler2+ is the second Adler-32 value.  +len2+ is the length of the
@@ -460,9 +474,9 @@ rb_zlib_adler32_combine(VALUE klass, VALUE adler1, VALUE adler2, VALUE len2)
 #endif
 
 /*
- * Document-method: Zlib.crc32
+ * Document-method: Zstdlib.crc32
  *
- * call-seq: Zlib.crc32(string, crc)
+ * call-seq: Zstdlib.crc32(string, crc)
  *
  * Calculates CRC checksum for +string+, and returns updated value of +crc+. If
  * +string+ is omitted, it returns the CRC initial value. If +crc+ is omitted, it
@@ -478,9 +492,9 @@ rb_zlib_crc32(int argc, VALUE *argv, VALUE klass)
 
 #ifdef HAVE_CRC32_COMBINE
 /*
- * Document-method: Zlib.crc32_combine
+ * Document-method: Zstdlib.crc32_combine
  *
- * call-seq: Zlib.crc32_combine(crc1, crc2, len2)
+ * call-seq: Zstdlib.crc32_combine(crc1, crc2, len2)
  *
  * Combine two CRC-32 check values in to one.  +crc1+ is the first CRC-32
  * value, +crc2+ is the second CRC-32 value.  +len2+ is the length of the
@@ -498,7 +512,7 @@ rb_zlib_crc32_combine(VALUE klass, VALUE crc1, VALUE crc2, VALUE len2)
 #endif
 
 /*
- * Document-method: Zlib.crc_table
+ * Document-method: Zstdlib.crc_table
  *
  * Returns the table for calculating CRC checksum as an array.
  */
@@ -1205,19 +1219,19 @@ get_zstream(VALUE obj)
 /* ------------------------------------------------------------------------- */
 
 /*
- * Document-class: Zlib::ZStream
+ * Document-class: Zstdlib::ZStream
  *
- * Zlib::ZStream is the abstract class for the stream which handles the
+ * Zstdlib::ZStream is the abstract class for the stream which handles the
  * compressed data. The operations are defined in the subclasses:
- * Zlib::Deflate for compression, and Zlib::Inflate for decompression.
+ * Zstdlib::Deflate for compression, and Zstdlib::Inflate for decompression.
  *
- * An instance of Zlib::ZStream has one stream (struct zstream in the source)
+ * An instance of Zstdlib::ZStream has one stream (struct zstream in the source)
  * and two variable-length buffers which associated to the input (next_in) of
  * the stream and the output (next_out) of the stream. In this document,
  * "input buffer" means the buffer for input, and "output buffer" means the
  * buffer for output.
  *
- * Data input into an instance of Zlib::ZStream are temporally stored into
+ * Data input into an instance of Zstdlib::ZStream are temporally stored into
  * the end of input buffer, and then data in input buffer are processed from
  * the beginning of the buffer until no more output from the stream is
  * produced (i.e. until avail_out > 0 after processing).  During processing,
@@ -1229,7 +1243,7 @@ get_zstream(VALUE obj)
  *
  * Here is an ascii art for describing above:
  *
- *    +================ an instance of Zlib::ZStream ================+
+ *    +================ an instance of Zstdlib::ZStream ================+
  *    ||                                                            ||
  *    ||     +--------+          +-------+          +--------+      ||
  *    ||  +--| output |<---------|zstream|<---------| input  |<--+  ||
@@ -1242,15 +1256,15 @@ get_zstream(VALUE obj)
  *    "output data"                                         "input data"
  *
  * If an error occurs during processing input buffer, an exception which is a
- * subclass of Zlib::Error is raised.  At that time, both input and output
+ * subclass of Zstdlib::Error is raised.  At that time, both input and output
  * buffer keep their conditions at the time when the error occurs.
  *
  * == Method Catalogue
  *
  * Many of the methods in this class are fairly low-level and unlikely to be
  * of interest to users.  In fact, users are unlikely to use this class
- * directly; rather they will be interested in Zlib::Inflate and
- * Zlib::Deflate.
+ * directly; rather they will be interested in Zstdlib::Inflate and
+ * Zstdlib::Deflate.
  *
  * The higher level methods are listed below.
  *
@@ -1443,9 +1457,9 @@ rb_zstream_closed_p(VALUE obj)
 /* ------------------------------------------------------------------------- */
 
 /*
- * Document-class: Zlib::Deflate
+ * Document-class: Zstdlib::Deflate
  *
- * Zlib::Deflate is the class for compressing data.  See Zlib::ZStream for more
+ * Zstdlib::Deflate is the class for compressing data.  See Zstdlib::ZStream for more
  * information.
  */
 
@@ -1453,7 +1467,7 @@ rb_zstream_closed_p(VALUE obj)
     (NIL_P((val)) ? (ifnil) \
     : ((void)Check_Type((val), T_FIXNUM), FIX2INT((val))))
 
-#define ARG_LEVEL(val)     FIXNUMARG((val), Z_DEFAULT_COMPRESSION)
+#define ARG_LEVEL(val)     FIXNUMARG((val), ZSTD_CLEVEL_DEFAULT)
 #define ARG_WBITS(val)     FIXNUMARG((val), MAX_WBITS)
 #define ARG_MEMLEVEL(val)  FIXNUMARG((val), DEF_MEM_LEVEL)
 #define ARG_STRATEGY(val)  FIXNUMARG((val), Z_DEFAULT_STRATEGY)
@@ -1467,10 +1481,10 @@ rb_deflate_s_allocate(VALUE klass)
 }
 
 /*
- * Document-method: Zlib::Deflate.new
+ * Document-method: Zstdlib::Deflate.new
  *
  * call-seq:
- *   Zlib::Deflate.new(level=DEFAULT_COMPRESSION, window_bits=MAX_WBITS, mem_level=DEF_MEM_LEVEL, strategy=DEFAULT_STRATEGY)
+ *   Zstdlib::Deflate.new(level=DEFAULT_COMPRESSION, window_bits=MAX_WBITS, mem_level=DEF_MEM_LEVEL, strategy=DEFAULT_STRATEGY)
  *
  * Creates a new deflate stream for compression. If a given argument is nil,
  * the default value of that argument is used.
@@ -1479,10 +1493,10 @@ rb_deflate_s_allocate(VALUE klass)
  * compression) and 9 (best compression). The following constants have been
  * defined to make code more readable:
  *
- * * Zlib::DEFAULT_COMPRESSION
- * * Zlib::NO_COMPRESSION
- * * Zlib::BEST_SPEED
- * * Zlib::BEST_COMPRESSION
+ * * Zstdlib::DEFAULT_COMPRESSION
+ * * Zstdlib::NO_COMPRESSION
+ * * Zstdlib::BEST_SPEED
+ * * Zstdlib::BEST_COMPRESSION
  *
  * See http://www.zlib.net/manual.html#Constants for further information.
  *
@@ -1495,17 +1509,17 @@ rb_deflate_s_allocate(VALUE klass)
  * compression ratio while 9 uses maximum memory for optimal speed.  The
  * default value is 8. Two constants are defined:
  *
- * * Zlib::DEF_MEM_LEVEL
- * * Zlib::MAX_MEM_LEVEL
+ * * Zstdlib::DEF_MEM_LEVEL
+ * * Zstdlib::MAX_MEM_LEVEL
  *
  * The +strategy+ sets the deflate compression strategy.  The following
  * strategies are available:
  *
- * Zlib::DEFAULT_STRATEGY:: For normal data
- * Zlib::FILTERED:: For data produced by a filter or predictor
- * Zlib::FIXED:: Prevents dynamic Huffman codes
- * Zlib::HUFFMAN_ONLY:: Prevents string matching
- * Zlib::RLE:: Designed for better compression of PNG image data
+ * Zstdlib::DEFAULT_STRATEGY:: For normal data
+ * Zstdlib::FILTERED:: For data produced by a filter or predictor
+ * Zstdlib::FIXED:: Prevents dynamic Huffman codes
+ * Zstdlib::HUFFMAN_ONLY:: Prevents string matching
+ * Zstdlib::RLE:: Designed for better compression of PNG image data
  *
  * See the constants for further description.
  *
@@ -1514,16 +1528,16 @@ rb_deflate_s_allocate(VALUE klass)
  * === Basic
  *
  *   open "compressed.file", "w+" do |io|
- *     io << Zlib::Deflate.new.deflate(File.read("big.file"))
+ *     io << Zstdlib::Deflate.new.deflate(File.read("big.file"))
  *   end
  *
  * === Custom compression
  *
  *   open "compressed.file", "w+" do |compressed_io|
- *     deflate = Zlib::Deflate.new(Zlib::BEST_COMPRESSION,
- *                                 Zlib::MAX_WBITS,
- *                                 Zlib::MAX_MEM_LEVEL,
- *                                 Zlib::HUFFMAN_ONLY)
+ *     deflate = Zstdlib::Deflate.new(Zstdlib::BEST_COMPRESSION,
+ *                                 Zstdlib::MAX_WBITS,
+ *                                 Zstdlib::MAX_MEM_LEVEL,
+ *                                 Zstdlib::HUFFMAN_ONLY)
  *
  *     begin
  *       open "big.file" do |big_io|
@@ -1561,7 +1575,7 @@ rb_deflate_initialize(int argc, VALUE *argv, VALUE obj)
 }
 
 /*
- * Document-method: Zlib::Deflate#initialize_copy
+ * Document-method: Zstdlib::Deflate#initialize_copy
  *
  * Duplicates the deflate stream.
  */
@@ -1598,26 +1612,26 @@ deflate_run(VALUE args)
 }
 
 /*
- * Document-method: Zlib::Deflate.deflate
+ * Document-method: Zstdlib::Deflate.deflate
  *
  * call-seq:
- *   Zlib.deflate(string[, level])
- *   Zlib::Deflate.deflate(string[, level])
+ *   Zstdlib.deflate(string[, level])
+ *   Zstdlib::Deflate.deflate(string[, level])
  *
  * Compresses the given +string+. Valid values of level are
- * Zlib::NO_COMPRESSION, Zlib::BEST_SPEED, Zlib::BEST_COMPRESSION,
- * Zlib::DEFAULT_COMPRESSION, or an integer from 0 to 9.
+ * Zstdlib::NO_COMPRESSION, Zstdlib::BEST_SPEED, Zstdlib::BEST_COMPRESSION,
+ * Zstdlib::DEFAULT_COMPRESSION, or an integer from 0 to 9.
  *
  * This method is almost equivalent to the following code:
  *
  *   def deflate(string, level)
- *     z = Zlib::Deflate.new(level)
- *     dst = z.deflate(string, Zlib::FINISH)
+ *     z = Zstdlib::Deflate.new(level)
+ *     dst = z.deflate(string, Zstdlib::FINISH)
  *     z.close
  *     dst
  *   end
  *
- * See also Zlib.inflate
+ * See also Zstdlib.inflate
  *
  */
 static VALUE
@@ -1660,16 +1674,16 @@ do_deflate(struct zstream *z, VALUE src, int flush)
 }
 
 /*
- * Document-method: Zlib::Deflate#deflate
+ * Document-method: Zstdlib::Deflate#deflate
  *
  * call-seq:
- *   z.deflate(string, flush = Zlib::NO_FLUSH)                 -> String
- *   z.deflate(string, flush = Zlib::NO_FLUSH) { |chunk| ... } -> nil
+ *   z.deflate(string, flush = Zstdlib::NO_FLUSH)                 -> String
+ *   z.deflate(string, flush = Zstdlib::NO_FLUSH) { |chunk| ... } -> nil
  *
  * Inputs +string+ into the deflate stream and returns the output from the
  * stream.  On calling this method, both the input and the output buffers of
  * the stream are flushed.  If +string+ is nil, this method finishes the
- * stream, just like Zlib::ZStream#finish.
+ * stream, just like Zstdlib::ZStream#finish.
  *
  * If a block is given consecutive deflated chunks from the +string+ are
  * yielded to the block and +nil+ is returned.
@@ -1677,10 +1691,10 @@ do_deflate(struct zstream *z, VALUE src, int flush)
  * The +flush+ parameter specifies the flush mode.  The following constants
  * may be used:
  *
- * Zlib::NO_FLUSH:: The default
- * Zlib::SYNC_FLUSH:: Flushes the output to a byte boundary
- * Zlib::FULL_FLUSH:: SYNC_FLUSH + resets the compression state
- * Zlib::FINISH:: Pending input is processed, pending output is flushed.
+ * Zstdlib::NO_FLUSH:: The default
+ * Zstdlib::SYNC_FLUSH:: Flushes the output to a byte boundary
+ * Zstdlib::FULL_FLUSH:: SYNC_FLUSH + resets the compression state
+ * Zstdlib::FINISH:: Pending input is processed, pending output is flushed.
  *
  * See the constants for further description.
  *
@@ -1699,12 +1713,12 @@ rb_deflate_deflate(int argc, VALUE *argv, VALUE obj)
 }
 
 /*
- * Document-method: Zlib::Deflate#<<
+ * Document-method: Zstdlib::Deflate#<<
  *
  * call-seq: << string
  *
- * Inputs +string+ into the deflate stream just like Zlib::Deflate#deflate, but
- * returns the Zlib::Deflate object itself.  The output from the stream is
+ * Inputs +string+ into the deflate stream just like Zstdlib::Deflate#deflate, but
+ * returns the Zstdlib::Deflate object itself.  The output from the stream is
  * preserved in output buffer.
  */
 static VALUE
@@ -1716,18 +1730,18 @@ rb_deflate_addstr(VALUE obj, VALUE src)
 }
 
 /*
- * Document-method: Zlib::Deflate#flush
+ * Document-method: Zstdlib::Deflate#flush
  *
  * call-seq:
- *   flush(flush = Zlib::SYNC_FLUSH)                 -> String
- *   flush(flush = Zlib::SYNC_FLUSH) { |chunk| ... } -> nil
+ *   flush(flush = Zstdlib::SYNC_FLUSH)                 -> String
+ *   flush(flush = Zstdlib::SYNC_FLUSH) { |chunk| ... } -> nil
  *
  * This method is equivalent to <tt>deflate('', flush)</tt>. This method is
  * just provided to improve the readability of your Ruby program.  If a block
  * is given chunks of deflate output are yielded to the block until the buffer
  * is flushed.
  *
- * See Zlib::Deflate#deflate for detail on the +flush+ constants NO_FLUSH,
+ * See Zstdlib::Deflate#deflate for detail on the +flush+ constants NO_FLUSH,
  * SYNC_FLUSH, FULL_FLUSH and FINISH.
  */
 static VALUE
@@ -1747,7 +1761,7 @@ rb_deflate_flush(int argc, VALUE *argv, VALUE obj)
 }
 
 /*
- * Document-method: Zlib::Deflate.params
+ * Document-method: Zstdlib::Deflate.params
  *
  * call-seq: params(level, strategy)
  *
@@ -1755,7 +1769,7 @@ rb_deflate_flush(int argc, VALUE *argv, VALUE obj)
  * different types of data that require different types of compression.  Any
  * unprocessed data is flushed before changing the params.
  *
- * See Zlib::Deflate.new for a description of +level+ and +strategy+.
+ * See Zstdlib::Deflate.new for a description of +level+ and +strategy+.
  *
  */
 static VALUE
@@ -1787,12 +1801,12 @@ rb_deflate_params(VALUE obj, VALUE v_level, VALUE v_strategy)
 }
 
 /*
- * Document-method: Zlib::Deflate.set_dictionary
+ * Document-method: Zstdlib::Deflate.set_dictionary
  *
  * call-seq: set_dictionary(string)
  *
  * Sets the preset dictionary and returns +string+. This method is available
- * just only after Zlib::Deflate.new or Zlib::ZStream#reset method was called.
+ * just only after Zstdlib::Deflate.new or Zstdlib::ZStream#reset method was called.
  * See zlib.h for details.
  *
  * Can raise errors of Z_STREAM_ERROR if a parameter is invalid (such as
@@ -1822,10 +1836,10 @@ rb_deflate_set_dictionary(VALUE obj, VALUE dic)
 /* ------------------------------------------------------------------------- */
 
 /*
- * Document-class: Zlib::Inflate
+ * Document-class: Zstdlib::Inflate
  *
  * Zlib:Inflate is the class for decompressing compressed data.  Unlike
- * Zlib::Deflate, an instance of this class is not able to duplicate (clone,
+ * Zstdlib::Deflate, an instance of this class is not able to duplicate (clone,
  * dup) itself.
  */
 
@@ -1838,10 +1852,10 @@ rb_inflate_s_allocate(VALUE klass)
 }
 
 /*
- * Document-method: Zlib::Inflate.new
+ * Document-method: Zstdlib::Inflate.new
  *
  * call-seq:
- *   Zlib::Inflate.new(window_bits = Zlib::MAX_WBITS)
+ *   Zstdlib::Inflate.new(window_bits = Zstdlib::MAX_WBITS)
  *
  * Creates a new inflate stream for decompression.  +window_bits+ sets the
  * size of the history buffer and can have the following values:
@@ -1858,7 +1872,7 @@ rb_inflate_s_allocate(VALUE klass)
  * Greater than 15::
  *   Add 32 to window_bits to enable zlib and gzip decoding with automatic
  *   header detection, or add 16 to decode only the gzip format (a
- *   Zlib::DataError will be raised for a non-gzip stream).
+ *   Zstdlib::DataError will be raised for a non-gzip stream).
  *
  * (-8..-15)::
  *   Enables raw deflate mode which will not generate a check value, and will
@@ -1870,7 +1884,7 @@ rb_inflate_s_allocate(VALUE klass)
  * == Example
  *
  *   open "compressed.file" do |compressed_io|
- *     zi = Zlib::Inflate.new(Zlib::MAX_WBITS + 32)
+ *     zi = Zstdlib::Inflate.new(Zstdlib::MAX_WBITS + 32)
  *
  *     begin
  *       open "uncompressed.file", "w+" do |uncompressed_io|
@@ -1913,26 +1927,26 @@ inflate_run(VALUE args)
 }
 
 /*
- * Document-method: Zlib::inflate
+ * Document-method: Zstdlib::inflate
  *
  * call-seq:
- *   Zlib.inflate(string)
- *   Zlib::Inflate.inflate(string)
+ *   Zstdlib.inflate(string)
+ *   Zstdlib::Inflate.inflate(string)
  *
- * Decompresses +string+. Raises a Zlib::NeedDict exception if a preset
+ * Decompresses +string+. Raises a Zstdlib::NeedDict exception if a preset
  * dictionary is needed for decompression.
  *
  * This method is almost equivalent to the following code:
  *
  *   def inflate(string)
- *     zstream = Zlib::Inflate.new
+ *     zstream = Zstdlib::Inflate.new
  *     buf = zstream.inflate(string)
  *     zstream.finish
  *     zstream.close
  *     buf
  *   end
  *
- * See also Zlib.deflate
+ * See also Zstdlib.deflate
  *
  */
 static VALUE
@@ -1971,7 +1985,7 @@ do_inflate(struct zstream *z, VALUE src)
     }
 }
 
-/* Document-method: Zlib::Inflate#add_dictionary
+/* Document-method: Zstdlib::Inflate#add_dictionary
  *
  * call-seq: add_dictionary(string)
  *
@@ -1992,7 +2006,7 @@ rb_inflate_add_dictionary(VALUE obj, VALUE dictionary)
 }
 
 /*
- * Document-method: Zlib::Inflate#inflate
+ * Document-method: Zstdlib::Inflate#inflate
  *
  * call-seq:
  *   inflate(deflate_string)                 -> String
@@ -2001,22 +2015,22 @@ rb_inflate_add_dictionary(VALUE obj, VALUE dictionary)
  * Inputs +deflate_string+ into the inflate stream and returns the output from
  * the stream.  Calling this method, both the input and the output buffer of
  * the stream are flushed.  If string is +nil+, this method finishes the
- * stream, just like Zlib::ZStream#finish.
+ * stream, just like Zstdlib::ZStream#finish.
  *
  * If a block is given consecutive inflated chunks from the +deflate_string+
  * are yielded to the block and +nil+ is returned.
  *
- * Raises a Zlib::NeedDict exception if a preset dictionary is needed to
- * decompress.  Set the dictionary by Zlib::Inflate#set_dictionary and then
+ * Raises a Zstdlib::NeedDict exception if a preset dictionary is needed to
+ * decompress.  Set the dictionary by Zstdlib::Inflate#set_dictionary and then
  * call this method again with an empty string to flush the stream:
  *
- *   inflater = Zlib::Inflate.new
+ *   inflater = Zstdlib::Inflate.new
  *
  *   begin
  *     out = inflater.inflate compressed
- *   rescue Zlib::NeedDict
+ *   rescue Zstdlib::NeedDict
  *     # ensure the dictionary matches the stream's required dictionary
- *     raise unless inflater.adler == Zlib.adler32(dictionary)
+ *     raise unless inflater.adler == Zstdlib.adler32(dictionary)
  *
  *     inflater.set_dictionary dictionary
  *     inflater.inflate ''
@@ -2026,7 +2040,7 @@ rb_inflate_add_dictionary(VALUE obj, VALUE dictionary)
  *
  *   inflater.close
  *
- * See also Zlib::Inflate.new
+ * See also Zstdlib::Inflate.new
  */
 static VALUE
 rb_inflate_inflate(VALUE obj, VALUE src)
@@ -2061,8 +2075,8 @@ rb_inflate_inflate(VALUE obj, VALUE src)
 /*
  * call-seq: << string
  *
- * Inputs +string+ into the inflate stream just like Zlib::Inflate#inflate, but
- * returns the Zlib::Inflate object itself.  The output from the stream is
+ * Inputs +string+ into the inflate stream just like Zstdlib::Inflate#inflate, but
+ * returns the Zstdlib::Inflate object itself.  The output from the stream is
  * preserved in output buffer.
  */
 static VALUE
@@ -2130,10 +2144,10 @@ rb_inflate_sync_point_p(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::Inflate#set_dictionary
+ * Document-method: Zstdlib::Inflate#set_dictionary
  *
  * Sets the preset dictionary and returns +string+.  This method is available just
- * only after a Zlib::NeedDict exception was raised.  See zlib.h for details.
+ * only after a Zstdlib::NeedDict exception was raised.  See zlib.h for details.
  *
  */
 static VALUE
@@ -2260,7 +2274,7 @@ gzfile_free(void *p)
 
     if (ZSTREAM_IS_READY(z)) {
 	if (z->func == &deflate_funcs) {
-	    finalizer_warn("Zlib::GzipWriter object must be closed explicitly.");
+	    finalizer_warn("Zstdlib::GzipWriter object must be closed explicitly.");
 	}
 	zstream_finalize(z);
     }
@@ -2474,7 +2488,7 @@ gzfile_raise(struct gzfile *gz, VALUE klass, const char *message)
 }
 
 /*
- * Document-method: Zlib::GzipFile::Error#inspect
+ * Document-method: Zstdlib::GzipFile::Error#inspect
  *
  * Constructs a String of the GzipFile Error
  */
@@ -2512,7 +2526,7 @@ gzfile_make_header(struct gzfile *gz)
     if (gz->level == Z_BEST_SPEED) {
 	extraflags |= GZ_EXTRAFLAG_FAST;
     }
-    else if (gz->level == Z_BEST_COMPRESSION) {
+    else if (gz->level == ZSTD_maxCLevel()) {
 	extraflags |= GZ_EXTRAFLAG_SLOW;
     }
 
@@ -2583,10 +2597,10 @@ gzfile_read_header(struct gzfile *gz)
 	gz->level = Z_BEST_SPEED;
     }
     else if (head[8] & GZ_EXTRAFLAG_SLOW) {
-	gz->level = Z_BEST_COMPRESSION;
+	gz->level = ZSTD_maxCLevel();
     }
     else {
-	gz->level = Z_DEFAULT_COMPRESSION;
+	gz->level = ZSTD_CLEVEL_DEFAULT;
     }
 
     gz->mtime = gzfile_get32(&head[4]);
@@ -2975,40 +2989,40 @@ get_gzfile(VALUE obj)
 /* ------------------------------------------------------------------------- */
 
 /*
- * Document-class: Zlib::GzipFile
+ * Document-class: Zstdlib::GzipFile
  *
- * Zlib::GzipFile is an abstract class for handling a gzip formatted
+ * Zstdlib::GzipFile is an abstract class for handling a gzip formatted
  * compressed file. The operations are defined in the subclasses,
- * Zlib::GzipReader for reading, and Zlib::GzipWriter for writing.
+ * Zstdlib::GzipReader for reading, and Zstdlib::GzipWriter for writing.
  *
  * GzipReader should be used by associating an IO, or IO-like, object.
  *
  * == Method Catalogue
  *
  * - ::wrap
- * - ::open (Zlib::GzipReader::open and Zlib::GzipWriter::open)
+ * - ::open (Zstdlib::GzipReader::open and Zstdlib::GzipWriter::open)
  * - #close
  * - #closed?
  * - #comment
- * - comment= (Zlib::GzipWriter#comment=)
+ * - comment= (Zstdlib::GzipWriter#comment=)
  * - #crc
- * - eof? (Zlib::GzipReader#eof?)
+ * - eof? (Zstdlib::GzipReader#eof?)
  * - #finish
  * - #level
- * - lineno (Zlib::GzipReader#lineno)
- * - lineno= (Zlib::GzipReader#lineno=)
+ * - lineno (Zstdlib::GzipReader#lineno)
+ * - lineno= (Zstdlib::GzipReader#lineno=)
  * - #mtime
- * - mtime= (Zlib::GzipWriter#mtime=)
+ * - mtime= (Zstdlib::GzipWriter#mtime=)
  * - #orig_name
- * - orig_name (Zlib::GzipWriter#orig_name=)
+ * - orig_name (Zstdlib::GzipWriter#orig_name=)
  * - #os_code
  * - path (when the underlying IO supports #path)
  * - #sync
  * - #sync=
  * - #to_io
  *
- * (due to internal structure, documentation may appear under Zlib::GzipReader
- * or Zlib::GzipWriter)
+ * (due to internal structure, documentation may appear under Zstdlib::GzipReader
+ * or Zstdlib::GzipWriter)
  */
 
 
@@ -3067,11 +3081,11 @@ gzfile_wrap(int argc, VALUE *argv, VALUE klass, int close_io_on_error)
 }
 
 /*
- * Document-method: Zlib::GzipFile.wrap
+ * Document-method: Zstdlib::GzipFile.wrap
  *
  * call-seq:
- *   Zlib::GzipReader.wrap(io, ...) { |gz| ... }
- *   Zlib::GzipWriter.wrap(io, ...) { |gz| ... }
+ *   Zstdlib::GzipReader.wrap(io, ...) { |gz| ... }
+ *   Zstdlib::GzipWriter.wrap(io, ...) { |gz| ... }
  *
  * Creates a GzipReader or GzipWriter associated with +io+, passing in any
  * necessary extra options, and executes the block with the newly created
@@ -3079,7 +3093,7 @@ gzfile_wrap(int argc, VALUE *argv, VALUE klass, int close_io_on_error)
  *
  * The GzipFile object will be closed automatically after executing the block.
  * If you want to keep the associated IO object open, you may call
- * Zlib::GzipFile#finish method in the block.
+ * Zstdlib::GzipFile#finish method in the block.
  */
 static VALUE
 rb_gzfile_s_wrap(int argc, VALUE *argv, VALUE klass)
@@ -3088,9 +3102,9 @@ rb_gzfile_s_wrap(int argc, VALUE *argv, VALUE klass)
 }
 
 /*
- * Document-method: Zlib::GzipFile.open
+ * Document-method: Zstdlib::GzipFile.open
  *
- * See Zlib::GzipReader#open and Zlib::GzipWriter#open.
+ * See Zstdlib::GzipReader#open and Zstdlib::GzipWriter#open.
  */
 static VALUE
 gzfile_s_open(int argc, VALUE *argv, VALUE klass, const char *mode)
@@ -3105,7 +3119,7 @@ gzfile_s_open(int argc, VALUE *argv, VALUE klass, const char *mode)
 }
 
 /*
- * Document-method: Zlib::GzipFile#to_io
+ * Document-method: Zstdlib::GzipFile#to_io
  *
  * Same as IO.
  */
@@ -3116,7 +3130,7 @@ rb_gzfile_to_io(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipFile#crc
+ * Document-method: Zstdlib::GzipFile#crc
  *
  * Returns CRC value of the uncompressed data.
  */
@@ -3127,7 +3141,7 @@ rb_gzfile_crc(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipFile#mtime
+ * Document-method: Zstdlib::GzipFile#mtime
  *
  * Returns last modification time recorded in the gzip file header.
  */
@@ -3138,7 +3152,7 @@ rb_gzfile_mtime(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipFile#level
+ * Document-method: Zstdlib::GzipFile#level
  *
  * Returns compression level.
  */
@@ -3149,7 +3163,7 @@ rb_gzfile_level(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipFile#os_code
+ * Document-method: Zstdlib::GzipFile#os_code
  *
  * Returns OS code number recorded in the gzip file header.
  */
@@ -3160,7 +3174,7 @@ rb_gzfile_os_code(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipFile#orig_name
+ * Document-method: Zstdlib::GzipFile#orig_name
  *
  * Returns original filename recorded in the gzip file header, or +nil+ if
  * original filename is not present.
@@ -3177,7 +3191,7 @@ rb_gzfile_orig_name(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipFile#comment
+ * Document-method: Zstdlib::GzipFile#comment
  *
  * Returns comments recorded in the gzip file header, or nil if the comments
  * is not present.
@@ -3194,7 +3208,7 @@ rb_gzfile_comment(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipFile#lineno
+ * Document-method: Zstdlib::GzipFile#lineno
  *
  * The line number of the last row read from this file.
  */
@@ -3205,7 +3219,7 @@ rb_gzfile_lineno(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#lineno=
+ * Document-method: Zstdlib::GzipReader#lineno=
  *
  * Specify line number of the last row read from this file.
  */
@@ -3218,7 +3232,7 @@ rb_gzfile_set_lineno(VALUE obj, VALUE lineno)
 }
 
 /*
- * Document-method: Zlib::GzipWriter#mtime=
+ * Document-method: Zstdlib::GzipWriter#mtime=
  *
  * Specify the modification time (+mtime+) in the gzip header.
  * Using a Fixnum or Integer
@@ -3240,7 +3254,7 @@ rb_gzfile_set_mtime(VALUE obj, VALUE mtime)
 }
 
 /*
- * Document-method: Zlib::GzipFile#orig_name=
+ * Document-method: Zstdlib::GzipFile#orig_name=
  *
  * Specify the original name (+str+) in the gzip header.
  */
@@ -3264,7 +3278,7 @@ rb_gzfile_set_orig_name(VALUE obj, VALUE str)
 }
 
 /*
- * Document-method: Zlib::GzipFile#comment=
+ * Document-method: Zstdlib::GzipFile#comment=
  *
  * Specify the comment (+str+) in the gzip header.
  */
@@ -3288,7 +3302,7 @@ rb_gzfile_set_comment(VALUE obj, VALUE str)
 }
 
 /*
- * Document-method: Zlib::GzipFile#close
+ * Document-method: Zstdlib::GzipFile#close
  *
  * Closes the GzipFile object. This method calls close method of the
  * associated IO object. Returns the associated IO object.
@@ -3309,9 +3323,9 @@ rb_gzfile_close(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipFile#finish
+ * Document-method: Zstdlib::GzipFile#finish
  *
- * Closes the GzipFile object. Unlike Zlib::GzipFile#close, this method never
+ * Closes the GzipFile object. Unlike Zstdlib::GzipFile#close, this method never
  * calls the close method of the associated IO object. Returns the associated IO
  * object.
  */
@@ -3327,7 +3341,7 @@ rb_gzfile_finish(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipFile#closed?
+ * Document-method: Zstdlib::GzipFile#closed?
  *
  * Same as IO#closed?
  *
@@ -3341,7 +3355,7 @@ rb_gzfile_closed_p(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipFile#eof?
+ * Document-method: Zstdlib::GzipFile#eof?
  *
  * Returns +true+ or +false+ whether the stream has reached the end.
  */
@@ -3353,7 +3367,7 @@ rb_gzfile_eof_p(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipFile#sync
+ * Document-method: Zstdlib::GzipFile#sync
  *
  * Same as IO#sync
  *
@@ -3365,7 +3379,7 @@ rb_gzfile_sync(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipFile#sync=
+ * Document-method: Zstdlib::GzipFile#sync=
  *
  * call-seq: sync = flag
  *
@@ -3388,7 +3402,7 @@ rb_gzfile_set_sync(VALUE obj, VALUE mode)
 }
 
 /*
- * Document-method: Zlib::GzipFile#total_in
+ * Document-method: Zstdlib::GzipFile#total_in
  *
  * Total number of input bytes read so far.
  */
@@ -3399,7 +3413,7 @@ rb_gzfile_total_in(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipFile#total_out
+ * Document-method: Zstdlib::GzipFile#total_out
  *
  * Total number of output bytes output so far.
  */
@@ -3418,7 +3432,7 @@ rb_gzfile_total_out(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipFile#path
+ * Document-method: Zstdlib::GzipFile#path
  *
  * call-seq: path
  *
@@ -3450,19 +3464,19 @@ rb_gzfile_ecopts(struct gzfile *gz, VALUE opts)
 /* ------------------------------------------------------------------------- */
 
 /*
- * Document-class: Zlib::GzipWriter
+ * Document-class: Zstdlib::GzipWriter
  *
- * Zlib::GzipWriter is a class for writing gzipped files.  GzipWriter should
+ * Zstdlib::GzipWriter is a class for writing gzipped files.  GzipWriter should
  * be used with an instance of IO, or IO-like, object.
  *
  * Following two example generate the same result.
  *
- *   Zlib::GzipWriter.open('hoge.gz') do |gz|
+ *   Zstdlib::GzipWriter.open('hoge.gz') do |gz|
  *     gz.write 'jugemu jugemu gokou no surikire...'
  *   end
  *
  *   File.open('hoge.gz', 'w') do |f|
- *     gz = Zlib::GzipWriter.new(f)
+ *     gz = Zstdlib::GzipWriter.new(f)
  *     gz.write 'jugemu jugemu gokou no surikire...'
  *     gz.close
  *   end
@@ -3470,14 +3484,14 @@ rb_gzfile_ecopts(struct gzfile *gz, VALUE opts)
  * To make like gzip(1) does, run following:
  *
  *   orig = 'hoge.txt'
- *   Zlib::GzipWriter.open('hoge.gz') do |gz|
+ *   Zstdlib::GzipWriter.open('hoge.gz') do |gz|
  *     gz.mtime = File.mtime(orig)
  *     gz.orig_name = orig
  *     gz.write IO.binread(orig)
  *   end
  *
  * NOTE: Due to the limitation of Ruby's finalizer, you must explicitly close
- * GzipWriter objects by Zlib::GzipWriter#close etc.  Otherwise, GzipWriter
+ * GzipWriter objects by Zstdlib::GzipWriter#close etc.  Otherwise, GzipWriter
  * will be not able to write the gzip footer and will generate a broken gzip
  * file.
  */
@@ -3489,11 +3503,11 @@ rb_gzwriter_s_allocate(VALUE klass)
 }
 
 /*
- * call-seq: Zlib::GzipWriter.open(filename, level=nil, strategy=nil) { |gz| ... }
+ * call-seq: Zstdlib::GzipWriter.open(filename, level=nil, strategy=nil) { |gz| ... }
  *
  * Opens a file specified by +filename+ for writing gzip compressed data, and
  * returns a GzipWriter object associated with that file.  Further details of
- * this method are found in Zlib::GzipWriter.new and Zlib::GzipFile.wrap.
+ * this method are found in Zstdlib::GzipWriter.new and Zstdlib::GzipFile.wrap.
  */
 static VALUE
 rb_gzwriter_s_open(int argc, VALUE *argv, VALUE klass)
@@ -3503,10 +3517,10 @@ rb_gzwriter_s_open(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *   Zlib::GzipWriter.new(io, level = nil, strategy = nil, options = {})
+ *   Zstdlib::GzipWriter.new(io, level = nil, strategy = nil, options = {})
  *
  * Creates a GzipWriter object associated with +io+. +level+ and +strategy+
- * should be the same as the arguments of Zlib::Deflate.new.  The GzipWriter
+ * should be the same as the arguments of Zstdlib::Deflate.new.  The GzipWriter
  * object writes gzipped data to +io+.  +io+ must respond to the
  * +write+ method that behaves the same as IO#write.
  *
@@ -3552,8 +3566,8 @@ rb_gzwriter_initialize(int argc, VALUE *argv, VALUE obj)
  * call-seq: flush(flush=nil)
  *
  * Flushes all the internal buffers of the GzipWriter object.  The meaning of
- * +flush+ is same as in Zlib::Deflate#deflate.  <tt>Zlib::SYNC_FLUSH</tt> is used if
- * +flush+ is omitted.  It is no use giving flush <tt>Zlib::NO_FLUSH</tt>.
+ * +flush+ is same as in Zstdlib::Deflate#deflate.  <tt>Zstdlib::SYNC_FLUSH</tt> is used if
+ * +flush+ is omitted.  It is no use giving flush <tt>Zstdlib::NO_FLUSH</tt>.
  */
 static VALUE
 rb_gzwriter_flush(int argc, VALUE *argv, VALUE obj)
@@ -3634,25 +3648,25 @@ rb_gzwriter_putc(VALUE obj, VALUE ch)
 /* ------------------------------------------------------------------------- */
 
 /*
- * Document-class: Zlib::GzipReader
+ * Document-class: Zstdlib::GzipReader
  *
- * Zlib::GzipReader is the class for reading a gzipped file.  GzipReader should
+ * Zstdlib::GzipReader is the class for reading a gzipped file.  GzipReader should
  * be used as an IO, or -IO-like, object.
  *
- *   Zlib::GzipReader.open('hoge.gz') {|gz|
+ *   Zstdlib::GzipReader.open('hoge.gz') {|gz|
  *     print gz.read
  *   }
  *
  *   File.open('hoge.gz') do |f|
- *     gz = Zlib::GzipReader.new(f)
+ *     gz = Zstdlib::GzipReader.new(f)
  *     print gz.read
  *     gz.close
  *   end
  *
  * == Method Catalogue
  *
- * The following methods in Zlib::GzipReader are just like their counterparts
- * in IO, but they raise Zlib::Error or Zlib::GzipFile::Error exception if an
+ * The following methods in Zstdlib::GzipReader are just like their counterparts
+ * in IO, but they raise Zstdlib::Error or Zstdlib::GzipFile::Error exception if an
  * error was found in the gzip file.
  * - #each
  * - #each_line
@@ -3670,15 +3684,15 @@ rb_gzwriter_putc(VALUE obj, VALUE ch)
  * Be careful of the footer of the gzip file. A gzip file has the checksum of
  * pre-compressed data in its footer. GzipReader checks all uncompressed data
  * against that checksum at the following cases, and if it fails, raises
- * <tt>Zlib::GzipFile::NoFooter</tt>, <tt>Zlib::GzipFile::CRCError</tt>, or
- * <tt>Zlib::GzipFile::LengthError</tt> exception.
+ * <tt>Zstdlib::GzipFile::NoFooter</tt>, <tt>Zstdlib::GzipFile::CRCError</tt>, or
+ * <tt>Zstdlib::GzipFile::LengthError</tt> exception.
  *
  * - When an reading request is received beyond the end of file (the end of
- *   compressed data). That is, when Zlib::GzipReader#read,
- *   Zlib::GzipReader#gets, or some other methods for reading returns nil.
- * - When Zlib::GzipFile#close method is called after the object reaches the
+ *   compressed data). That is, when Zstdlib::GzipReader#read,
+ *   Zstdlib::GzipReader#gets, or some other methods for reading returns nil.
+ * - When Zstdlib::GzipFile#close method is called after the object reaches the
  *   end of file.
- * - When Zlib::GzipReader#unused method is called after the object reaches
+ * - When Zstdlib::GzipReader#unused method is called after the object reaches
  *   the end of file.
  *
  * The rest of the methods are adequately described in their own
@@ -3692,13 +3706,13 @@ rb_gzreader_s_allocate(VALUE klass)
 }
 
 /*
- * Document-method: Zlib::GzipReader.open
+ * Document-method: Zstdlib::GzipReader.open
  *
- * call-seq: Zlib::GzipReader.open(filename) {|gz| ... }
+ * call-seq: Zstdlib::GzipReader.open(filename) {|gz| ... }
  *
  * Opens a file specified by +filename+ as a gzipped file, and returns a
  * GzipReader object associated with that file.  Further details of this method
- * are in Zlib::GzipReader.new and ZLib::GzipFile.wrap.
+ * are in Zstdlib::GzipReader.new and ZLib::GzipFile.wrap.
  */
 static VALUE
 rb_gzreader_s_open(int argc, VALUE *argv, VALUE klass)
@@ -3707,10 +3721,10 @@ rb_gzreader_s_open(int argc, VALUE *argv, VALUE klass)
 }
 
 /*
- * Document-method: Zlib::GzipReader.new
+ * Document-method: Zstdlib::GzipReader.new
  *
  * call-seq:
- *   Zlib::GzipReader.new(io, options = {})
+ *   Zstdlib::GzipReader.new(io, options = {})
  *
  * Creates a GzipReader object associated with +io+. The GzipReader object reads
  * gzipped data from +io+, and parses/decompresses it.  The +io+ must
@@ -3720,7 +3734,7 @@ rb_gzreader_s_open(int argc, VALUE *argv, VALUE klass)
  * +:external_encoding+, +:internal_encoding+ and +:encoding+ may be set as in
  * IO::new.
  *
- * If the gzip file header is incorrect, raises an Zlib::GzipFile::Error
+ * If the gzip file header is incorrect, raises an Zstdlib::GzipFile::Error
  * exception.
  */
 static VALUE
@@ -3752,7 +3766,7 @@ rb_gzreader_initialize(int argc, VALUE *argv, VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#rewind
+ * Document-method: Zstdlib::GzipReader#rewind
  *
  * Resets the position of the file pointer to the point created the GzipReader
  * object.  The associated IO object needs to respond to the +seek+ method.
@@ -3766,7 +3780,7 @@ rb_gzreader_rewind(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#unused
+ * Document-method: Zstdlib::GzipReader#unused
  *
  * Returns the rest of the data which had read for parsing gzip format, or
  * +nil+ if the whole gzip file is not parsed yet.
@@ -3780,9 +3794,9 @@ rb_gzreader_unused(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#read
+ * Document-method: Zstdlib::GzipReader#read
  *
- * See Zlib::GzipReader documentation for a description.
+ * See Zstdlib::GzipReader documentation for a description.
  */
 static VALUE
 rb_gzreader_read(int argc, VALUE *argv, VALUE obj)
@@ -3804,7 +3818,7 @@ rb_gzreader_read(int argc, VALUE *argv, VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#readpartial
+ * Document-method: Zstdlib::GzipReader#readpartial
  *
  *  call-seq:
  *     gzipreader.readpartial(maxlen [, outbuf]) => string, outbuf
@@ -3834,9 +3848,9 @@ rb_gzreader_readpartial(int argc, VALUE *argv, VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#getc
+ * Document-method: Zstdlib::GzipReader#getc
  *
- * See Zlib::GzipReader documentation for a description.
+ * See Zstdlib::GzipReader documentation for a description.
  */
 static VALUE
 rb_gzreader_getc(VALUE obj)
@@ -3847,9 +3861,9 @@ rb_gzreader_getc(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#readchar
+ * Document-method: Zstdlib::GzipReader#readchar
  *
- * See Zlib::GzipReader documentation for a description.
+ * See Zstdlib::GzipReader documentation for a description.
  */
 static VALUE
 rb_gzreader_readchar(VALUE obj)
@@ -3863,9 +3877,9 @@ rb_gzreader_readchar(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#getbyte
+ * Document-method: Zstdlib::GzipReader#getbyte
  *
- * See Zlib::GzipReader documentation for a description.
+ * See Zstdlib::GzipReader documentation for a description.
  */
 static VALUE
 rb_gzreader_getbyte(VALUE obj)
@@ -3881,9 +3895,9 @@ rb_gzreader_getbyte(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#readbyte
+ * Document-method: Zstdlib::GzipReader#readbyte
  *
- * See Zlib::GzipReader documentation for a description.
+ * See Zstdlib::GzipReader documentation for a description.
  */
 static VALUE
 rb_gzreader_readbyte(VALUE obj)
@@ -3897,9 +3911,9 @@ rb_gzreader_readbyte(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#each_char
+ * Document-method: Zstdlib::GzipReader#each_char
  *
- * See Zlib::GzipReader documentation for a description.
+ * See Zstdlib::GzipReader documentation for a description.
  */
 static VALUE
 rb_gzreader_each_char(VALUE obj)
@@ -3915,9 +3929,9 @@ rb_gzreader_each_char(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#each_byte
+ * Document-method: Zstdlib::GzipReader#each_byte
  *
- * See Zlib::GzipReader documentation for a description.
+ * See Zstdlib::GzipReader documentation for a description.
  */
 static VALUE
 rb_gzreader_each_byte(VALUE obj)
@@ -3933,23 +3947,23 @@ rb_gzreader_each_byte(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#bytes
+ * Document-method: Zstdlib::GzipReader#bytes
  *
  *  This is a deprecated alias for <code>each_byte</code>.
  */
 static VALUE
 rb_gzreader_bytes(VALUE obj)
 {
-    rb_warn("Zlib::GzipReader#bytes is deprecated; use #each_byte instead");
+    rb_warn("Zstdlib::GzipReader#bytes is deprecated; use #each_byte instead");
     if (!rb_block_given_p())
 	return rb_enumeratorize(obj, ID2SYM(rb_intern("each_byte")), 0, 0);
     return rb_gzreader_each_byte(obj);
 }
 
 /*
- * Document-method: Zlib::GzipReader#ungetc
+ * Document-method: Zstdlib::GzipReader#ungetc
  *
- * See Zlib::GzipReader documentation for a description.
+ * See Zstdlib::GzipReader documentation for a description.
  */
 static VALUE
 rb_gzreader_ungetc(VALUE obj, VALUE s)
@@ -3969,9 +3983,9 @@ rb_gzreader_ungetc(VALUE obj, VALUE s)
 }
 
 /*
- * Document-method: Zlib::GzipReader#ungetbyte
+ * Document-method: Zstdlib::GzipReader#ungetbyte
  *
- * See Zlib::GzipReader documentation for a description.
+ * See Zstdlib::GzipReader documentation for a description.
  */
 static VALUE
 rb_gzreader_ungetbyte(VALUE obj, VALUE ch)
@@ -4169,9 +4183,9 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#gets
+ * Document-method: Zstdlib::GzipReader#gets
  *
- * See Zlib::GzipReader documentation for a description.
+ * See Zstdlib::GzipReader documentation for a description.
  */
 static VALUE
 rb_gzreader_gets(int argc, VALUE *argv, VALUE obj)
@@ -4185,9 +4199,9 @@ rb_gzreader_gets(int argc, VALUE *argv, VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#readline
+ * Document-method: Zstdlib::GzipReader#readline
  *
- * See Zlib::GzipReader documentation for a description.
+ * See Zstdlib::GzipReader documentation for a description.
  */
 static VALUE
 rb_gzreader_readline(int argc, VALUE *argv, VALUE obj)
@@ -4201,9 +4215,9 @@ rb_gzreader_readline(int argc, VALUE *argv, VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#each
+ * Document-method: Zstdlib::GzipReader#each
  *
- * See Zlib::GzipReader documentation for a description.
+ * See Zstdlib::GzipReader documentation for a description.
  */
 static VALUE
 rb_gzreader_each(int argc, VALUE *argv, VALUE obj)
@@ -4219,23 +4233,23 @@ rb_gzreader_each(int argc, VALUE *argv, VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#lines
+ * Document-method: Zstdlib::GzipReader#lines
  *
  *  This is a deprecated alias for <code>each_line</code>.
  */
 static VALUE
 rb_gzreader_lines(int argc, VALUE *argv, VALUE obj)
 {
-    rb_warn("Zlib::GzipReader#lines is deprecated; use #each_line instead");
+    rb_warn("Zstdlib::GzipReader#lines is deprecated; use #each_line instead");
     if (!rb_block_given_p())
 	return rb_enumeratorize(obj, ID2SYM(rb_intern("each_line")), argc, argv);
     return rb_gzreader_each(argc, argv, obj);
 }
 
 /*
- * Document-method: Zlib::GzipReader#readlines
+ * Document-method: Zstdlib::GzipReader#readlines
  *
- * See Zlib::GzipReader documentation for a description.
+ * See Zstdlib::GzipReader documentation for a description.
  */
 static VALUE
 rb_gzreader_readlines(int argc, VALUE *argv, VALUE obj)
@@ -4249,9 +4263,9 @@ rb_gzreader_readlines(int argc, VALUE *argv, VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#external_encoding
+ * Document-method: Zstdlib::GzipReader#external_encoding
  *
- * See Zlib::GzipReader documentation for a description.
+ * See Zstdlib::GzipReader documentation for a description.
  */
 static VALUE
 rb_gzreader_external_encoding(VALUE self)
@@ -4262,14 +4276,14 @@ rb_gzreader_external_encoding(VALUE self)
 #endif /* GZIP_SUPPORT */
 
 void
-Init_zlib(void)
+Init_zstdlib(void)
 {
     VALUE mZlib, cZStream, cDeflate, cInflate;
 #if GZIP_SUPPORT
     VALUE cGzipFile, cGzipWriter, cGzipReader;
 #endif
 
-    mZlib = rb_define_module("Zlib");
+    mZlib = rb_define_module("Zstdlib");
 
     id_dictionaries = rb_intern("@dictionaries");
 
@@ -4293,6 +4307,8 @@ Init_zlib(void)
     rb_define_const(mZlib, "VERSION", rb_str_new2(RUBY_ZLIB_VERSION));
     /*  The string which represents the version of zlib.h */
     rb_define_const(mZlib, "ZLIB_VERSION", rb_str_new2(ZLIB_VERSION));
+  rb_define_const(mZlib, "ZSTD_VERSION", rb_str_new2(ZSTD_versionString())); 
+  rb_define_module_function(mZlib, "zstd_version", rb_zstd_version, 0);
 
     cZStream = rb_define_class_under(mZlib, "ZStream", rb_cObject);
     rb_undef_alloc_func(cZStream);
@@ -4316,7 +4332,7 @@ Init_zlib(void)
 
     /* Represents binary data as guessed by deflate.
      *
-     * See Zlib::Deflate#data_type. */
+     * See Zstdlib::Deflate#data_type. */
     rb_define_const(mZlib, "BINARY", INT2FIX(Z_BINARY));
 
     /* Represents text data as guessed by deflate.
@@ -4324,19 +4340,19 @@ Init_zlib(void)
      * NOTE: The underlying constant Z_ASCII was deprecated in favor of Z_TEXT
      * in zlib 1.2.2.  New applications should not use this constant.
      *
-     * See Zlib::Deflate#data_type. */
+     * See Zstdlib::Deflate#data_type. */
     rb_define_const(mZlib, "ASCII", INT2FIX(Z_ASCII));
 
 #ifdef Z_TEXT
     /* Represents text data as guessed by deflate.
      *
-     * See Zlib::Deflate#data_type. */
+     * See Zstdlib::Deflate#data_type. */
     rb_define_const(mZlib, "TEXT", INT2FIX(Z_TEXT));
 #endif
 
     /* Represents an unknown data type as guessed by deflate.
      *
-     * See Zlib::Deflate#data_type. */
+     * See Zstdlib::Deflate#data_type. */
     rb_define_const(mZlib, "UNKNOWN", INT2FIX(Z_UNKNOWN));
 
     cDeflate = rb_define_class_under(mZlib, "Deflate", cZStream);
@@ -4370,12 +4386,12 @@ Init_zlib(void)
     /* Fastest compression level, but with the lowest space savings. */
     rb_define_const(mZlib, "BEST_SPEED", INT2FIX(Z_BEST_SPEED));
     /* Slowest compression level, but with the best space savings. */
-    rb_define_const(mZlib, "BEST_COMPRESSION", INT2FIX(Z_BEST_COMPRESSION));
+    rb_define_const(mZlib, "BEST_COMPRESSION", INT2FIX(ZSTD_maxCLevel()));
     /* Default compression level which is a good trade-off between space and
      * time
      */
     rb_define_const(mZlib, "DEFAULT_COMPRESSION",
-		    INT2FIX(Z_DEFAULT_COMPRESSION));
+		    INT2FIX(ZSTD_CLEVEL_DEFAULT));
 
     /* Deflate strategy for data produced by a filter (or predictor). The
      * effect of FILTERED is to force more Huffman codes and less string
@@ -4406,7 +4422,7 @@ Init_zlib(void)
     rb_define_const(mZlib, "DEFAULT_STRATEGY", INT2FIX(Z_DEFAULT_STRATEGY));
 
     /* The maximum size of the zlib history buffer.  Note that zlib allows
-     * larger values to enable different inflate modes.  See Zlib::Inflate.new
+     * larger values to enable different inflate modes.  See Zstdlib::Inflate.new
      * for details.
      */
     rb_define_const(mZlib, "MAX_WBITS", INT2FIX(MAX_WBITS));
@@ -4568,28 +4584,28 @@ Init_zlib(void)
 /* Document error classes. */
 
 /*
- * Document-class: Zlib::Error
+ * Document-class: Zstdlib::Error
  *
  * The superclass for all exceptions raised by Ruby/zlib.
  *
- * The following exceptions are defined as subclasses of Zlib::Error. These
+ * The following exceptions are defined as subclasses of Zstdlib::Error. These
  * exceptions are raised when zlib library functions return with an error
  * status.
  *
- * - Zlib::StreamEnd
- * - Zlib::NeedDict
- * - Zlib::DataError
- * - Zlib::StreamError
- * - Zlib::MemError
- * - Zlib::BufError
- * - Zlib::VersionError
+ * - Zstdlib::StreamEnd
+ * - Zstdlib::NeedDict
+ * - Zstdlib::DataError
+ * - Zstdlib::StreamError
+ * - Zstdlib::MemError
+ * - Zstdlib::BufError
+ * - Zstdlib::VersionError
  *
  */
 
 /*
- * Document-class: Zlib::StreamEnd
+ * Document-class: Zstdlib::StreamEnd
  *
- * Subclass of Zlib::Error
+ * Subclass of Zstdlib::Error
  *
  * When zlib returns a Z_STREAM_END
  * is return if the end of the compressed data has been reached
@@ -4598,20 +4614,20 @@ Init_zlib(void)
  */
 
 /*
- * Document-class: Zlib::NeedDict
+ * Document-class: Zstdlib::NeedDict
  *
- * Subclass of Zlib::Error
+ * Subclass of Zstdlib::Error
  *
  * When zlib returns a Z_NEED_DICT
  * if a preset dictionary is needed at this point.
  *
- * Used by Zlib::Inflate.inflate and <tt>Zlib.inflate</tt>
+ * Used by Zstdlib::Inflate.inflate and <tt>Zstdlib.inflate</tt>
  */
 
 /*
- * Document-class: Zlib::VersionError
+ * Document-class: Zstdlib::VersionError
  *
- * Subclass of Zlib::Error
+ * Subclass of Zstdlib::Error
  *
  * When zlib returns a Z_VERSION_ERROR,
  * usually if the zlib library version is incompatible with the
@@ -4620,9 +4636,9 @@ Init_zlib(void)
  */
 
 /*
- * Document-class: Zlib::MemError
+ * Document-class: Zstdlib::MemError
  *
- * Subclass of Zlib::Error
+ * Subclass of Zstdlib::Error
  *
  * When zlib returns a Z_MEM_ERROR,
  * usually if there was not enough memory.
@@ -4630,9 +4646,9 @@ Init_zlib(void)
  */
 
 /*
- * Document-class: Zlib::StreamError
+ * Document-class: Zstdlib::StreamError
  *
- * Subclass of Zlib::Error
+ * Subclass of Zstdlib::Error
  *
  * When zlib returns a Z_STREAM_ERROR,
  * usually if the stream state was inconsistent.
@@ -4640,44 +4656,44 @@ Init_zlib(void)
  */
 
 /*
- * Document-class: Zlib::BufError
+ * Document-class: Zstdlib::BufError
  *
- * Subclass of Zlib::Error when zlib returns a Z_BUF_ERROR.
+ * Subclass of Zstdlib::Error when zlib returns a Z_BUF_ERROR.
  *
  * Usually if no progress is possible.
  *
  */
 
 /*
- * Document-class: Zlib::DataError
+ * Document-class: Zstdlib::DataError
  *
- * Subclass of Zlib::Error when zlib returns a Z_DATA_ERROR.
+ * Subclass of Zstdlib::Error when zlib returns a Z_DATA_ERROR.
  *
  * Usually if a stream was prematurely freed.
  *
  */
 
 /*
- * Document-class: Zlib::GzipFile::Error
+ * Document-class: Zstdlib::GzipFile::Error
  *
  * Base class of errors that occur when processing GZIP files.
  */
 
 /*
- * Document-class: Zlib::GzipFile::NoFooter
+ * Document-class: Zstdlib::GzipFile::NoFooter
  *
  * Raised when gzip file footer is not found.
  */
 
 /*
- * Document-class: Zlib::GzipFile::CRCError
+ * Document-class: Zstdlib::GzipFile::CRCError
  *
  * Raised when the CRC checksum recorded in gzip file footer is not equivalent
  * to the CRC checksum of the actual uncompressed data.
  */
 
 /*
- * Document-class: Zlib::GzipFile::LengthError
+ * Document-class: Zstdlib::GzipFile::LengthError
  *
  * Raised when the data length recorded in the gzip file footer is not equivalent
  * to the length of the actual uncompressed data.