thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PLUGINS: Cleanup includes and debug output.

Browse source 
Use the common debug functions instead of spamming #defines.

svn-id: r52547
This commit is contained in:
Andre Heider 2010-09-05 12:37:36 +00:00
parent 2c746709aa
commit 07e3a42224
10 changed files with 100 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

13
backends/plugins/elf-provider.cpp
View file

@ -27,9 +27,8 @@
#include "backends/plugins/elf-provider.h"
#include "backends/plugins/dynamic-plugin.h"
#include "common/fs.h"
#include "backends/plugins/elf-loader.h"
#include "common/fs.h"
DynamicPlugin::VoidFunc ELFPlugin::findSymbol(const char *symbol) {
void *func;
@ -42,9 +41,9 @@ DynamicPlugin::VoidFunc ELFPlugin::findSymbol(const char *symbol) {
}
if (!func) {
if (handleNull) {
warning("Failed loading symbol '%s' from plugin '%s' (Handle is NULL)", symbol, _filename.c_str());
warning("elfloader: Failed loading symbol '%s' from plugin '%s' (Handle is NULL)", symbol, _filename.c_str());
} else {
warning("Failed loading symbol '%s' from plugin '%s'", symbol, _filename.c_str());
warning("elfloader: Failed loading symbol '%s' from plugin '%s'", symbol, _filename.c_str());
}
}
@ -69,7 +68,7 @@ bool ELFPlugin::loadPlugin() {
}
if (!_dlHandle) {
warning("Failed loading plugin '%s'", _filename.c_str());
warning("elfloader: Failed loading plugin '%s'", _filename.c_str());
return false;
}
@ -80,13 +79,13 @@ bool ELFPlugin::loadPlugin() {
}
return ret;
};
}
void ELFPlugin::unloadPlugin() {
DynamicPlugin::unloadPlugin();
if (_dlHandle) {
if (!_dlHandle->close()) {
warning("Failed unloading plugin '%s'", _filename.c_str());
warning("elfloader: Failed unloading plugin '%s'", _filename.c_str());
}
delete _dlHandle;
_dlHandle = 0;