yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

GP-0: Fixing unnecessary semicolon warnings

Browse source
This commit is contained in:
Ryan Kurtz 2025-05-30 06:46:11 -04:00
parent 5fe25f1cfd
commit 2e0c098c25
21 changed files with 43 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/breakpoint/LogicalBreakpoint.java
View file

@ -540,7 +540,7 @@ public interface LogicalBreakpoint {
Mode mode = this.mode.sameAddress(that.mode); Mode mode = this.mode.sameAddress(that.mode);
Consistency consistency = this.consistency.sameAddress(that.consistency); Consistency consistency = this.consistency.sameAddress(that.consistency);
return fromFields(mode, consistency); return fromFields(mode, consistency);
}; }
/** /**
* For logical breakpoints which appear at the same address, compose their state * For logical breakpoints which appear at the same address, compose their state

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/DebuggerEmulationServicePlugin.java
View file

@ -498,7 +498,7 @@ public class DebuggerEmulationServicePlugin extends Plugin implements DebuggerEm
/*TraceMemoryRegion region = current.getTrace() /*TraceMemoryRegion region = current.getTrace()
.getMemoryManager() .getMemoryManager()
.getRegionContaining(current.getSnap(), traceLoc.getAddress()); .getRegionContaining(current.getSnap(), traceLoc.getAddress());
return region != null && region.isExecute()*/; return region != null && region.isExecute();*/
return true; return true;
} }

2
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java
View file

@ -75,7 +75,7 @@ public abstract class AbstractBaseDBTraceDefinedUnitsView<T extends AbstractDBTr
ensureInCachedRange(key.snap, key.addr); ensureInCachedRange(key.snap, key.addr);
return getFirstInRangeCacheContaining(key); return getFirstInRangeCacheContaining(key);
} }
}; }
/** /**
* Cache for optimizing {@link AbstractBaseDBTraceDefinedUnitsView#getFloor(long, Address)} and * Cache for optimizing {@link AbstractBaseDBTraceDefinedUnitsView#getFloor(long, Address)} and

2
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/map/AbstractDBTraceAddressSnapRangePropertyMapOcclusionIterable.java
View file

@ -52,7 +52,7 @@ public abstract class AbstractDBTraceAddressSnapRangePropertyMapOcclusionIterabl
return new PeekableIterator<>() { return new PeekableIterator<>() {
protected Address address = within.getX1(); protected Address address = within.getX1();
protected boolean soughtNext = false; protected boolean soughtNext = false;
protected Entry<TraceAddressSnapRange, T> next = null;; protected Entry<TraceAddressSnapRange, T> next = null;
private void checkSeekNext() { private void checkSeekNext() {
if (soughtNext) { if (soughtNext) {

2
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramView.java
View file

@ -680,7 +680,7 @@ public class DBTraceProgramView implements TraceProgramView {
protected final DomainObjectEventQueues eventQueues; protected final DomainObjectEventQueues eventQueues;
protected EventTranslator eventTranslator; protected EventTranslator eventTranslator;
private volatile boolean allAddressesValid; private volatile boolean allAddressesValid;
private volatile AddressSetView allAddresses;; private volatile AddressSetView allAddresses;
protected final DBTraceProgramViewBookmarkManager bookmarkManager; protected final DBTraceProgramViewBookmarkManager bookmarkManager;
protected final DBTraceProgramViewEquateTable equateTable; protected final DBTraceProgramViewEquateTable equateTable;

2
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/target/path/PathFilter.java
View file

@ -117,7 +117,7 @@ public interface PathFilter {
<T> ListIterator<T> iterator(T[] arr) { <T> ListIterator<T> iterator(T[] arr) {
return iterator(Arrays.asList(arr)); return iterator(Arrays.asList(arr));
}; }
} }
static boolean keyMatches(String pat, String key) { static boolean keyMatches(String pat, String key) {

2
Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/SimilarStartRowObject.java
View file

@ -24,4 +24,4 @@ import ghidra.program.model.address.Address;
* @param numAgreements number of agreeing trees * @param numAgreements number of agreeing trees
*/ */
public record SimilarStartRowObject(Address funcStart, int numAgreements) { public record SimilarStartRowObject(Address funcStart, int numAgreements) {
}; }

