yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +02:00
Code Issues Releases Wiki Activity

Merge branch 'GP-0_ryanmkurtz_PR-7510_sethcg_fix-warning'

Browse source
This commit is contained in:
Ryan Kurtz 2025-02-20 13:10:05 -05:00
commit 93c2a52653
4 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/EntryPointAnalyzer.java
View file

@ -297,7 +297,7 @@ public class EntryPointAnalyzer extends AbstractAnalyzer {
Listing listing = program.getListing(); Listing listing = program.getListing();
SymbolTable symbolTable = program.getSymbolTable(); SymbolTable symbolTable = program.getSymbolTable();
Set<Address> indirectSet = new HashSet(); Set<Address> indirectSet = new HashSet<>();
Iterator<Address> iter = doNowSet.iterator(); Iterator<Address> iter = doNowSet.iterator();
while (iter.hasNext()) { while (iter.hasNext()) {

3
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/attribs/DWARFAttributeDef.java
View file

@ -148,10 +148,9 @@ public class DWARFAttributeDef<E extends Enum<E>> {
if (this == obj) { if (this == obj) {
return true; return true;
} }
if (!(obj instanceof DWARFAttributeDef)) { if (!(obj instanceof DWARFAttributeDef other)) {
return false; return false;
} }
DWARFAttributeDef other = (DWARFAttributeDef) obj;
return attributeForm == other.attributeForm && return attributeForm == other.attributeForm &&
Objects.equals(attributeId, other.attributeId) && Objects.equals(attributeId, other.attributeId) &&
implicitValue == other.implicitValue && rawAttributeId == other.rawAttributeId; implicitValue == other.implicitValue && rawAttributeId == other.rawAttributeId;

2
Ghidra/Features/Base/src/main/java/ghidra/app/util/cparser/CPP/DefineTable.java
View file

@ -787,7 +787,7 @@ public class DefineTable {
// //
String strValue = getValue(defName); String strValue = getValue(defName);
ArrayList<String> list = new ArrayList(); ArrayList<String> list = new ArrayList<>();
list.add(defName); list.add(defName);
String strExpanded = expand(strValue, true, list); String strExpanded = expand(strValue, true, list);

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/utils/WeakHashMap2.java
View file

@ -58,7 +58,7 @@ public class WeakHashMap2<K, V> extends AbstractMap<K, V> {
return false; return false;
} }
WeakValue other = (WeakValue) o; WeakValue<?> other = (WeakValue<?>) o;
return get() == other.get(); return get() == other.get();
} }
@ -231,7 +231,7 @@ public class WeakHashMap2<K, V> extends AbstractMap<K, V> {
} }
public K reverseGet(V value) { public K reverseGet(V value) {
WeakValue v = WeakValue.create(value, queue); WeakValue<V> v = WeakValue.create(value, queue);
return reverseHash.get(v); return reverseHash.get(v);
} }