From b02d70c8fd726e175f1104df7a187478b080f722 Mon Sep 17 00:00:00 2001 From: robocop Date: Fri, 6 Nov 2009 05:27:22 +0000 Subject: [PATCH] Use correct English. --- src/jrd/IntlManager.cpp | 2 +- src/jrd/PluginManager.cpp | 2 +- src/jrd/fun.epp | 2 +- src/jrd/os/darwin/mod_loader.cpp | 2 +- src/jrd/os/mod_loader.h | 4 ++-- src/jrd/os/posix/mod_loader.cpp | 2 +- src/jrd/os/win32/mod_loader.cpp | 2 +- src/jrd/unicode_util.cpp | 4 ++-- src/plugins/udr_engine/UdrEngine.cpp | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/jrd/IntlManager.cpp b/src/jrd/IntlManager.cpp index de376731aa..111ae447e4 100644 --- a/src/jrd/IntlManager.cpp +++ b/src/jrd/IntlManager.cpp @@ -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) diff --git a/src/jrd/PluginManager.cpp b/src/jrd/PluginManager.cpp index 674d56fc71..105edc679d 100644 --- a/src/jrd/PluginManager.cpp +++ b/src/jrd/PluginManager.cpp @@ -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); } diff --git a/src/jrd/fun.epp b/src/jrd/fun.epp index 67f257f25d..007822e869 100644 --- a/src/jrd/fun.epp +++ b/src/jrd/fun.epp @@ -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) diff --git a/src/jrd/os/darwin/mod_loader.cpp b/src/jrd/os/darwin/mod_loader.cpp index 402990da71..28103b135f 100644 --- a/src/jrd/os/darwin/mod_loader.cpp +++ b/src/jrd/os/darwin/mod_loader.cpp @@ -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) diff --git a/src/jrd/os/mod_loader.h b/src/jrd/os/mod_loader.h index 656bdd92d7..552cde06c8 100644 --- a/src/jrd/os/mod_loader.h +++ b/src/jrd/os/mod_loader.h @@ -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 diff --git a/src/jrd/os/posix/mod_loader.cpp b/src/jrd/os/posix/mod_loader.cpp index 5b520db00a..bc4fb4ed99 100644 --- a/src/jrd/os/posix/mod_loader.cpp +++ b/src/jrd/os/posix/mod_loader.cpp @@ -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; diff --git a/src/jrd/os/win32/mod_loader.cpp b/src/jrd/os/win32/mod_loader.cpp index 91eced8375..c828a52971 100644 --- a/src/jrd/os/win32/mod_loader.cpp +++ b/src/jrd/os/win32/mod_loader.cpp @@ -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) diff --git a/src/jrd/unicode_util.cpp b/src/jrd/unicode_util.cpp index c43b41d19d..b30c2f543f 100644 --- a/src/jrd/unicode_util.cpp +++ b/src/jrd/unicode_util.cpp @@ -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); } diff --git a/src/plugins/udr_engine/UdrEngine.cpp b/src/plugins/udr_engine/UdrEngine.cpp index 1e7f0bd987..1429cb6861 100644 --- a/src/plugins/udr_engine/UdrEngine.cpp +++ b/src/plugins/udr_engine/UdrEngine.cpp @@ -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); }