From b75b79b7e3191fabec86860fb116805fbaec3efe Mon Sep 17 00:00:00 2001 From: ghidragon <106987263+ghidragon@users.noreply.github.com> Date: Wed, 4 Mar 2026 12:00:21 -0500 Subject: [PATCH] GP-1 fixed error message for merging packed structures --- .../ghidra/program/database/data/merge/StructureMerger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.java index 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 { 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()); } }