diff options
Diffstat (limited to 'src/tools/imgtool/modules.cpp')
-rw-r--r-- | src/tools/imgtool/modules.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/tools/imgtool/modules.cpp b/src/tools/imgtool/modules.cpp index 1c573e3bcc9..fb443435a3b 100644 --- a/src/tools/imgtool/modules.cpp +++ b/src/tools/imgtool/modules.cpp @@ -8,7 +8,6 @@ ***************************************************************************/ -#include "imgtool.h" #include "modules.h" #ifndef MODULES_RECURSIVE @@ -29,8 +28,6 @@ static void (*const modules[])(const imgtool_class *imgclass, uint32_t state, un /* step 3: declare imgtool_create_canonical_library() */ imgtoolerr_t imgtool_create_canonical_library(bool omit_untested, std::unique_ptr<imgtool::library> &library) { - size_t i; - /* list of modules that we drop */ static const char *const irrelevant_modules[] = { @@ -42,14 +39,12 @@ imgtoolerr_t imgtool_create_canonical_library(bool omit_untested, std::unique_pt return IMGTOOLERR_OUTOFMEMORY; // create all modules - for (i = 0; i < ARRAY_LENGTH(modules); i++) - library->add(modules[i]); + for (auto &module : modules) + library->add(module); // remove irrelevant modules - for (i = 0; i < ARRAY_LENGTH(irrelevant_modules); i++) - { - library->unlink(irrelevant_modules[i]); - } + for (auto &module : irrelevant_modules) + library->unlink(module); // if we are omitting untested, go through and block out the functionality in question if (omit_untested) @@ -64,7 +59,7 @@ imgtoolerr_t imgtool_create_canonical_library(bool omit_untested, std::unique_pt { module->create = nullptr; module->createimage_optguide = nullptr; - module->createimage_optspec = nullptr; + module->createimage_optspec.clear(); } } } @@ -77,10 +72,9 @@ imgtoolerr_t imgtool_create_canonical_library(bool omit_untested, std::unique_pt MODULE(amiga_floppy) MODULE(concept) -MODULE(mac_mfs) -MODULE(mac_hfs) MODULE(hd) MODULE(rsdos) +MODULE(dgndos) MODULE(vzdos) MODULE(os9) MODULE(ti99_old) @@ -91,8 +85,6 @@ MODULE(ti99_ti99hd) MODULE(ti990) MODULE(pc_floppy) MODULE(pc_chd) -MODULE(prodos_525) -MODULE(prodos_35) MODULE(thom_fd_basic) MODULE(thom_qd_basic) MODULE(thom_sap_basic) |