Ghidra is a software reverse engineering (SRE) framework
GP-1 fixed error message for merging packed structures
ghidragonb75b79b7e319
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/merge/StructureMerger.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/merge/StructureMerger.javaindex 8afc2aba8a..da6993f46c 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/merge/StructureMerger.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/merge/StructureMerger.java@@ -189,7 +189,7 @@ public class StructureMerger extends DataTypeMerger<Structure> {DataType resultDt = workingComp.getDataType();DataType dt = comp.getDataType();if (!resultDt.equals(dt)) {- error("Packed components have conflicting datatypes at ordinal" ++ error("Packed components have conflicting datatypes at ordinal " +workingComp.getOrdinal() + ", offset " + comp.getOffset());}}