patch-2.3.36 linux/fs/cramfs/inflate/infblock.c

Next file: linux/fs/cramfs/inflate/infcodes.c
Previous file: linux/fs/cramfs/inflate/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.35/linux/fs/cramfs/inflate/infblock.c linux/fs/cramfs/inflate/infblock.c
@@ -80,7 +80,6 @@
   s->read = s->write = s->window;
   if (s->checkfn != Z_NULL)
     z->adler = s->check = (*s->checkfn)(0L, (const Bytef *)Z_NULL, 0);
-  Tracev((stderr, "inflate:   blocks reset\n"));
 }
 
 
@@ -100,7 +99,6 @@
   s->end = s->window + w;
   s->checkfn = c;
   s->mode = TYPE;
-  Tracev((stderr, "inflate:   blocks allocated\n"));
   inflate_blocks_reset(s, z, Z_NULL);
   return s;
 }
@@ -132,16 +130,12 @@
       switch (t >> 1)
       {
         case 0:                         /* stored */
-          Tracev((stderr, "inflate:     stored block%s\n",
-                 s->last ? " (last)" : ""));
           DUMPBITS(3)
           t = k & 7;                    /* go to byte boundary */
           DUMPBITS(t)
           s->mode = LENS;               /* get length of stored block */
           break;
         case 1:                         /* fixed */
-          Tracev((stderr, "inflate:     fixed codes block%s\n",
-                 s->last ? " (last)" : ""));
           {
             uInt bl, bd;
             inflate_huft *tl, *td;
@@ -158,8 +152,6 @@
           s->mode = CODES;
           break;
         case 2:                         /* dynamic */
-          Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                 s->last ? " (last)" : ""));
           DUMPBITS(3)
           s->mode = TABLE;
           break;
@@ -182,7 +174,6 @@
       }
       s->sub.left = (uInt)b & 0xffff;
       b = k = 0;                      /* dump bits */
-      Tracev((stderr, "inflate:       stored length %u\n", s->sub.left));
       s->mode = s->sub.left ? STORED : (s->last ? DRY : TYPE);
       break;
     case STORED:
@@ -197,9 +188,6 @@
       q += t;  m -= t;
       if ((s->sub.left -= t) != 0)
         break;
-      Tracev((stderr, "inflate:       stored end, %lu total out\n",
-              z->total_out + (q >= s->read ? q - s->read :
-              (s->end - s->read) + (q - s->window))));
       s->mode = s->last ? DRY : TYPE;
       break;
     case TABLE:
@@ -220,7 +208,6 @@
       }
       DUMPBITS(14)
       s->sub.trees.index = 0;
-      Tracev((stderr, "inflate:       table sizes ok\n"));
       s->mode = BTREE;
     case BTREE:
       while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10))
@@ -242,7 +229,6 @@
         LEAVE
       }
       s->sub.trees.index = 0;
-      Tracev((stderr, "inflate:       bits tree ok\n"));
       s->mode = DTREE;
     case DTREE:
       while (t = s->sub.trees.table,
@@ -305,7 +291,6 @@
           r = t;
           LEAVE
         }
-        Tracev((stderr, "inflate:       trees ok\n"));
         if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
         {
           r = Z_MEM_ERROR;
@@ -321,9 +306,6 @@
       r = Z_OK;
       inflate_codes_free(s->sub.decode.codes, z);
       LOAD
-      Tracev((stderr, "inflate:       codes end, %lu total out\n",
-              z->total_out + (q >= s->read ? q - s->read :
-              (s->end - s->read) + (q - s->window))));
       if (!s->last)
       {
         s->mode = TYPE;
@@ -353,7 +335,6 @@
 z_streamp z;
 {
   inflate_blocks_reset(s, z, Z_NULL);
-  Tracev((stderr, "inflate:   blocks freed\n"));
   return Z_OK;
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)