Permit Z_NULL arguments to deflatePending.

This avoids having to create useless variables for return values
that aren't needed.

diff --git a/deflate.c b/deflate.c
index 159e665e1fe10369f63c5a364996a0406b7349cb..eed6ed80383e4fb374eb632443edf84bdd510ce5 100644 (file)
--- a/deflate.c
+++ b/deflate.c
@@ -451,8 +451,10 @@ int ZEXPORT deflatePending (strm, pending, bits)
     z_streamp strm;
 {
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    *pending = strm->state->pending;
-    *bits = strm->state->bi_valid;
+    if (pending != Z_NULL)
+        *pending = strm->state->pending;
+    if (bits != Z_NULL)
+        *bits = strm->state->bi_valid;
     return Z_OK;
 }
 

diff --git a/zlib.h b/zlib.h
index 9ca20d73f5d3dacd8aba0697a41e0bf49049deda..20e13dbc982fd551d1d29e8112472ca78e0bb056 100644 (file)
--- a/zlib.h
+++ b/zlib.h
@@ -715,7 +715,8 @@ ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
    been generated, but not yet provided in the available output.  The bytes not
    provided would be due to the available output space having being consumed.
    The number of bits of output not provided are between 0 and 7, where they
-   await more bits to join them in order to fill out a full byte.
+   await more bits to join them in order to fill out a full byte.  If pending
+   or bits are Z_NULL, then those values are not set.
 
      deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent.