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 18:21:45 UTC
[commons-compress] branch master updated: Inline variable. Remove redundant local variable. (#283)
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 d0513985 Inline variable. Remove redundant local variable. (#283)
d0513985 is described below
commit d05139856794546135d10f96bfb3a209325dd69b
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Fri Apr 22 20:21:42 2022 +0200
Inline variable. Remove redundant local variable. (#283)
---
.../commons/compress/harmony/unpack200/AttributeLayout.java | 3 +--
.../org/apache/commons/compress/harmony/unpack200/BandSet.java | 9 +++------
.../apache/commons/compress/harmony/unpack200/ClassBands.java | 9 ++-------
.../commons/compress/harmony/unpack200/SegmentConstantPool.java | 3 +--
.../harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java | 3 +--
5 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/AttributeLayout.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/AttributeLayout.java
index 822433f6..c554de14 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/AttributeLayout.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/AttributeLayout.java
@@ -184,8 +184,7 @@ public class AttributeLayout implements IMatcher {
return getValue(layout, value, pool);
}
if (type.equals("Ljava/lang/String;")) { //$NON-NLS-1$
- final ClassFileEntry value2 = getValue("KS", value, pool); //$NON-NLS-1$
- return value2;
+ return getValue("KS", value, pool);
}
return getValue("K" + type + layout.substring(2), value, //$NON-NLS-1$
pool);
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 55c26c0a..290005cc 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
@@ -266,13 +266,12 @@ public abstract class BandSet {
}
result1[i1] = reference[index];
}
- final String[] refs = result1;
// TODO Merge the decode and parsing of a multiple structure into one
int pos = 0;
for (int i = 0; i < count; i++) {
final int num = counts[i];
result[i] = new String[num];
- System.arraycopy(refs, pos, result[i], 0, num);
+ System.arraycopy(result1, pos, result[i], 0, num);
pos += num;
}
return result;
@@ -357,12 +356,11 @@ public abstract class BandSet {
final int index = indices[i1];
result1[i1] = segment.getCpBands().cpUTF8Value(index);
}
- final CPUTF8[] refs = result1;
int pos = 0;
for (int i = 0; i < counts.length; i++) {
final int num = counts[i];
result[i] = new CPUTF8[num];
- System.arraycopy(refs, pos, result[i], 0, num);
+ System.arraycopy(result1, pos, result[i], 0, num);
pos += num;
}
return result;
@@ -452,12 +450,11 @@ public abstract class BandSet {
final int index = indices[i1];
result1[i1] = segment.getCpBands().cpSignatureValue(index);
}
- final CPUTF8[] refs = result1;
int pos = 0;
for (int i = 0; i < counts.length; i++) {
final int num = counts[i];
result[i] = new CPUTF8[num];
- System.arraycopy(refs, pos, result[i], 0, num);
+ System.arraycopy(result1, pos, result[i], 0, num);
pos += num;
}
return result;
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/ClassBands.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/ClassBands.java
index 46d67fe8..13bb1af7 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/ClassBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/ClassBands.java
@@ -226,10 +226,8 @@ public class ClassBands extends BandSet {
}
}
- final int backwardsCallsUsed = parseFieldMetadataBands(in, fieldAttrCalls);
-
// Parse non-predefined attribute bands
- int backwardsCallIndex = backwardsCallsUsed;
+ int backwardsCallIndex = parseFieldMetadataBands(in, fieldAttrCalls);
final int limit = options.hasFieldFlagsHi() ? 62 : 31;
final AttributeLayout[] otherLayouts = new AttributeLayout[limit + 1];
final int[] counts = new int[limit + 1];
@@ -352,11 +350,8 @@ public class ClassBands extends BandSet {
}
}
- // Parse method metadata bands
- final int backwardsCallsUsed = parseMethodMetadataBands(in, methodAttrCalls);
-
// Parse non-predefined attribute bands
- int backwardsCallIndex = backwardsCallsUsed;
+ int backwardsCallIndex = parseMethodMetadataBands(in, methodAttrCalls);
final int limit = options.hasMethodFlagsHi() ? 62 : 31;
final AttributeLayout[] otherLayouts = new AttributeLayout[limit + 1];
final int[] counts = new int[limit + 1];
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 87ca5c1c..34119243 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
@@ -154,13 +154,12 @@ public class SegmentConstantPool {
public ConstantPoolEntry getInitMethodPoolEntry(final int cp, final long value, final String desiredClassName)
throws Pack200Exception {
int realIndex = -1;
- final String desiredRegex = REGEX_MATCH_INIT;
if (cp != CP_METHOD) {
// TODO really an error?
throw new Error("Nothing but CP_METHOD can be an <init>");
}
realIndex = matchSpecificPoolEntryIndex(bands.getCpMethodClass(), bands.getCpMethodDescriptor(),
- desiredClassName, desiredRegex, (int) value);
+ desiredClassName, REGEX_MATCH_INIT, (int) value);
return getConstantPoolEntry(cp, realIndex);
}
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
index e0fae219..4dd9ced4 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
@@ -34,8 +34,7 @@ public class NewInitMethodRefForm extends InitMethodReferenceForm {
@Override
protected String context(final OperandManager operandManager) {
- final String result = operandManager.getNewClass();
- return result;
+ return operandManager.getNewClass();
}
@Override