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 09:34:03 GMT
donaldp     02/03/24 01:34:03

  Modified:    bzip2/src/java/org/apache/avalon/excalibur/bzip2
                        CBZip2OutputStream.java
  Log:
  Made hbMakeCodeLengths private and inner class static
  
  Revision  Changes    Path
  1.3       +24 -25    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CBZip2OutputStream.java	24 Mar 2002 07:11:28 -0000	1.2
  +++ CBZip2OutputStream.java	24 Mar 2002 09:34:03 -0000	1.3
  @@ -9,7 +9,6 @@
   
   import java.io.IOException;
   import java.io.OutputStream;
  -import org.apache.avalon.excalibur.bzip2.BZip2Constants;
   
   /**
    * An output stream that compresses into the BZip2 format (without the file
  @@ -144,8 +143,8 @@
           initBlock();
       }
   
  -    protected static void hbMakeCodeLengths( char[] len, int[] freq,
  -                                             int alphaSize, int maxLen )
  +    private static void hbMakeCodeLengths( char[] len, int[] freq,
  +                                           int alphaSize, int maxLen )
       {
           /*
            * Nodes and heap entries run from 1.  Entry 0
  @@ -1253,9 +1252,9 @@
   
           sp = 0;
   
  -        stack[ sp ].ll = loSt;
  -        stack[ sp ].hh = hiSt;
  -        stack[ sp ].dd = dSt;
  +        stack[ sp ].m_ll = loSt;
  +        stack[ sp ].m_hh = hiSt;
  +        stack[ sp ].m_dd = dSt;
           sp++;
   
           while( sp > 0 )
  @@ -1266,9 +1265,9 @@
               }
   
               sp--;
  -            lo = stack[ sp ].ll;
  -            hi = stack[ sp ].hh;
  -            d = stack[ sp ].dd;
  +            lo = stack[ sp ].m_ll;
  +            hi = stack[ sp ].m_hh;
  +            d = stack[ sp ].m_dd;
   
               if( hi - lo < SMALL_THRESH || d > DEPTH_THRESH )
               {
  @@ -1353,9 +1352,9 @@
   
               if( gtHi < ltLo )
               {
  -                stack[ sp ].ll = lo;
  -                stack[ sp ].hh = hi;
  -                stack[ sp ].dd = d + 1;
  +                stack[ sp ].m_ll = lo;
  +                stack[ sp ].m_hh = hi;
  +                stack[ sp ].m_dd = d + 1;
                   sp++;
                   continue;
               }
  @@ -1368,19 +1367,19 @@
               n = lo + unLo - ltLo - 1;
               m = hi - ( gtHi - unHi ) + 1;
   
  -            stack[ sp ].ll = lo;
  -            stack[ sp ].hh = n;
  -            stack[ sp ].dd = d;
  +            stack[ sp ].m_ll = lo;
  +            stack[ sp ].m_hh = n;
  +            stack[ sp ].m_dd = d;
               sp++;
   
  -            stack[ sp ].ll = n + 1;
  -            stack[ sp ].hh = m - 1;
  -            stack[ sp ].dd = d + 1;
  +            stack[ sp ].m_ll = n + 1;
  +            stack[ sp ].m_hh = m - 1;
  +            stack[ sp ].m_dd = d + 1;
               sp++;
   
  -            stack[ sp ].ll = m;
  -            stack[ sp ].hh = hi;
  -            stack[ sp ].dd = d;
  +            stack[ sp ].m_ll = m;
  +            stack[ sp ].m_hh = hi;
  +            stack[ sp ].m_dd = d;
               sp++;
           }
       }
  @@ -2012,11 +2011,11 @@
           }
       }
   
  -    private class StackElem
  +    private static class StackElem
       {
  -        int dd;
  -        int hh;
  -        int ll;
  +        int m_dd;
  +        int m_hh;
  +        int m_ll;
       }
   }
   
  
  
  

--
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