avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/bzip2/src/java/org/apache/avalon/excalibur/bzip2 CBZip2OutputStream.java
Date Sun, 24 Mar 2002 07:11:28 GMT
donaldp     02/03/23 23:11:28

  Modified:    bzip2/src/java/org/apache/avalon/excalibur/bzip2
                        CBZip2OutputStream.java
  Log:
  Zap some variables that were unused
  
  Revision  Changes    Path
  1.2       +0 -29     jakarta-avalon-excalibur/bzip2/src/java/org/apache/avalon/excalibur/bzip2/CBZip2OutputStream.java
  
  Index: CBZip2OutputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/bzip2/src/java/org/apache/avalon/excalibur/bzip2/CBZip2OutputStream.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CBZip2OutputStream.java	24 Mar 2002 07:02:31 -0000	1.1
  +++ CBZip2OutputStream.java	24 Mar 2002 07:11:28 -0000	1.2
  @@ -80,9 +80,6 @@
       private int m_bsBuff;
       private int m_bsLive;
   
  -    private int m_bytesIn;
  -    private int m_bytesOut;
  -
       /*
        * index of the last char in the block, so
        * the block size == last + 1.
  @@ -104,7 +101,6 @@
       private OutputStream m_bsStream;
       private boolean m_firstAttempt;
       private int[] m_ftab;
  -    private int m_nBlocksRandomised;
       private int m_nInUse;
   
       private int m_nMTF;
  @@ -482,7 +478,6 @@
               }
               m_bsBuff <<= 8;
               m_bsLive -= 8;
  -            m_bytesOut++;
           }
       }
   
  @@ -512,8 +507,6 @@
           m_bsStream = f;
           m_bsLive = 0;
           m_bsBuff = 0;
  -        m_bytesOut = 0;
  -        m_bytesIn = 0;
       }
   
       private void bsW( int n, int v )
  @@ -532,7 +525,6 @@
               }
               m_bsBuff <<= 8;
               m_bsLive -= 8;
  -            m_bytesOut++;
           }
           m_bsBuff |= ( v << ( 32 - m_bsLive - n ) );
           m_bsLive += n;
  @@ -619,7 +611,6 @@
           if( m_blockRandomised )
           {
               bsW( 1, 1 );
  -            m_nBlocksRandomised++;
           }
           else
           {
  @@ -961,10 +952,6 @@
       private void initialize()
           throws IOException
       {
  -        m_bytesIn = 0;
  -        m_bytesOut = 0;
  -        m_nBlocksRandomised = 0;
  -
           /*
            * Write `magic' bytes h indicating file-format == huffmanised,
            * followed by a digit indicating blockSize100k.
  @@ -986,7 +973,6 @@
           boolean[] bigDone = new boolean[ 256 ];
           int c1;
           int c2;
  -        int numQSorted;
   
           /*
            * In the various block-sized structures, live data runs
  @@ -1022,7 +1008,6 @@
           }
           else
           {
  -            numQSorted = 0;
               for( i = 0; i <= 255; i++ )
               {
                   bigDone[ i ] = false;
  @@ -1127,7 +1112,6 @@
                           if( hi > lo )
                           {
                               qSort3( lo, hi, 2 );
  -                            numQSorted += ( hi - lo + 1 );
                               if( m_workDone > m_workLimit && m_firstAttempt )
                               {
                                   return;
  @@ -1448,8 +1432,6 @@
   
           int ge;
   
  -        int totc;
  -
           int bt;
   
           int bc;
  @@ -1461,7 +1443,6 @@
           int maxLen;
           int selCtr;
           int nGroups;
  -        int nBytes;
   
           alphaSize = m_nInUse + 2;
           for( t = 0; t < N_GROUPS; t++ )
  @@ -1570,7 +1551,6 @@
               }
   
               nSelectors = 0;
  -            totc = 0;
               gs = 0;
               while( true )
               {
  @@ -1650,7 +1630,6 @@
                       }
                   }
                   ;
  -                totc += bc;
                   fave[ bt ]++;
                   m_selector[ nSelectors ] = (char)bt;
                   nSelectors++;
  @@ -1763,7 +1742,6 @@
                   }
               }
   
  -            nBytes = m_bytesOut;
               for( i = 0; i < 16; i++ )
               {
                   if( inUse16[ i ] )
  @@ -1799,7 +1777,6 @@
           /*
            * Now the selectors.
            */
  -        nBytes = m_bytesOut;
           bsW( 3, nGroups );
           bsW( 15, nSelectors );
           for( i = 0; i < nSelectors; i++ )
  @@ -1811,11 +1788,6 @@
               bsW( 1, 0 );
           }
   
  -        /*
  -         * Now the coding tables.
  -         */
  -        nBytes = m_bytesOut;
  -
           for( t = 0; t < nGroups; t++ )
           {
               int curr = len[ t ][ 0 ];
  @@ -1845,7 +1817,6 @@
           /*
            * And finally, the block data proper
            */
  -        nBytes = m_bytesOut;
           selCtr = 0;
           gs = 0;
           while( true )
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message