1
Ghidra/Features/Base/src/main/java/ghidra/program/util/VarnodeContext.java
View file

@ -634,7 +634,6 @@ public class VarnodeContext implements ProcessorContext {
stateLayer = null; stateLayer = null;
layer--; layer--;
} }
;
if (stateLayer == null) { if (stateLayer == null) {
return null; return null;

2
Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/gui/ClosedPatternTableModel.java
View file

@ -62,7 +62,7 @@ public class ClosedPatternTableModel extends ThreadedTableModelStub<ClosedPatter
Component component = super.getTableCellRendererComponent(data); Component component = super.getTableCellRendererComponent(data);
component.setFont(Gui.getFont(FONT_ID)); component.setFont(Gui.getFont(FONT_ID));
return component; return component;
}; }
@Override @Override
public String getFilterString(String t, Settings settings) { public String getFilterString(String t, Settings settings) {

2
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/art/image_sections/ImageSections_Oreo.java
View file

@ -47,7 +47,7 @@ public class ImageSections_Oreo extends ArtImageSections {
kSectionClassTable, kSectionClassTable,
kSectionImageBitmap, kSectionImageBitmap,
kSectionCount, // Number of elements in enum. kSectionCount, // Number of elements in enum.
}; }
public ImageSections_Oreo(BinaryReader reader, ArtHeader header) { public ImageSections_Oreo(BinaryReader reader, ArtHeader header) {
super(reader, header); super(reader, header);

10
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/fbpk/v2/FBPKv2.java
View file

@ -20,12 +20,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import ghidra.app.util.bin.BinaryReader; import ghidra.app.util.bin.BinaryReader;
import ghidra.file.formats.android.fbpk.FBPK; import ghidra.file.formats.android.fbpk.*;
import ghidra.file.formats.android.fbpk.FBPK_Constants; import ghidra.program.model.data.*;
import ghidra.file.formats.android.fbpk.FBPK_Partition;
import ghidra.program.model.data.DataType;
import ghidra.program.model.data.Structure;
import ghidra.program.model.data.StructureDataType;
import ghidra.util.exception.DuplicateNameException; import ghidra.util.exception.DuplicateNameException;
public class FBPKv2 implements FBPK { public class FBPKv2 implements FBPK {
@ -98,7 +94,7 @@ public class FBPKv2 implements FBPK {
public String getString2() { public String getString2() {
return string2; return string2;
}; }
@Override @Override
public DataType toDataType() throws DuplicateNameException, IOException { public DataType toDataType() throws DuplicateNameException, IOException {

2
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/bundle/OatBundle.java
View file

@ -30,7 +30,7 @@ public interface OatBundle {
public enum HeaderType { public enum HeaderType {
ART, CDEX, DEX, VDEX, ART, CDEX, DEX, VDEX,
}; }
public static final String APK = ".apk"; public static final String APK = ".apk";
public static final String ART = ".art"; public static final String ART = ".art";

2
Ghidra/Features/SystemEmulation/src/main/java/ghidra/pcode/emu/unix/AbstractEmuUnixSyscallUseropLibrary.java
View file

@ -364,7 +364,7 @@ public abstract class AbstractEmuUnixSyscallUseropLibrary<T>
types("int", "void *", "size_t")); types("int", "void *", "size_t"));
/** "Extern" declaration of {@code unix_write} */ /** "Extern" declaration of {@code unix_write} */
final UseropDecl unix_write = userop(type("size_t"), "unix_write", final UseropDecl unix_write = userop(type("size_t"), "unix_write",
types("int", "void *", "size_t"));; types("int", "void *", "size_t"));
/** /**
* Inline the gather or scatter pattern for an iovec syscall * Inline the gather or scatter pattern for an iovec syscall

5
Ghidra/Features/SystemEmulation/src/test/java/ghidra/pcode/struct/sub/StructuredSleighTest.java
View file

@ -15,8 +15,7 @@
*/ */
package ghidra.pcode.struct.sub; package ghidra.pcode.struct.sub;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.*;
import static org.junit.Assert.assertTrue;
import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodHandles.Lookup; import java.lang.invoke.MethodHandles.Lookup;
@ -82,7 +81,7 @@ public class StructuredSleighTest extends AbstractGhidraHeadlessIntegrationTest
@Test @Test
public void testUseRegister() throws Exception { public void testUseRegister() throws Exception {
StructuredSleigh ss = new TestStructuredSleigh() { StructuredSleigh ss = new TestStructuredSleigh() {
final Var vR0 = reg(r0, type("int"));; final Var vR0 = reg(r0, type("int"));
@StructuredUserop(type = "int") @StructuredUserop(type = "int")
public void my_userop() { public void my_userop() {

13
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/util/VTOptionDefines.java
View file

@ -15,16 +15,7 @@
*/ */
package ghidra.feature.vt.gui.util; package ghidra.feature.vt.gui.util;
import ghidra.feature.vt.gui.util.VTMatchApplyChoices.CallingConventionChoices; import ghidra.feature.vt.gui.util.VTMatchApplyChoices.*;
import ghidra.feature.vt.gui.util.VTMatchApplyChoices.CommentChoices;
import ghidra.feature.vt.gui.util.VTMatchApplyChoices.FunctionNameChoices;
import ghidra.feature.vt.gui.util.VTMatchApplyChoices.FunctionSignatureChoices;
import ghidra.feature.vt.gui.util.VTMatchApplyChoices.HighestSourcePriorityChoices;
import ghidra.feature.vt.gui.util.VTMatchApplyChoices.LabelChoices;
import ghidra.feature.vt.gui.util.VTMatchApplyChoices.ParameterDataTypeChoices;
import ghidra.feature.vt.gui.util.VTMatchApplyChoices.ReplaceChoices;
import ghidra.feature.vt.gui.util.VTMatchApplyChoices.ReplaceDataChoices;
import ghidra.feature.vt.gui.util.VTMatchApplyChoices.SourcePriorityChoices;
import ghidra.framework.options.Options; import ghidra.framework.options.Options;
public class VTOptionDefines { public class VTOptionDefines {
@ -200,7 +191,7 @@ public class VTOptionDefines {
"Duplicate Function Correlator Minimum Function Length"; "Duplicate Function Correlator Minimum Function Length";
public static final String DUPE_FUNCTION_CORRELATOR_MIN_LEN_OPTION = public static final String DUPE_FUNCTION_CORRELATOR_MIN_LEN_OPTION =
AUTO_VT_OPTIONS_NAME + "." + AUTO_VT_DUPLICATE_FUNCTION_CORRELATOR + AUTO_VT_OPTIONS_NAME + "." + AUTO_VT_DUPLICATE_FUNCTION_CORRELATOR +
"." + DUPE_FUNCTION_CORRELATOR_MIN_LEN_OPTION_TEXT;; "." + DUPE_FUNCTION_CORRELATOR_MIN_LEN_OPTION_TEXT;
public static final String REF_CORRELATOR_MIN_SCORE_OPTION_TEXT = public static final String REF_CORRELATOR_MIN_SCORE_OPTION_TEXT =
"Reference Correlators Minimum Score"; "Reference Correlators Minimum Score";

1
Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/PcodeMachine.java
View file

@ -72,7 +72,6 @@ public interface PcodeMachine<T> {
private AccessKind(boolean trapsRead, boolean trapsWrite) { private AccessKind(boolean trapsRead, boolean trapsWrite) {
this.trapsRead = trapsRead; this.trapsRead = trapsRead;
this.trapsWrite = trapsWrite; this.trapsWrite = trapsWrite;
;
} }
/** /**

2
Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/decode/DecoderForOneStride.java
View file

@ -77,7 +77,7 @@ public class DecoderForOneStride {
private final AddrCtx start; private final AddrCtx start;
final List<Instruction> instructions = new ArrayList<>(); final List<Instruction> instructions = new ArrayList<>();
final List<PcodeOp> opsForStride = new ArrayList<>();; final List<PcodeOp> opsForStride = new ArrayList<>();
/** /**
* Construct a stride decoder * Construct a stride decoder

2
Ghidra/Framework/Help/src/main/java/help/PathKey.java
View file

@ -31,7 +31,7 @@ public class PathKey {
} }
public PathKey(String path) { public PathKey(String path) {
Objects.requireNonNull(path, "Path cannot be null");; Objects.requireNonNull(path, "Path cannot be null");
this.path = path.replace('\\', '/'); this.path = path.replace('\\', '/');
} }

2
Ghidra/Processors/ARM/src/test.slow/java/ghidra/app/plugin/core/analysis/ArmBranchReturnDetectionTest.java
View file

@ -91,7 +91,7 @@ public class ArmBranchReturnDetectionTest extends AbstractGhidraHeadedIntegratio
builder.disassemble("0x00015d9c", 27, true); builder.disassemble("0x00015d9c", 27, true);
builder.createFunction("0x00015d9c"); builder.createFunction("0x00015d9c");
builder.createLabel("0x00015d9c", "func1");; builder.createLabel("0x00015d9c", "func1");
program = builder.getProgram(); program = builder.getProgram();

1
Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/java/rmi/JavaMethodsTest.java
View file

@ -655,7 +655,6 @@ public class JavaMethodsTest extends AbstractJavaTraceRmiTest {
txPut(conn, "Frames"); txPut(conn, "Frames");
waitForValuesPass("VMs[].Threads[main].Stack[0]._display", waitForValuesPass("VMs[].Threads[main].Stack[0]._display",
pcs -> assertContainsString("checkAccess", pcs.get(0).getValue().toString())); pcs -> assertContainsString("checkAccess", pcs.get(0).getValue().toString()));
;
} }
} }
} }

20
GhidraBuild/BuildFiles/Doclets/src/main/java/ghidra/doclets/typestubs/PythonTypeStubElement.java
View file

@ -16,22 +16,10 @@
package ghidra.doclets.typestubs; package ghidra.doclets.typestubs;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.Arrays; import java.util.*;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import javax.lang.model.element.Element; import javax.lang.model.element.*;
import javax.lang.model.element.Modifier; import javax.lang.model.type.*;
import javax.lang.model.element.Name;
import javax.lang.model.element.PackageElement;
import javax.lang.model.element.QualifiedNameable;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.ArrayType;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.type.WildcardType;
/** /**
* Base class providing access to sanitized names (Python safe). * Base class providing access to sanitized names (Python safe).
@ -313,7 +301,7 @@ abstract class PythonTypeStubElement<T extends Element> {
static void addNeededTypes(Set<TypeElement> imports, TypeMirror type) { static void addNeededTypes(Set<TypeElement> imports, TypeMirror type) {
switch (type.getKind()) { switch (type.getKind()) {
case DECLARED: case DECLARED:
DeclaredType dt = (DeclaredType) type;; DeclaredType dt = (DeclaredType) type;
imports.add((TypeElement) dt.asElement()); imports.add((TypeElement) dt.asElement());
for (TypeMirror genericType : dt.getTypeArguments()) { for (TypeMirror genericType : dt.getTypeArguments()) {
addNeededTypes(imports, genericType); addNeededTypes(imports, genericType);