This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-compress.git
The following commit(s) were added to refs/heads/master by this push: new 14273fb3e [Internal] Use the same kind of names as java.util.zip.Checksum 14273fb3e is described below commit 14273fb3e9a51e61d8a68bef6436bf268d5b4533 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sun Jan 14 16:39:51 2024 -0500 [Internal] Use the same kind of names as java.util.zip.Checksum --- .../compress/compressors/bzip2/BZip2CompressorInputStream.java | 4 ++-- .../compress/compressors/bzip2/BZip2CompressorOutputStream.java | 4 ++-- .../java/org/apache/commons/compress/compressors/bzip2/CRC.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java index cf98e3e4a..6ceb87920 100644 --- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java @@ -340,7 +340,7 @@ public class BZip2CompressorInputStream extends CompressorInputStream implements } private void endBlock() throws IOException { - this.computedBlockCRC = this.crc.getFinal(); + this.computedBlockCRC = this.crc.getValue(); // A bad CRC is considered a fatal error. if (this.storedBlockCRC != this.computedBlockCRC) { @@ -611,7 +611,7 @@ public class BZip2CompressorInputStream extends CompressorInputStream implements // currBlockNo++; getAndMoveToFrontDecode(); - this.crc.initialize(); + this.crc.reset(); this.currentState = START_BLOCK_STATE; } diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java index c55643d7e..f78e8666e 100644 --- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java @@ -492,7 +492,7 @@ public class BZip2CompressorOutputStream extends CompressorOutputStream implemen } private void endBlock() throws IOException { - this.blockCRC = this.crc.getFinal(); + this.blockCRC = this.crc.getValue(); this.combinedCRC = this.combinedCRC << 1 | this.combinedCRC >>> 31; this.combinedCRC ^= this.blockCRC; @@ -705,7 +705,7 @@ public class BZip2CompressorOutputStream extends CompressorOutputStream implemen private void initBlock() { // blockNo++; - this.crc.initialize(); + this.crc.reset(); this.last = -1; // ch = 0; diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java index 6a5257647..8a47a0436 100644 --- a/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java +++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java @@ -51,14 +51,14 @@ final class CRC { private int value; CRC() { - initialize(); + reset(); } - int getFinal() { + int getValue() { return ~value; } - void initialize() { + void reset() { value = 0xffffffff; }