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 2022/04/22 21:09:45 UTC
[commons-compress] branch master updated: Avoid use C-style array declaration. (#282)
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 cf7bcef5 Avoid use C-style array declaration. (#282)
cf7bcef5 is described below
commit cf7bcef58493cef99b90f1c9943893944f7598bc
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Fri Apr 22 23:09:40 2022 +0200
Avoid use C-style array declaration. (#282)
---
pom.xml | 4 ++++
.../java/org/apache/commons/compress/harmony/pack200/Codec.java | 4 ++--
.../apache/commons/compress/harmony/pack200/PopulationCodec.java | 2 +-
.../java/org/apache/commons/compress/harmony/unpack200/Archive.java | 2 +-
.../java/org/apache/commons/compress/harmony/unpack200/BandSet.java | 6 +++---
.../java/org/apache/commons/compress/harmony/unpack200/CpBands.java | 4 ++--
.../java/org/apache/commons/compress/harmony/unpack200/IcTuple.java | 2 +-
.../java/org/apache/commons/compress/harmony/unpack200/Segment.java | 6 +++---
.../commons/compress/harmony/unpack200/SegmentConstantPool.java | 4 ++--
.../apache/commons/compress/harmony/unpack200/SegmentHeader.java | 2 +-
.../commons/compress/harmony/unpack200/bytecode/CodeAttribute.java | 2 +-
.../compress/harmony/unpack200/bytecode/forms/LookupSwitchForm.java | 4 ++--
.../compress/harmony/unpack200/bytecode/forms/TableSwitchForm.java | 2 +-
13 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index fbe66d34..43dd78c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,6 +321,10 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
<name>Michael Hausegger</name>
<email>hausegger.michael@googlemail.com</email>
</contributor>
+ <contributor>
+ <name>Arturo Bernal</name>
+ <email>arturobernalg@yahoo.com</email>
+ </contributor>
</contributors>
<scm>
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/Codec.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Codec.java
index e7e04b41..37ca50ea 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/Codec.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Codec.java
@@ -145,7 +145,7 @@ public abstract class Codec {
*/
public int[] decodeInts(final int n, final InputStream in) throws IOException, Pack200Exception {
lastBandLength = 0;
- final int result[] = new int[n];
+ final int[] result = new int[n];
int last = 0;
for (int i = 0; i < n; i++) {
result[i] = last = decode(in, last);
@@ -166,7 +166,7 @@ public abstract class Codec {
*/
public int[] decodeInts(final int n, final InputStream in, final int firstValue)
throws IOException, Pack200Exception {
- final int result[] = new int[n + 1];
+ final int[] result = new int[n + 1];
result[0] = firstValue;
int last = firstValue;
for (int i = 1; i < n + 1; i++) {
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/PopulationCodec.java b/src/main/java/org/apache/commons/compress/harmony/pack200/PopulationCodec.java
index 249a5a3b..6759a75a 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/PopulationCodec.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/PopulationCodec.java
@@ -61,7 +61,7 @@ public class PopulationCodec extends Codec {
lastBandLength = 0;
favoured = new int[n]; // there must be <= n values, but probably a lot
// less
- int result[];
+ int[] result;
// read table of favorites first
int smallest = Integer.MAX_VALUE, absoluteSmallest;
int last = 0;
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/Archive.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/Archive.java
index 690c4655..787564e0 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/Archive.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/Archive.java
@@ -110,7 +110,7 @@ public class Archive {
inputStream.mark(4);
final int[] magic = {0xCA, 0xFE, 0xD0, 0x0D}; // Magic word for
// pack200
- final int word[] = new int[4];
+ final int[] word = new int[4];
for (int i = 0; i < word.length; i++) {
word[i] = inputStream.read();
}
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
index 290005cc..f10be1a4 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
@@ -162,7 +162,7 @@ public abstract class BandSet {
return parseFlags(name, in, new int[] {count}, (hasHi ? codec : null), codec)[0];
}
- public long[][] parseFlags(final String name, final InputStream in, final int counts[], final BHSDCodec codec,
+ public long[][] parseFlags(final String name, final InputStream in, final int[] counts, final BHSDCodec codec,
final boolean hasHi) throws IOException, Pack200Exception {
return parseFlags(name, in, counts, (hasHi ? codec : null), codec);
}
@@ -172,7 +172,7 @@ public abstract class BandSet {
return parseFlags(name, in, new int[] {count}, hiCodec, loCodec)[0];
}
- public long[][] parseFlags(final String name, final InputStream in, final int counts[], final BHSDCodec hiCodec,
+ public long[][] parseFlags(final String name, final InputStream in, final int[] counts, final BHSDCodec hiCodec,
final BHSDCodec loCodec) throws IOException, Pack200Exception {
final int count = counts.length;
if (count == 0) {
@@ -244,7 +244,7 @@ public abstract class BandSet {
* @throws Pack200Exception if a problem occurs with an unexpected value or unsupported Codec
*/
public String[][] parseReferences(final String name, final InputStream in, final BHSDCodec codec,
- final int counts[], final String[] reference) throws IOException, Pack200Exception {
+ final int[] counts, final String[] reference) throws IOException, Pack200Exception {
final int count = counts.length;
if (count == 0) {
return new String[][] {{}};
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
index 2e2ea79f..cd5f2746 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
@@ -214,7 +214,7 @@ public class CpBands extends BandSet {
private void parseCpFloat(final InputStream in) throws IOException, Pack200Exception {
final int cpFloatCount = header.getCpFloatCount();
cpFloat = new float[cpFloatCount];
- final int floatBits[] = decodeBandInt("cp_Float", in, Codec.UDELTA5, cpFloatCount);
+ final int[] floatBits = decodeBandInt("cp_Float", in, Codec.UDELTA5, cpFloatCount);
for (int i = 0; i < cpFloatCount; i++) {
cpFloat[i] = Float.intBitsToFloat(floatBits[i]);
}
@@ -376,7 +376,7 @@ public class CpBands extends BandSet {
}
// Convert big suffix data to characters
- final char bigSuffixData[][] = new char[bigSuffixCount][];
+ final char[][] bigSuffixData = new char[bigSuffixCount][];
for (int i = 0; i < bigSuffixDataBand.length; i++) {
bigSuffixData[i] = new char[bigSuffixDataBand[i].length];
for (int j = 0; j < bigSuffixDataBand[i].length; j++) {
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/IcTuple.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/IcTuple.java
index 9ca53831..83832b62 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/IcTuple.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/IcTuple.java
@@ -200,7 +200,7 @@ public class IcTuple {
}
// Class names must be calculated from
// this class name.
- final String nameComponents[] = innerBreakAtDollar(C);
+ final String[] nameComponents = innerBreakAtDollar(C);
if (nameComponents.length == 0) {
// Unable to predict outer class
// throw new Error("Unable to predict outer class name: " + C);
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/Segment.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/Segment.java
index 242163f1..f6091f56 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/Segment.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/Segment.java
@@ -187,12 +187,12 @@ public class Segment {
final ClassFileEntry cfThis = cp.add(cpBands.cpClassValue(fullNameIndexInCpClass));
final ClassFileEntry cfSuper = cp.add(cpBands.cpClassValue(classBands.getClassSuperInts()[classNum]));
// add interfaces
- final ClassFileEntry cfInterfaces[] = new ClassFileEntry[classBands.getClassInterfacesInts()[classNum].length];
+ final ClassFileEntry[] cfInterfaces = new ClassFileEntry[classBands.getClassInterfacesInts()[classNum].length];
for (i = 0; i < cfInterfaces.length; i++) {
cfInterfaces[i] = cp.add(cpBands.cpClassValue(classBands.getClassInterfacesInts()[classNum][i]));
}
// add fields
- final ClassFileEntry cfFields[] = new ClassFileEntry[classBands.getClassFieldCount()[classNum]];
+ final ClassFileEntry[] cfFields = new ClassFileEntry[classBands.getClassFieldCount()[classNum]];
// fieldDescr and fieldFlags used to create this
for (i = 0; i < cfFields.length; i++) {
final int descriptorIndex = classBands.getFieldDescrInts()[classNum][i];
@@ -204,7 +204,7 @@ public class Segment {
classBands.getFieldAttributes()[classNum][i]));
}
// add methods
- final ClassFileEntry cfMethods[] = new ClassFileEntry[classBands.getClassMethodCount()[classNum]];
+ final ClassFileEntry[] cfMethods = new ClassFileEntry[classBands.getClassMethodCount()[classNum]];
// methodDescr and methodFlags used to create this
for (i = 0; i < cfMethods.length; i++) {
final int descriptorIndex = classBands.getMethodDescrInts()[classNum][i];
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPool.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPool.java
index 34119243..8e1e9d59 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPool.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPool.java
@@ -109,7 +109,7 @@ public class SegmentConstantPool {
final String desiredClassName) throws Pack200Exception {
final int index = (int) desiredIndex;
int realIndex = -1;
- String array[] = null;
+ String[] array = null;
if (cp == CP_FIELD) {
array = bands.getCpFieldClass();
} else if (cp == CP_METHOD) {
@@ -130,7 +130,7 @@ public class SegmentConstantPool {
* @return CPClass for that class name, or null if not found.
*/
public ConstantPoolEntry getClassPoolEntry(final String name) {
- final String classes[] = bands.getCpClass();
+ final String[] classes = bands.getCpClass();
final int index = matchSpecificPoolEntryIndex(classes, name, 0);
if (index == -1) {
return null;
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentHeader.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentHeader.java
index d8008978..cf28f8a4 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentHeader.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentHeader.java
@@ -101,7 +101,7 @@ public class SegmentHeader {
public void read(final InputStream in) throws IOException, Error, Pack200Exception {
- final int word[] = decodeScalar("archive_magic_word", in, Codec.BYTE1, magic.length);
+ final int[] word = decodeScalar("archive_magic_word", in, Codec.BYTE1, magic.length);
for (int m = 0; m < magic.length; m++) {
if (word[m] != magic[m]) {
throw new Error("Bad header");
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CodeAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CodeAttribute.java
index 5bc3e232..34b412d6 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CodeAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CodeAttribute.java
@@ -35,7 +35,7 @@ public class CodeAttribute extends BCIRenumberedAttribute {
public int maxStack;
private static CPUTF8 attributeName;
- public CodeAttribute(final int maxStack, final int maxLocals, final byte codePacked[], final Segment segment,
+ public CodeAttribute(final int maxStack, final int maxLocals, final byte[] codePacked, final Segment segment,
final OperandManager operandManager, final List exceptionTable) {
super(attributeName);
this.maxLocals = maxLocals;
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LookupSwitchForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LookupSwitchForm.java
index 7f021fd5..d4def4b3 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LookupSwitchForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LookupSwitchForm.java
@@ -38,11 +38,11 @@ public class LookupSwitchForm extends SwitchForm {
final int codeLength) {
final int case_count = operandManager.nextCaseCount();
final int default_pc = operandManager.nextLabel();
- final int case_values[] = new int[case_count];
+ final int[] case_values = new int[case_count];
for (int index = 0; index < case_count; index++) {
case_values[index] = operandManager.nextCaseValues();
}
- final int case_pcs[] = new int[case_count];
+ final int[] case_pcs = new int[case_count];
for (int index = 0; index < case_count; index++) {
case_pcs[index] = operandManager.nextLabel();
}
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/TableSwitchForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/TableSwitchForm.java
index 28e3d18f..f28e8f97 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/TableSwitchForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/TableSwitchForm.java
@@ -41,7 +41,7 @@ public class TableSwitchForm extends SwitchForm {
int case_value = -1;
case_value = operandManager.nextCaseValues();
- final int case_pcs[] = new int[case_count];
+ final int[] case_pcs = new int[case_count];
for (int index = 0; index < case_count; index++) {
case_pcs[index] = operandManager.nextLabel();
}