mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 20:43:02 +01:00
Use correct English.
This commit is contained in:
parent
2dbc3e9709
commit
b02d70c8fd
@ -460,7 +460,7 @@ bool IntlManager::initialize()
|
||||
ModuleLoader::Module* mod = ModuleLoader::loadModule(filename);
|
||||
if (!mod)
|
||||
{
|
||||
ModuleLoader::doctorModuleExtention(filename);
|
||||
ModuleLoader::doctorModuleExtension(filename);
|
||||
mod = ModuleLoader::loadModule(filename);
|
||||
}
|
||||
if (mod)
|
||||
|
@ -192,7 +192,7 @@ PluginImpl* PluginManager::getPlugin(const string& name)
|
||||
|
||||
if (!module)
|
||||
{
|
||||
ModuleLoader::doctorModuleExtention(plugin->filename);
|
||||
ModuleLoader::doctorModuleExtension(plugin->filename);
|
||||
module = ModuleLoader::loadModule(plugin->filename);
|
||||
}
|
||||
|
||||
|
@ -101,7 +101,7 @@ namespace
|
||||
|
||||
bool tryLibrary(PathName libName, string& message)
|
||||
{
|
||||
ModuleLoader::doctorModuleExtention(libName);
|
||||
ModuleLoader::doctorModuleExtension(libName);
|
||||
|
||||
ModuleLoader::Module* module = ModuleLoader::loadModule(libName);
|
||||
if (!module)
|
||||
|
@ -67,7 +67,7 @@ bool ModuleLoader::isLoadableModule(const Firebird::PathName& module)
|
||||
return true;
|
||||
}
|
||||
|
||||
void ModuleLoader::doctorModuleExtention(Firebird::PathName& name)
|
||||
void ModuleLoader::doctorModuleExtension(Firebird::PathName& name)
|
||||
{
|
||||
Firebird::PathName::size_type pos = name.rfind(".dylib");
|
||||
if (pos != Firebird::PathName::npos && pos == name.length() - 6)
|
||||
|
@ -89,13 +89,13 @@ public:
|
||||
**/
|
||||
static Module* loadModule(const Firebird::PathName&);
|
||||
|
||||
/** doctorModuleExtention modifies the given path name to add the platform
|
||||
/** doctorModuleExtension modifies the given path name to add the platform
|
||||
specific module extention. This allows the user to provide the root name
|
||||
of the file, and the code to append the correct extention regardless of the
|
||||
host operating system. This function is typically called after a failed attempt
|
||||
to load the module without the extention.
|
||||
**/
|
||||
static void doctorModuleExtention(Firebird::PathName&);
|
||||
static void doctorModuleExtension(Firebird::PathName&);
|
||||
|
||||
/** isLoadableModule checks the given file to see if it is a loadable
|
||||
module. This function is required because different operating
|
||||
|
@ -63,7 +63,7 @@ bool ModuleLoader::isLoadableModule(const Firebird::PathName& module)
|
||||
return true;
|
||||
}
|
||||
|
||||
void ModuleLoader::doctorModuleExtention(Firebird::PathName& name)
|
||||
void ModuleLoader::doctorModuleExtension(Firebird::PathName& name)
|
||||
{
|
||||
if (name.isEmpty())
|
||||
return;
|
||||
|
@ -167,7 +167,7 @@ bool ModuleLoader::isLoadableModule(const PathName& module)
|
||||
return hMod != 0;
|
||||
}
|
||||
|
||||
void ModuleLoader::doctorModuleExtention(Firebird::PathName& name)
|
||||
void ModuleLoader::doctorModuleExtension(Firebird::PathName& name)
|
||||
{
|
||||
const PathName::size_type pos = name.rfind(".dll");
|
||||
if (pos != PathName::npos && pos == name.length() - 4)
|
||||
|
@ -803,7 +803,7 @@ UnicodeUtil::ICU* UnicodeUtil::loadICU(const Firebird::string& icuVersion,
|
||||
icu->ucModule = ModuleLoader::loadModule(filename);
|
||||
if (!icu->ucModule)
|
||||
{
|
||||
ModuleLoader::doctorModuleExtention(filename);
|
||||
ModuleLoader::doctorModuleExtension(filename);
|
||||
icu->ucModule = ModuleLoader::loadModule(filename);
|
||||
}
|
||||
|
||||
@ -818,7 +818,7 @@ UnicodeUtil::ICU* UnicodeUtil::loadICU(const Firebird::string& icuVersion,
|
||||
icu->inModule = ModuleLoader::loadModule(filename);
|
||||
if (!icu->inModule)
|
||||
{
|
||||
ModuleLoader::doctorModuleExtention(filename);
|
||||
ModuleLoader::doctorModuleExtension(filename);
|
||||
icu->inModule = ModuleLoader::loadModule(filename);
|
||||
}
|
||||
|
||||
|
@ -543,7 +543,7 @@ void Engine::loadModule(const string& str, PathName* moduleName, string* entryPo
|
||||
ModuleLoader::Module* module = ModuleLoader::loadModule(path);
|
||||
if (!module)
|
||||
{
|
||||
ModuleLoader::doctorModuleExtention(path);
|
||||
ModuleLoader::doctorModuleExtension(path);
|
||||
module = ModuleLoader::loadModule(path);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user