* inflate.c (inflate_dynamic, inflate): Don't send output to

stderr unless DEBUG is defined and 'verbose'.  Problem reported by
Santiago Vila.

diff --git a/ChangeLog b/ChangeLog
index 78d6ebbf61387caaffb0290438bbc6dd4c0322c7..b659f5f095e2a487caceb14ed5c7d2e38c709d6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-11-26  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * inflate.c (inflate_dynamic, inflate): Don't send output to
+       stderr unless DEBUG is defined and 'verbose'.  Problem reported by
+       Santiago Vila.
+
        * zgrep.in: If the file name contains newline, &, \, or |, escape
        the character so that 'sed' doesn't mishandle it as a replacement.
        Problem reported by Bdale Garbee.

diff --git a/inflate.c b/inflate.c
index 222a1032eea6d0db689dbeef6a1136292087d19c..e5aa0d812709452b9a73857a9ff105f31287cffe 100644 (file)
--- a/inflate.c
+++ b/inflate.c
@@ -856,7 +856,7 @@ int inflate_dynamic()
   if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0)
   {
     if (i == 1) {
-      fprintf(stderr, " incomplete literal tree\n");
+      Trace ((stderr, " incomplete literal tree\n"));
       huft_free(tl);
     }
     return i;                   /* incomplete code set */
@@ -865,7 +865,7 @@ int inflate_dynamic()
   if ((i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &td, &bd)) != 0)
   {
     if (i == 1) {
-      fprintf(stderr, " incomplete distance tree\n");
+      Trace ((stderr, " incomplete distance tree\n"));
 #ifdef PKZIP_BUG_WORKAROUND
       i = 0;
     }
@@ -976,8 +976,6 @@ int inflate()
 
 
   /* return success */
-#ifdef DEBUG
-  fprintf(stderr, "<%u> ", h);
-#endif /* DEBUG */
+  Trace ((stderr, "<%u> ", h));
   return 0;
 }