dealt with FIXME comments: removing superfluous checks, printfs, etc.
svn-id: r51765
This commit is contained in:
parent
cade67be4f
commit
d1deaedc1a
1 changed files with 2 additions and 13 deletions
|
@ -99,15 +99,9 @@ public:
|
||||||
void unloadPlugin() {
|
void unloadPlugin() {
|
||||||
DynamicPlugin::unloadPlugin();
|
DynamicPlugin::unloadPlugin();
|
||||||
if (_dlHandle) {
|
if (_dlHandle) {
|
||||||
if (_dlHandle == NULL) {
|
|
||||||
// FIXME: This check makes no sense, _dlHandle cannot be NULL at this point
|
|
||||||
warning("Failed unloading plugin '%s' (Handle is NULL)", _filename.c_str());
|
|
||||||
} else if (_dlHandle->close()) {
|
|
||||||
delete _dlHandle;
|
delete _dlHandle;
|
||||||
} else {
|
if (!_dlHandle->close()) {
|
||||||
warning("Failed unloading plugin '%s'", _filename.c_str());
|
warning("Failed unloading plugin '%s'", _filename.c_str());
|
||||||
// FIXME: We are leaking _dlHandle here!
|
|
||||||
// Any particular reasons why we would want to do that???
|
|
||||||
}
|
}
|
||||||
_dlHandle = 0;
|
_dlHandle = 0;
|
||||||
}
|
}
|
||||||
|
@ -121,15 +115,10 @@ Plugin* ELFPluginProvider::createPlugin(const Common::FSNode &node) const {
|
||||||
|
|
||||||
bool ELFPluginProvider::isPluginFilename(const Common::FSNode &node) const {
|
bool ELFPluginProvider::isPluginFilename(const Common::FSNode &node) const {
|
||||||
// Check the plugin suffix
|
// Check the plugin suffix
|
||||||
// FIXME: Do we need these printfs? Should get rid of them eventually.
|
|
||||||
Common::String filename = node.getName();
|
Common::String filename = node.getName();
|
||||||
printf("Testing name %s", filename.c_str());
|
|
||||||
if (!filename.hasSuffix(".PLG") && !filename.hasSuffix(".plg") && !filename.hasSuffix(".PLUGIN") && !filename.hasSuffix(".plugin")) {
|
if (!filename.hasSuffix(".PLG") && !filename.hasSuffix(".plg") && !filename.hasSuffix(".PLUGIN") && !filename.hasSuffix(".plugin")) {
|
||||||
printf(" fail.\n");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
printf(" success!\n");
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue