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 87fd7cb Use Math.min and Math.max calculations. (#247)
87fd7cb is described below
commit 87fd7cbabeaebfcb02d87fb09e2c6a76c7aec010
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sun Feb 20 01:32:57 2022 +0100
Use Math.min and Math.max calculations. (#247)
---
.../compress/archivers/dump/DumpArchiveInputStream.java | 3 +--
.../apache/commons/compress/archivers/sevenz/SevenZFile.java | 2 +-
.../compressors/bzip2/BZip2CompressorInputStream.java | 2 +-
.../compressors/bzip2/BZip2CompressorOutputStream.java | 5 +----
.../apache/commons/compress/compressors/bzip2/BlockSort.java | 11 ++++-------
.../compressors/lz4/BlockLZ4CompressorOutputStream.java | 2 +-
.../apache/commons/compress/harmony/pack200/BHSDCodec.java | 7 ++-----
.../java/org/apache/commons/compress/utils/ArchiveUtils.java | 2 +-
8 files changed, 12 insertions(+), 22 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
index 59c00b5..f013c5a 100644
---
a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
@@ -481,8 +481,7 @@ public class DumpArchiveInputStream extends
ArchiveInputStream {
}
while (len > 0) {
- final int sz = len > readBuf.length - recordOffset
- ? readBuf.length - recordOffset : len;
+ final int sz = Math.min(len, readBuf.length - recordOffset);
// copy any data we have
if (recordOffset + sz <= readBuf.length) {
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
index 3b2b8cd..c51e376 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
@@ -1361,7 +1361,7 @@ public class SevenZFile implements Closeable {
}
}
}
- stats.numberOfEntriesWithStream = stats.numberOfEntries -
(emptyStreams > 0 ? emptyStreams : 0);
+ stats.numberOfEntriesWithStream = stats.numberOfEntries -
Math.max(emptyStreams, 0);
}
private void readFilesInfo(final ByteBuffer header, final Archive archive)
throws IOException {
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 ee56a4c..dcc7578 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
@@ -514,7 +514,7 @@ public class BZip2CompressorInputStream extends
CompressorInputStream
selectorMtf[i] = (byte) j;
}
}
- final int nSelectors = selectors > MAX_SELECTORS ? MAX_SELECTORS :
selectors;
+ final int nSelectors = Math.min(selectors, MAX_SELECTORS);
/* Undo the MTF values for the selectors. */
for (int v = nGroups; --v >= 0;) {
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 082c8ee..44429d5 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
@@ -244,10 +244,7 @@ public class BZip2CompressorOutputStream extends
CompressorOutputStream
final int weight_n2 = weight[n2];
weight[nNodes] = ((weight_n1 & 0xffffff00)
+ (weight_n2 & 0xffffff00))
- | (1 + (((weight_n1 & 0x000000ff)
- > (weight_n2 & 0x000000ff))
- ? (weight_n1 & 0x000000ff)
- : (weight_n2 & 0x000000ff)));
+ | (1 + Math.max(weight_n1 & 0x000000ff, weight_n2 &
0x000000ff));
parent[nNodes] = -1;
nHeap++;
diff --git
a/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
b/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
index 7cbf5ee..3acd239 100644
--- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
+++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
@@ -118,8 +118,7 @@ class BlockSort {
private static final int FALLBACK_QSORT_STACK_SIZE = 100;
private static final int STACK_SIZE =
- QSORT_STACK_SIZE < FALLBACK_QSORT_STACK_SIZE
- ? FALLBACK_QSORT_STACK_SIZE : QSORT_STACK_SIZE;
+ Math.max(QSORT_STACK_SIZE, FALLBACK_QSORT_STACK_SIZE);
/*
* Used when sorting. If too many long comparisons happen, we stop sorting,
@@ -317,7 +316,7 @@ class BlockSort {
}
private int fmin(final int a, final int b) {
- return a < b ? a : b;
+ return Math.min(a, b);
}
private void fpush(final int sp, final int lz, final int hz) {
@@ -878,11 +877,9 @@ class BlockSort {
stack_dd[sp] = d1;
sp++;
} else {
- int n = ((ltLo - lo) < (unLo - ltLo)) ? (ltLo - lo)
- : (unLo - ltLo);
+ int n = Math.min(ltLo - lo, unLo - ltLo);
vswap(fmap, lo, unLo - n, n);
- int m = ((hi - gtHi) < (gtHi - unHi)) ? (hi - gtHi)
- : (gtHi - unHi);
+ int m = Math.min(hi - gtHi, gtHi - unHi);
vswap(fmap, unLo, hi - m + 1, m);
n = lo + unLo - ltLo - 1;
diff --git
a/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java
b/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java
index 699edea..fc796e8 100644
---
a/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java
@@ -469,7 +469,7 @@ public class BlockLZ4CompressorOutputStream extends
CompressorOutputStream {
return length;
}
private static int lengths(final int litLength, final int brLength) {
- final int l = litLength < 15 ? litLength : 15;
+ final int l = Math.min(litLength, 15);
final int br = brLength < 4 ? 0 : (brLength < 19 ? brLength - 4 :
15);
return (l << BlockLZ4CompressorInputStream.SIZE_BITS) | br;
}
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java
index 5117481..6fe99c4 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java
@@ -310,11 +310,8 @@ public final class BHSDCodec extends Codec {
}
} else if (z < 0) {
// Need to use integer overflow here to represent negatives.
- if (cardinality < 4294967296L) {
- z += cardinality;
- } else {
- z += 4294967296L; // this value is equal to (1 << 32).
- }
+ // 4294967296L is the 1 << 32.
+ z += Math.min(cardinality, 4294967296L);
}
if (z < 0) {
throw new Pack200Exception("unable to encode");
diff --git a/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java
b/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java
index 53a199d..c2c2928 100644
--- a/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java
+++ b/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java
@@ -137,7 +137,7 @@ public class ArchiveUtils {
final byte[] buffer1, final int offset1, final int length1,
final byte[] buffer2, final int offset2, final int length2,
final boolean ignoreTrailingNulls){
- final int minLen=length1 < length2 ? length1 : length2;
+ final int minLen= Math.min(length1, length2);
for (int i=0; i < minLen; i++){
if (buffer1[offset1+i] != buffer2[offset2+i]){
return false;
