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

GT-2187 - tweak error messages

Browse source
This commit is contained in:
dev747368 2019-07-02 11:45:56 -04:00 • committed by ghidra1
parent 36ba29555b
commit 286d2a6258
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFDataTypeImporter.java
View file

@ -895,11 +895,10 @@ public class DWARFDataTypeImporter {
private static String memberDesc(String prefix, String errorStr, String memberName,
DWARFDataType ddt, int memberOffset, int bitSize, int bitOffset) {
boolean isBitField = (bitSize != -1 && bitOffset != -1);
return (!StringUtils.isBlank(prefix) ? prefix + " " : "") + memberName + " : " +
ddt.dataType.getName() + (isBitField ? ":" + bitSize : "") + " at offset " +
ddt.dataType.getName() + (bitSize != -1 ? ":" + bitSize : "") + " at offset " +
(memberOffset != -1 ? "0x" + Long.toHexString(memberOffset) : "unknown") +
(isBitField ? ":" + bitOffset : "") +
(bitOffset != -1 ? ":" + bitOffset : "") +
(!StringUtils.isBlank(errorStr) ? " [" + errorStr + "]" : "");
}