From d28d9e4506cd5f353766535f9d9460cb28eb9b72 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 27 Nov 2006 00:51:37 +0000 Subject: [PATCH] * inflate.c (inflate_dynamic, inflate): Don't send output to stderr unless DEBUG is defined and 'verbose'. Problem reported by Santiago Vila. --- ChangeLog | 4 ++++ inflate.c | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78d6ebb..b659f5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-11-26 Paul Eggert + * 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 222a103..e5aa0d8 100644 --- 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; } -- 2.47.2