stop using find.

This commit is contained in:
2025-03-18 03:13:13 -05:00
parent d346ef1802
commit fbfdb66bcb

View File

@@ -48,35 +48,28 @@ bool App::load(std::string lib, std::list<std::string> blacklist = {}) {
Module* m = create(h, App::Get()); Module* m = create(h, App::Get());
if(!blacklist.empty()) { for(auto it = blacklist.begin(); it != blacklist.end(); it++) {
std::cout << "second round!\n"; if(*it == m->getName()) {
for(auto it = blacklist.begin(); it != blacklist.end(); it++) { std::cout << "Module \"" << *it << "\" is already loaded!\n";
if(*it == m->getName()) { delete m;
std::cout << "Module \"" << *it << "\" is already loaded!\n"; dlclose(h);
delete m; return false;
dlclose(h);
return false;
}
} }
std::cout << "not the for loop!\n";
} }
blacklist.push_back(m->getName()); blacklist.push_back(m->getName());
if(!m->deps.empty()) { bool skip = false;
bool skip = false; for(auto it = m->deps.begin(); it != m->deps.end(); it++) {
for(std::string s : blacklist) { for(std::string s : blacklist) {
auto it = m->deps.find(s); if(it->first == s)
if(it != m->deps.end())
skip = true; skip = true;
if(skip) { }
skip = false; if(skip) {
continue; skip = false;
} else { continue;
std::cout << "it->second: " << it->second << std::endl; } else {
load(it->second, blacklist); load(it->second, blacklist);
std::cout << "Gets passed load deps!\n";
}
} }
} }