emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r113845: * decompress.c (Fzlib_decompress_region): T


From: Paul Eggert
Subject: [Emacs-diffs] trunk r113845: * decompress.c (Fzlib_decompress_region): Try to clarify 'avail_out'.
Date: Tue, 13 Aug 2013 15:01:01 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 113845
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-13 08:00:58 -0700
message:
  * decompress.c (Fzlib_decompress_region): Try to clarify 'avail_out'.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/decompress.c               decompress.c-20130811194033-wfhl0tqmmc36jfmu-1
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-13 14:45:58 +0000
+++ b/src/ChangeLog     2013-08-13 15:00:58 +0000
@@ -1,3 +1,7 @@
+2013-08-13  Paul Eggert  <address@hidden>
+
+       * decompress.c (Fzlib_decompress_region): Try to clarify 'avail_out'.
+
 2013-08-13  Dmitry Antipov  <address@hidden>
 
        * window.h (struct window): Convert left_margin_cols and

=== modified file 'src/decompress.c'
--- a/src/decompress.c  2013-08-12 19:48:04 +0000
+++ b/src/decompress.c  2013-08-13 15:00:58 +0000
@@ -26,6 +26,8 @@
 #include "character.h"
 #include "buffer.h"
 
+#include <verify.h>
+
 static Lisp_Object Qzlib_dll;
 
 #ifdef WINDOWSNT
@@ -178,10 +180,11 @@
   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;
 


reply via email to

[Prev in Thread] Current Thread [Next in Thread]