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

Merge remote-tracking branch 'origin/GP-301_ghidra1_PDB_FuncDefDedupe'

Browse source 
into Ghidra_9.2

Conflicts:
	Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CompositeTypeApplier.java
This commit is contained in:
ghidra1 2020-11-02 16:27:50 -05:00
commit ada1bbec85
7 changed files with 156 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataType.java
View file

@ -124,6 +124,9 @@ public interface DataType {
* Sets the name of the dataType
* @param name the new name for this dataType.
* @throws InvalidNameException if the given name does not form a valid name.
* @throws DuplicateNameException if name change on stored {@link DataType}
* is a duplicate of another datatype within the same category (only applies to
* DB stored {@link DataType}).
*/
public void setName(String name) throws InvalidNameException, DuplicateNameException;
@ -132,7 +135,9 @@ public interface DataType {
* @param path the new category path.
* @param name the new name
* @throws InvalidNameException if the name is invalid
* @throws DuplicateNameException if a dataType already exists with that name and
* @throws DuplicateNameException if name change on stored {@link DataType}
* is a duplicate of another datatype within the same category (only applies to
* DB stored {@link DataType}).
*/
public void setNameAndCategory(CategoryPath path, String name)
throws InvalidNameException, DuplicateNameException;

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataUtilities.java
View file

@ -37,7 +37,7 @@ public final class DataUtilities {
* @return true if name is valid, else false
*/
public static boolean isValidDataTypeName(String name) {
if (name == null) {
if (name == null || name.length() == 0) {
return false;
}