Skip to content

Commit da7b804

Browse files
committed
[FEATURE] In ExeCommander: chanaged how wrapper size is displayed (no zero padding)
1 parent 46a00af commit da7b804

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

commander/ExeCommander.cpp

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@ void cmd_util::printWrapperNames(MappedExe *exe)
103103
if (wr == NULL || wr->getPtr() == NULL) {
104104
continue;
105105
}
106-
std::cout << "[" << std::dec << i << "] ";
107-
std::cout << exe->getWrapperName(i).toStdString() << std::endl;
106+
std::cout << "[" << std::dec << i << "] "
107+
<< exe->getWrapperName(i).toStdString()
108+
<< std::endl;
108109
}
109110
}
110111

@@ -115,12 +116,11 @@ void cmd_util::dumpEntryInfo(ExeElementWrapper *w)
115116
std::cout << "\n------\n";
116117
size_t fields = w->getFieldsCount();
117118

118-
std::cout << "[" << w->getName().toStdString() << "] ";
119-
std::cout << "size: ";
120-
121-
OUT_PADDED_HEX(std::cout, w->getSize(), sizeof(bufsize_t));
122-
std::cout << " ";
123-
std::cout << "fieldsCount: " << std::dec << fields << "\n" << std::endl;
119+
std::cout << "[" << w->getName().toStdString() << "] "
120+
<< "size: 0x" << std::hex << w->getSize()
121+
<< " "
122+
<< "fieldsCount: " << std::dec << fields << "\n"
123+
<< std::endl;
124124

125125
for (size_t i = 0; i < fields; i++) {
126126
offset_t offset = w->getFieldOffset(i);
@@ -160,7 +160,8 @@ void cmd_util::dumpNodeInfo(ExeNodeWrapper *w)
160160
std::cout << "------" << std::endl;
161161
size_t entriesCnt = w->getEntriesCount();
162162
std::cout << "\t [" << w->getName().toStdString() << "] "
163-
<< "entriesCount: " << std::dec << entriesCnt << std::endl;
163+
<< "entriesCount: " << std::dec << entriesCnt
164+
<< std::endl;
164165

165166
for (size_t i = 0; i < entriesCnt; i++) {
166167
ExeNodeWrapper* entry = w->getEntryAt(i);
@@ -214,10 +215,10 @@ void ConvertAddrCommand::execute(CmdParams *params, CmdContext *context)
214215
std::cout << "[WARNING] This address cannot be mapped" << std::endl;
215216
return;
216217
}
217-
std::cout << "[" << cmd_util::addrTypeToStr(addrFrom) << "]";
218-
std::cout << "\t->\t";
219-
std::cout << "[" << cmd_util::addrTypeToStr(addrTo) << "]";
220-
std::cout << ":\n";
218+
std::cout << "[" << cmd_util::addrTypeToStr(addrFrom) << "]"
219+
<< "\t->\t"
220+
<< "[" << cmd_util::addrTypeToStr(addrTo) << "]"
221+
<< ":\n";
221222
OUT_PADDED_OFFSET(std::cout, offset);
222223
std::cout << "\t->\t";
223224
OUT_PADDED_OFFSET(std::cout, outOffset);

0 commit comments

Comments
 (0)