You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/04/27 17:39:03 UTC
(commons-compress) 02/03: Whitespace
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
commit 932a012e3714080cf6ce0ca7a708087156e08e46
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Apr 27 10:19:57 2024 -0400
Whitespace
---
.../archivers/ar/ArArchiveInputStream.java | 27 ++++++++++------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
index 2ccae9bf9..d4607848a 100644
--- a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
@@ -113,9 +113,17 @@ public class ArArchiveInputStream extends ArchiveInputStream<ArArchiveEntry> {
*/
public static boolean matches(final byte[] signature, final int length) {
// 3c21 7261 6863 0a3e
-
- return length >= 8 && signature[0] == 0x21 && signature[1] == 0x3c && signature[2] == 0x61 && signature[3] == 0x72 && signature[4] == 0x63
- && signature[5] == 0x68 && signature[6] == 0x3e && signature[7] == 0x0a;
+ // @formatter:off
+ return length >= 8 &&
+ signature[0] == 0x21 &&
+ signature[1] == 0x3c &&
+ signature[2] == 0x61 &&
+ signature[3] == 0x72 &&
+ signature[4] == 0x63 &&
+ signature[5] == 0x68 &&
+ signature[6] == 0x3e &&
+ signature[7] == 0x0a;
+ // @formatter:on
}
private long offset;
@@ -223,7 +231,6 @@ public class ArArchiveInputStream extends ArchiveInputStream<ArArchiveEntry> {
if (namebuffer[i - 1] == '/') {
i--; // drop trailing /
}
-
// Check there is a something to return, otherwise break out of the loop
if (i - offset > 0) {
return ArchiveUtils.toAsciiString(namebuffer, offset, i - offset);
@@ -249,7 +256,6 @@ public class ArArchiveInputStream extends ArchiveInputStream<ArArchiveEntry> {
trackReadBytes(skipped);
currentEntry = null;
}
-
if (offset == 0) {
final byte[] expected = ArchiveUtils.toAsciiBytes(ArArchiveEntry.HEADER);
final byte[] realized = IOUtils.readRange(in, expected.length);
@@ -262,7 +268,6 @@ public class ArArchiveInputStream extends ArchiveInputStream<ArArchiveEntry> {
throw new IOException("Invalid header " + ArchiveUtils.toAsciiString(realized));
}
}
-
if (offset % 2 != 0) {
if (in.read() < 0) {
// hit eof
@@ -270,7 +275,6 @@ public class ArArchiveInputStream extends ArchiveInputStream<ArArchiveEntry> {
}
trackReadBytes(1);
}
-
{
final int read = IOUtils.readFully(in, metaData);
trackReadBytes(read);
@@ -281,7 +285,6 @@ public class ArArchiveInputStream extends ArchiveInputStream<ArArchiveEntry> {
throw new IOException("Truncated ar archive");
}
}
-
{
final byte[] expected = ArchiveUtils.toAsciiBytes(ArArchiveEntry.TRAILER);
final byte[] realized = IOUtils.readRange(in, expected.length);
@@ -296,16 +299,13 @@ public class ArArchiveInputStream extends ArchiveInputStream<ArArchiveEntry> {
}
entryOffset = offset;
-
-// GNU ar uses a '/' to mark the end of the file name; this allows for the use of spaces without the use of an extended file name.
-
+ // GNU ar uses a '/' to mark the end of the file name; this allows for the use of spaces without the use of an extended file name.
// entry name is stored as ASCII string
String temp = ArchiveUtils.toAsciiString(metaData, NAME_OFFSET, NAME_LEN).trim();
if (isGNUStringTable(temp)) { // GNU extended file names entry
currentEntry = readGNUStringTable(metaData, LENGTH_OFFSET, LENGTH_LEN);
return getNextArEntry();
}
-
long len;
try {
len = asLong(metaData, LENGTH_OFFSET, LENGTH_LEN);
@@ -326,11 +326,9 @@ public class ArArchiveInputStream extends ArchiveInputStream<ArArchiveEntry> {
len -= nameLen;
entryOffset += nameLen;
}
-
if (len < 0) {
throw new IOException("broken archive, entry with negative size");
}
-
try {
currentEntry = new ArArchiveEntry(temp, len, asInt(metaData, USER_ID_OFFSET, USER_ID_LEN, true),
asInt(metaData, GROUP_ID_OFFSET, GROUP_ID_LEN, true), asInt(metaData, FILE_MODE_OFFSET, FILE_MODE_LEN, 8),
@@ -395,7 +393,6 @@ public class ArArchiveInputStream extends ArchiveInputStream<ArArchiveEntry> {
} catch (final NumberFormatException ex) {
throw new IOException("Broken archive, unable to parse GNU string table length field as a number", ex);
}
-
namebuffer = IOUtils.readRange(in, bufflen);
final int read = namebuffer.length;
trackReadBytes(read);