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

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

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -297,7 +297,7 @@ public class EntryPointAnalyzer extends AbstractAnalyzer {
Listing listing = program.getListing();
SymbolTable symbolTable = program.getSymbolTable();
Set<Address> indirectSet = new HashSet();
Set<Address> indirectSet = new HashSet<>();
Iterator<Address> iter = doNowSet.iterator();
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) {
return true;
}
if (!(obj instanceof DWARFAttributeDef)) {
if (!(obj instanceof DWARFAttributeDef other)) {
return false;
}
DWARFAttributeDef other = (DWARFAttributeDef) obj;
return attributeForm == other.attributeForm &&
Objects.equals(attributeId, other.attributeId) &&
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);
ArrayList<String> list = new ArrayList();
ArrayList<String> list = new ArrayList<>();
list.add(defName);
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;
}
WeakValue other = (WeakValue) o;
WeakValue<?> other = (WeakValue<?>) o;
return get() == other.get();
}
@ -231,7 +231,7 @@ public class WeakHashMap2<K, V> extends AbstractMap<K, V> {
}
public K reverseGet(V value) {
WeakValue v = WeakValue.create(value, queue);
WeakValue<V> v = WeakValue.create(value, queue);
return reverseHash.get(v);
}