Move Tracevv statements when emitting literal to zng_tr_tally_lit.

diff --git a/deflate.c b/deflate.c
index 2a32c9175e3dcef64b0779c9bf727f4d84cc01e0..ea9bd0545bb1eb68630419b270366672f23b0cdb 100644 (file)
--- a/deflate.c
+++ b/deflate.c
@@ -1602,7 +1602,6 @@ static block_state deflate_rle(deflate_state *s, int flush) {
             s->match_length = 0;
         } else {
             /* No match, output a literal byte */
-            Tracevv((stderr, "%c", s->window[s->strstart]));
             bflush = zng_tr_tally_lit(s, s->window[s->strstart]);
             s->lookahead--;
             s->strstart++;
@@ -1640,7 +1639,6 @@ static block_state deflate_huff(deflate_state *s, int flush) {
 
         /* Output a literal byte */
         s->match_length = 0;
-        Tracevv((stderr, "%c", s->window[s->strstart]));
         bflush = zng_tr_tally_lit(s, s->window[s->strstart]);
         s->lookahead--;
         s->strstart++;

diff --git a/deflate_fast.c b/deflate_fast.c
index e9227be41bd91c00f2627d49ff8609ab32c840ee..92a091f7f8cd5915a6fa79e385138c15c8ae356a 100644 (file)
--- a/deflate_fast.c
+++ b/deflate_fast.c
@@ -85,7 +85,6 @@ ZLIB_INTERNAL block_state deflate_fast(deflate_state *s, int flush) {
             }
         } else {
             /* No match, output a literal byte */
-            Tracevv((stderr, "%c", s->window[s->strstart]));
             bflush = zng_tr_tally_lit(s, s->window[s->strstart]);
             s->lookahead--;
             s->strstart++;

diff --git a/deflate_p.h b/deflate_p.h
index e9e6479303a951cdbde551b26c239cd11c5097ca..aaa9c978d8fb21145b5387e43778a1474a979e71 100644 (file)
--- a/deflate_p.h
+++ b/deflate_p.h
@@ -32,6 +32,7 @@ static inline int zng_tr_tally_lit(deflate_state *s, unsigned char c) {
     s->sym_buf[s->sym_next++] = 0;
     s->sym_buf[s->sym_next++] = c;
     s->dyn_ltree[c].Freq++;
+    Tracevv((stderr, "%c", c));
     Assert(c <= (MAX_MATCH-MIN_MATCH), "zng_tr_tally: bad literal");
     return (s->sym_next == s->sym_end);
 }

diff --git a/deflate_slow.c b/deflate_slow.c
index 4f9a39a40cd69e6b94fb9b82dfced7cbd401ad28..0f7f86b5ad6ebee71b6f795521979805503652ef 100644 (file)
--- a/deflate_slow.c
+++ b/deflate_slow.c
@@ -101,7 +101,6 @@ ZLIB_INTERNAL block_state deflate_slow(deflate_state *s, int flush) {
              * single literal. If there was a match but the current match
              * is longer, truncate the previous match to a single literal.
              */
-            Tracevv((stderr, "%c", s->window[s->strstart-1]));
             bflush = zng_tr_tally_lit(s, s->window[s->strstart-1]);
             if (bflush)
                 FLUSH_BLOCK_ONLY(s, 0);
@@ -120,7 +119,6 @@ ZLIB_INTERNAL block_state deflate_slow(deflate_state *s, int flush) {
     }
     Assert(flush != Z_NO_FLUSH, "no flush?");
     if (s->match_available) {
-        Tracevv((stderr, "%c", s->window[s->strstart-1]));
         bflush = zng_tr_tally_lit(s, s->window[s->strstart-1]);
         s->match_available = 0;
     }