svn commit: r351500 - vendor/zlib/dist

[Xin LI]

Author: delphij
Date: Sun Aug 25 23:51:44 2019
New Revision: 351500
URL: https://svnweb.freebsd.org/changeset/base/351500

Log:
  Import vendor commit 38e8ce32afbaa82f67d992b9f3056f281fe69259:
    Author: Mark Adler <madler at alumni.caltech.edu>
    Date:   Sun Jan 22 23:38:52 2017 -0800
  
      Fix CLEAR_HASH macro to be usable as a single statement.
  
      As it is used in deflateParams().

Modified:
  vendor/zlib/dist/deflate.c

Modified: vendor/zlib/dist/deflate.c
==============================================================================
--- vendor/zlib/dist/deflate.c	Sun Aug 25 22:30:18 2019	(r351499)
+++ vendor/zlib/dist/deflate.c	Sun Aug 25 23:51:44 2019	(r351500)
@@ -190,8 +190,11 @@ local const config configuration_table[10] = {
  * prev[] will be initialized on the fly.
  */
 #define CLEAR_HASH(s) \
-    s->head[s->hash_size-1] = NIL; \
-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+    do { \
+        s->head[s->hash_size-1] = NIL; \
+        zmemzero((Bytef *)s->head, \
+                 (unsigned)(s->hash_size-1)*sizeof(*s->head)); \
+    } while (0)
 
 /* ===========================================================================
  * Slide the hash table when sliding the window down (could be avoided with 32