conor 2003/07/09 06:44:49
Modified: . check.xml
src/main/org/apache/tools/bzip2 CBZip2InputStream.java
CBZip2OutputStream.java
src/main/org/apache/tools/tar TarBuffer.java
TarConstants.java TarInputStream.java
TarOutputStream.java TarUtils.java
Log:
checkstyle
Revision Changes Path
1.9 +1 -1 ant/check.xml
Index: check.xml
===================================================================
RCS file: /home/cvs/ant/check.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
--- check.xml 4 Jul 2003 13:03:37 -0000 1.8
+++ check.xml 9 Jul 2003 13:44:49 -0000 1.9
@@ -29,7 +29,7 @@
<formatter type="xml" toFile="${checkstyle.raw}"/>
<fileset dir="${java.dir}">
<include name="${tocheck}"/>
- <exclude name="**/BZip2Constants.java"/>
+ <exclude name="**/bzip2/*.java"/>
<exclude name="**/CVSPass.java"/>
</fileset>
</checkstyle>
1.13 +25 -26
ant/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
Index: CBZip2InputStream.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/bzip2/CBZip2InputStream.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -u -r1.12 -r1.13
--- CBZip2InputStream.java 10 Feb 2003 14:14:41 -0000 1.12
+++ CBZip2InputStream.java 9 Jul 2003 13:44:49 -0000 1.13
@@ -139,12 +139,12 @@
freq table collected to save a pass over the data
during decompression.
*/
- private int unzftab[] = new int[256];
+ private int[] unzftab = new int[256];
- private int limit[][] = new int[N_GROUPS][MAX_ALPHA_SIZE];
- private int base[][] = new int[N_GROUPS][MAX_ALPHA_SIZE];
- private int perm[][] = new int[N_GROUPS][MAX_ALPHA_SIZE];
- private int minLens[] = new int[N_GROUPS];
+ private int[][] limit = new int[N_GROUPS][MAX_ALPHA_SIZE];
+ private int[][] base = new int[N_GROUPS][MAX_ALPHA_SIZE];
+ private int[][] perm = new int[N_GROUPS][MAX_ALPHA_SIZE];
+ private int[] minLens = new int[N_GROUPS];
private InputStream bsStream;
@@ -306,6 +306,7 @@
}
}
} catch (IOException ioe) {
+ //ignore
}
}
@@ -319,7 +320,6 @@
private int bsR(int n) {
int v;
- {
while (bsLive < n) {
int zzi;
char thech = 0;
@@ -335,7 +335,6 @@
bsBuff = (bsBuff << 8) | (zzi & 0xff);
bsLive += 8;
}
- }
v = (bsBuff >> (bsLive - n)) & ((1 << n) - 1);
bsLive -= n;
@@ -376,7 +375,7 @@
pp++;
}
}
- };
+ }
for (i = 0; i < MAX_CODE_LEN; i++) {
base[i] = 0;
@@ -618,7 +617,7 @@
bsLive--;
}
zvec = (zvec << 1) | zj;
- };
+ }
nextSym = perm[zt][zvec - base[zt][zn]];
}
} while (nextSym == RUNA || nextSym == RUNB);
@@ -631,7 +630,7 @@
last++;
ll8[last] = ch;
s--;
- };
+ }
if (last >= limitLast) {
blockOverrun();
@@ -698,7 +697,7 @@
bsLive--;
}
zvec = (zvec << 1) | zj;
- };
+ }
nextSym = perm[zt][zvec - base[zt][zn]];
}
continue;
1.14 +4 -4
ant/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
Index: CBZip2OutputStream.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
--- CBZip2OutputStream.java 10 Feb 2003 14:14:41 -0000 1.13
+++ CBZip2OutputStream.java 9 Jul 2003 13:44:49 -0000 1.14
@@ -163,8 +163,8 @@
if (yy > nHeap) {
break;
}
- if (yy < nHeap &&
- weight[heap[yy + 1]] < weight[heap[yy]]) {
+ if (yy < nHeap
+ && weight[heap[yy + 1]] < weight[heap[yy]]) {
yy++;
}
if (weight[tmp] < weight[heap[yy]]) {
@@ -187,8 +187,8 @@
if (yy > nHeap) {
break;
}
- if (yy < nHeap &&
- weight[heap[yy + 1]] < weight[heap[yy]]) {
+ if (yy < nHeap
+ && weight[heap[yy + 1]] < weight[heap[yy]]) {
yy++;
}
if (weight[tmp] < weight[heap[yy]]) {
1.8 +85 -85 ant/src/main/org/apache/tools/tar/TarBuffer.java
Index: TarBuffer.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/tar/TarBuffer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -u -r1.7 -r1.8
1.9 +5 -5 ant/src/main/org/apache/tools/tar/TarConstants.java
Index: TarConstants.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/tar/TarConstants.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
1.9 +1 -1 ant/src/main/org/apache/tools/tar/TarInputStream.java
Index: TarInputStream.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/tar/TarInputStream.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
1.11 +51 -52 ant/src/main/org/apache/tools/tar/TarOutputStream.java
Index: TarOutputStream.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/tar/TarOutputStream.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -u -r1.10 -r1.11
--- TarOutputStream.java 10 Feb 2003 14:14:42 -0000 1.10
+++ TarOutputStream.java 9 Jul 2003 13:44:49 -0000 1.11
@@ -250,7 +250,6 @@
* This method simply calls write( byte[], int, int ).
*
* @param wBuf The buffer to write to the archive.
- * @return The number of bytes read, or -1 at EOF.
*/
public void write(byte[] wBuf) throws IOException {
this.write(wBuf, 0, wBuf.length);
1.6 +33 -33 ant/src/main/org/apache/tools/tar/TarUtils.java
Index: TarUtils.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/tar/TarUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -u -r1.5 -r1.6
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
