Merge branch 'zstd-set-pledged-input-size' of github.com:emmatyping/cpython into zstd-set-pledged-input-size

Author: emmatyping

Doc/library/compression.zstd.rst

@@ -260,11 +260,11 @@ Compressing and decompressing data in memory
       If :attr:`last_mode` is not :attr:`FLUSH_FRAME`, a
       :exc:`ValueError` is raised as the compressor is not at the start of
       a frame. If the pledged size does not match the actual size of data
-      provided to :meth:`~.compress`, future calls to :meth:`~.compress` or
+      provided to :meth:`.compress`, future calls to :meth:`!compress` or
       :meth:`flush` may raise :exc:`ZstdError` and the last chunk of data may
       be lost.
 
-      After :meth:`flush` or :meth:`~.compress` are called with mode
+      After :meth:`flush` or :meth:`.compress` are called with mode
       :attr:`FLUSH_FRAME`, the next frame will not include the frame size into
       the header unless :meth:`!set_pledged_input_size` is called again.
 
@@ -648,7 +648,7 @@ Advanced parameter control
       Write the size of the data to be compressed into the Zstandard frame
       header when known prior to compressing.
 
-      This flag only takes effect under the following three scenarios:
+      This flag only takes effect under the following scenarios:
 
       * Calling :func:`compress` for one-shot compression
       * Providing all of the data to be compressed in the frame in a single

Modules/_zstd/compressor.c

@@ -747,8 +747,8 @@ _zstd.ZstdCompressor.set_pledged_input_size
 Set the uncompressed content size to be written into the frame header.
 
 This method can be used to ensure the header of the frame about to be written
-includes the size of the data, unless CompressionParameter.content_size_flag is
-set to False. If last_mode != FLUSH_FRAME, then a RuntimeError is raised.
+includes the size of the data, unless the CompressionParameter.content_size_flag
+is set to False. If last_mode != FLUSH_FRAME, then a RuntimeError is raised.
 
 It is important to ensure that the pledged data size matches the actual data
 size. If they do not match the compressed output data may be corrupted and the
@@ -760,8 +760,6 @@ _zstd_ZstdCompressor_set_pledged_input_size_impl(ZstdCompressor *self,
                                                  unsigned long long size)
 /*[clinic end generated code: output=3a09e55cc0e3b4f9 input=563b9a1ddd4facc3]*/
 {
-    size_t zstd_ret;
-
     // Error occured while converting argument, should be unreachable
     assert(size != ZSTD_CONTENTSIZE_ERROR);
 
@@ -778,7 +776,7 @@ _zstd_ZstdCompressor_set_pledged_input_size_impl(ZstdCompressor *self,
     }
 
     /* Set pledged content size */
-    zstd_ret = ZSTD_CCtx_setPledgedSrcSize(self->cctx, size);
+    size_t zstd_ret = ZSTD_CCtx_setPledgedSrcSize(self->cctx, size);
     PyMutex_Unlock(&self->lock);
     if (ZSTD_isError(zstd_ret)) {
         _zstd_state* mod_state = PyType_GetModuleState(Py_TYPE(self));