Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

src: class Packer decomposition, introduce PackerBase

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2023-08-10 20:40:27 +02:00
parent a66ee9fafd
commit c65c882ecc
8 changed files with 130 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/help.cpp
+7 -8
View File
@@ -103,17 +103,16 @@ struct PackerNames {
size_t names_count;
const Options *o;
PackerNames() : names_count(0), o(nullptr) {}
void add(const Packer *packer) {
void add(const PackerBase *pb) {
assert(names_count < 64);
names[names_count].fname = packer->getFullName(o);
names[names_count].sname = packer->getName();
names[names_count].fname = pb->getFullName(o);
names[names_count].sname = pb->getName();
names_count++;
}
static Packer *visit(Packer *packer, void *user) {
static bool visit(PackerBase *pb, void *user) {
PackerNames *self = (PackerNames *) user;
self->add(packer);
delete packer;
return nullptr;
self->add(pb);
return false;
}
static int __acc_cdecl_qsort cmp_fname(const void *a, const void *b) {
return strcmp(((const Entry *) a)->fname, ((const Entry *) b)->fname);
@@ -129,7 +128,7 @@ static void list_all_packers(FILE *f, int verbose) {
o.reset();
PackerNames pn;
pn.o = &o;
PackMaster::visitAllPackers(PackerNames::visit, nullptr, &o, &pn);
(void) PackMaster::visitAllPackers(PackerNames::visit, nullptr, &o, &pn);
qsort(pn.names, pn.names_count, sizeof(PackerNames::Entry), PackerNames::cmp_fname);
size_t pos = 0;
for (size_t i = 0; i < pn.names_count; ++i) {