From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 13 Aug 2013 15:00:58 +0000 (-0700)
Subject: * decompress.c (Fzlib_decompress_region): Try to clarify 'avail_out'.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~278
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=53b64418c20b6288e0e3a589b61db47861a575b6;p=emacs.git

* decompress.c (Fzlib_decompress_region): Try to clarify 'avail_out'.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index dabc6241967..0c8de046034 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* decompress.c (Fzlib_decompress_region): Try to clarify 'avail_out'.
+
 2013-08-13  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	* window.h (struct window): Convert left_margin_cols and
diff --git a/src/decompress.c b/src/decompress.c
index a09033ab8c3..b7cd8a6c404 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -26,6 +26,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "character.h"
 #include "buffer.h"
 
+#include <verify.h>
+
 static Lisp_Object Qzlib_dll;
 
 #ifdef WINDOWSNT
@@ -178,10 +180,11 @@ This function can be called only in unibyte buffers.  */)
   do
     {
       /* Maximum number of bytes that one 'inflate' call should read and write.
-	 zlib requires that these values not exceed UINT_MAX.
-	 Do not make avail_out too large, as that might unduly delay C-g.  */
+	 Do not make avail_out too large, as that might unduly delay C-g.
+	 In any case zlib requires that these values not exceed UINT_MAX.  */
       ptrdiff_t avail_in = min (iend - pos_byte, UINT_MAX);
-      ptrdiff_t avail_out = min (1 << 14, UINT_MAX);
+      enum { avail_out = 1 << 14 };
+      verify (avail_out <= UINT_MAX);
 
       ptrdiff_t decompressed;