You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2018/01/18 13:24:09 UTC
[09/12] commons-compress git commit: 'long' literal ending with
lowercase 'l' instead of 'L'
'long' literal ending with lowercase 'l' instead of 'L'
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/f43590aa
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/f43590aa
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/f43590aa
Branch: refs/heads/master
Commit: f43590aaf5416ce79cb1aad770c83096ddf2a5c2
Parents: 5b56985
Author: shahab <sh...@gmail.com>
Authored: Sun Jan 14 14:37:59 2018 -0500
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Jan 18 14:20:49 2018 +0100
----------------------------------------------------------------------
.../commons/compress/archivers/arj/ArjArchiveEntry.java | 2 +-
.../compress/archivers/cpio/CpioArchiveOutputStream.java | 6 +++---
.../commons/compress/archivers/tar/TarArchiveEntry.java | 2 +-
.../compress/archivers/tar/TarArchiveOutputStream.java | 2 +-
.../apache/commons/compress/archivers/tar/TarUtils.java | 4 ++--
.../compress/archivers/zip/ParallelScatterZipCreator.java | 2 +-
.../apache/commons/compress/archivers/zip/X000A_NTFS.java | 4 ++--
.../compressors/gzip/GzipCompressorInputStream.java | 2 +-
.../apache/commons/compress/compressors/lz4/XXHash32.java | 10 +++++-----
.../snappy/FramedSnappyCompressorInputStream.java | 2 +-
.../snappy/FramedSnappyCompressorOutputStream.java | 2 +-
.../org/apache/commons/compress/utils/BitInputStream.java | 4 ++--
.../java/org/apache/commons/compress/utils/ByteUtils.java | 2 +-
.../commons/compress/utils/CRC32VerifyingInputStream.java | 2 +-
14 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f43590aa/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java
index e66dc55..7bee5bc 100644
--- a/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java
@@ -91,7 +91,7 @@ public class ArjArchiveEntry implements ArchiveEntry {
*/
@Override
public Date getLastModifiedDate() {
- final long ts = isHostOsUnix() ? localFileHeader.dateTimeModified * 1000l
+ final long ts = isHostOsUnix() ? localFileHeader.dateTimeModified * 1000L
: ZipUtil.dosToJavaTime(0xFFFFFFFFL & localFileHeader.dateTimeModified);
return new Date(ts);
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f43590aa/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
index 4b7158f..ed8e2d0 100644
--- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
@@ -299,7 +299,7 @@ public class CpioArchiveOutputStream extends ArchiveOutputStream implements
writeAsciiLong(devMin, 8, 16);
writeAsciiLong(entry.getRemoteDeviceMaj(), 8, 16);
writeAsciiLong(entry.getRemoteDeviceMin(), 8, 16);
- writeAsciiLong(entry.getName().length() + 1l, 8, 16);
+ writeAsciiLong(entry.getName().length() + 1L, 8, 16);
writeAsciiLong(entry.getChksum(), 8, 16);
writeCString(entry.getName());
pad(entry.getHeaderPadCount());
@@ -330,7 +330,7 @@ public class CpioArchiveOutputStream extends ArchiveOutputStream implements
writeAsciiLong(entry.getNumberOfLinks(), 6, 8);
writeAsciiLong(entry.getRemoteDevice(), 6, 8);
writeAsciiLong(entry.getTime(), 11, 8);
- writeAsciiLong(entry.getName().length() + 1l, 6, 8);
+ writeAsciiLong(entry.getName().length() + 1L, 6, 8);
writeAsciiLong(entry.getSize(), 11, 8);
writeCString(entry.getName());
}
@@ -360,7 +360,7 @@ public class CpioArchiveOutputStream extends ArchiveOutputStream implements
writeBinaryLong(entry.getNumberOfLinks(), 2, swapHalfWord);
writeBinaryLong(entry.getRemoteDevice(), 2, swapHalfWord);
writeBinaryLong(entry.getTime(), 4, swapHalfWord);
- writeBinaryLong(entry.getName().length() + 1l, 2, swapHalfWord);
+ writeBinaryLong(entry.getName().length() + 1L, 2, swapHalfWord);
writeBinaryLong(entry.getSize(), 4, swapHalfWord);
writeCString(entry.getName());
pad(entry.getHeaderPadCount());
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f43590aa/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
index 76f48e9..ffced21 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
@@ -1189,7 +1189,7 @@ public class TarArchiveEntry implements ArchiveEntry, TarConstants {
private int writeEntryHeaderField(final long value, final byte[] outbuf, final int offset,
final int length, final boolean starMode) {
if (!starMode && (value < 0
- || value >= 1l << 3 * (length - 1))) {
+ || value >= 1L << 3 * (length - 1))) {
// value doesn't fit into field when written as octal
// number, will be written to PAX header or causes an
// error
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f43590aa/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
index b7f4350..382f06f 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
@@ -671,7 +671,7 @@ public class TarArchiveOutputStream extends ArchiveOutputStream {
final TarArchiveEntry longLinkEntry = new TarArchiveEntry(TarConstants.GNU_LONGLINK,
linkType);
- longLinkEntry.setSize(len + 1l); // +1 for NUL
+ longLinkEntry.setSize(len + 1L); // +1 for NUL
transferModTime(entry, longLinkEntry);
putArchiveEntry(longLinkEntry);
write(encodedName.array(), encodedName.arrayOffset(), len);
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f43590aa/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
index 171f44f..08cbbf0 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
@@ -491,7 +491,7 @@ public class TarUtils {
final int offset, final int length,
final boolean negative) {
final int bits = (length - 1) * 8;
- final long max = 1l << bits;
+ final long max = 1L << bits;
long val = Math.abs(value); // Long.MIN_VALUE stays Long.MIN_VALUE
if (val < 0 || val >= max) {
throw new IllegalArgumentException("Value " + value +
@@ -500,7 +500,7 @@ public class TarUtils {
if (negative) {
val ^= max - 1;
val++;
- val |= 0xffl << bits;
+ val |= 0xffL << bits;
}
for (int i = offset + length - 1; i >= offset; i--) {
buf[i] = (byte) val;
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f43590aa/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java b/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
index 9513da2..369a649 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
@@ -241,7 +241,7 @@ public class ParallelScatterZipCreator {
}
es.shutdown();
- es.awaitTermination(1000 * 60l, TimeUnit.SECONDS); // == Infinity. We really *must* wait for this to complete
+ es.awaitTermination(1000 * 60L, TimeUnit.SECONDS); // == Infinity. We really *must* wait for this to complete
// It is important that all threads terminate before we go on, ensure happens-before relationship
compressionDoneAt = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f43590aa/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java b/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java
index d5939c3..2dd5c33 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java
@@ -382,12 +382,12 @@ public class X000A_NTFS implements ZipExtraField {
private static ZipEightByteInteger dateToZip(final Date d) {
if (d == null) { return null; }
- return new ZipEightByteInteger((d.getTime() * 10000l) - EPOCH_OFFSET);
+ return new ZipEightByteInteger((d.getTime() * 10000L) - EPOCH_OFFSET);
}
private static Date zipToDate(final ZipEightByteInteger z) {
if (z == null || ZipEightByteInteger.ZERO.equals(z)) { return null; }
- final long l = (z.getLongValue() + EPOCH_OFFSET) / 10000l;
+ final long l = (z.getLongValue() + EPOCH_OFFSET) / 10000L;
return new Date(l);
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f43590aa/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
index e939a17..bbf40ee 100644
--- a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
@@ -317,7 +317,7 @@ public class GzipCompressorInputStream extends CompressorInputStream {
// Uncompressed size modulo 2^32 (ISIZE in the spec)
final long isize = ByteUtils.fromLittleEndian(inData, 4);
- if (isize != (inf.getBytesWritten() & 0xffffffffl)) {
+ if (isize != (inf.getBytesWritten() & 0xffffffffL)) {
throw new IOException("Gzip-compressed data is corrupt"
+ "(uncompressed size mismatch)");
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f43590aa/src/main/java/org/apache/commons/compress/compressors/lz4/XXHash32.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/compressors/lz4/XXHash32.java b/src/main/java/org/apache/commons/compress/compressors/lz4/XXHash32.java
index a406ffc..c57c8cf 100644
--- a/src/main/java/org/apache/commons/compress/compressors/lz4/XXHash32.java
+++ b/src/main/java/org/apache/commons/compress/compressors/lz4/XXHash32.java
@@ -36,9 +36,9 @@ public class XXHash32 implements Checksum {
private static final int BUF_SIZE = 16;
private static final int ROTATE_BITS = 13;
- private static final int PRIME1 = (int) 2654435761l;
- private static final int PRIME2 = (int) 2246822519l;
- private static final int PRIME3 = (int) 3266489917l;
+ private static final int PRIME1 = (int) 2654435761L;
+ private static final int PRIME2 = (int) 2246822519L;
+ private static final int PRIME3 = (int) 3266489917L;
private static final int PRIME4 = 668265263;
private static final int PRIME5 = 374761393;
@@ -143,11 +143,11 @@ public class XXHash32 implements Checksum {
hash ^= hash >>> 13;
hash *= PRIME3;
hash ^= hash >>> 16;
- return hash & 0xffffffffl;
+ return hash & 0xffffffffL;
}
private static int getInt(byte[] buffer, int idx) {
- return (int) (fromLittleEndian(buffer, idx, 4) & 0xffffffffl);
+ return (int) (fromLittleEndian(buffer, idx, 4) & 0xffffffffL);
}
private void initializeState() {
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f43590aa/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
index 8c9fb2a..56f9294 100644
--- a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
@@ -230,7 +230,7 @@ public class FramedSnappyCompressorInputStream extends CompressorInputStream {
expectedChecksum = unmask(readCrc());
} else if (type == COMPRESSED_CHUNK_TYPE) {
final boolean expectChecksum = dialect.usesChecksumWithCompressedChunks();
- final long size = readSize() - (expectChecksum ? 4l : 0l);
+ final long size = readSize() - (expectChecksum ? 4L : 0L);
if (expectChecksum) {
expectedChecksum = unmask(readCrc());
} else {
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f43590aa/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorOutputStream.java
index 290fc01..08cd619 100644
--- a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorOutputStream.java
@@ -124,7 +124,7 @@ public class FramedSnappyCompressorOutputStream extends CompressorOutputStream {
o.write(buffer, 0, currentIndex);
}
byte[] b = baos.toByteArray();
- writeLittleEndian(3, b.length + 4l /* CRC */);
+ writeLittleEndian(3, b.length + 4L /* CRC */);
writeCrc();
out.write(b);
currentIndex = 0;
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f43590aa/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/utils/BitInputStream.java b/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
index 03d2348..770101d 100644
--- a/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
+++ b/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
@@ -119,7 +119,7 @@ public class BitInputStream implements Closeable {
* @since 1.16
*/
public long bitsAvailable() throws IOException {
- return bitsCachedSize + 8l * in.available();
+ return bitsCachedSize + 8L * in.available();
}
/**
@@ -137,7 +137,7 @@ public class BitInputStream implements Closeable {
private long processBitsGreater57(final int count) throws IOException {
final long bitsOut;
int overflowBits = 0;
- long overflow = 0l;
+ long overflow = 0L;
// bitsCachedSize >= 57 and left-shifting it 8 bits would cause an overflow
int bitsToAddCount = count - bitsCachedSize;
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f43590aa/src/main/java/org/apache/commons/compress/utils/ByteUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/utils/ByteUtils.java b/src/main/java/org/apache/commons/compress/utils/ByteUtils.java
index 308ee63..85b4118 100644
--- a/src/main/java/org/apache/commons/compress/utils/ByteUtils.java
+++ b/src/main/java/org/apache/commons/compress/utils/ByteUtils.java
@@ -80,7 +80,7 @@ public final class ByteUtils {
checkReadLength(length);
long l = 0;
for (int i = 0; i < length; i++) {
- l |= (bytes[off + i] & 0xffl) << (8 * i);
+ l |= (bytes[off + i] & 0xffL) << (8 * i);
}
return l;
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f43590aa/src/main/java/org/apache/commons/compress/utils/CRC32VerifyingInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/utils/CRC32VerifyingInputStream.java b/src/main/java/org/apache/commons/compress/utils/CRC32VerifyingInputStream.java
index 9af6afb..1b50e8c 100644
--- a/src/main/java/org/apache/commons/compress/utils/CRC32VerifyingInputStream.java
+++ b/src/main/java/org/apache/commons/compress/utils/CRC32VerifyingInputStream.java
@@ -34,7 +34,7 @@ public class CRC32VerifyingInputStream extends ChecksumVerifyingInputStream {
* @param expectedCrc32 the expected checksum
*/
public CRC32VerifyingInputStream(final InputStream in, final long size, final int expectedCrc32) {
- this(in, size, expectedCrc32 & 0xFFFFffffl);
+ this(in, size, expectedCrc32 & 0xFFFFffffL);
}
/**