firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 23:23:04 +01:00
Code Issues

Constness.

Browse Source
This commit is contained in:
dimitr 2009-03-03 11:49:56 +00:00
parent a32b4494b9
commit 9732cd89a0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/jrd/os/win32/mod_loader.cpp
View File

@ -151,26 +151,25 @@ public:
void *findSymbol(const string&);
private:
HMODULE module;
const HMODULE module;
};
bool ModuleLoader::isLoadableModule(const PathName& module)
{
ContextActivator ctx;
LPCSTR pszName = module.c_str();
HINSTANCE hMod = LoadLibraryEx(pszName, 0,
const HMODULE hMod = LoadLibraryEx(module.c_str(), 0,
LOAD_WITH_ALTERED_SEARCH_PATH | LOAD_LIBRARY_AS_DATAFILE);
if (hMod) {
FreeLibrary((HMODULE)hMod);
FreeLibrary(hMod);
}
return hMod != 0;
}
void ModuleLoader::doctorModuleExtention(Firebird::PathName& name)
{
PathName::size_type pos = name.rfind(".dll");
const PathName::size_type pos = name.rfind(".dll");
if (pos != PathName::npos && pos == name.length() - 4)
return;
name += ".dll";
@ -181,9 +180,10 @@ ModuleLoader::Module *ModuleLoader::loadModule(const Firebird::PathName& modPath
ContextActivator ctx;
// supress error message box if it is not done yet
UINT oldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
const UINT oldErrorMode =
SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
HMODULE module = LoadLibraryEx(modPath.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
const HMODULE module = LoadLibraryEx(modPath.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
// Restore old mode in case we are embedded into user application
SetErrorMode(oldErrorMode);