mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-24 06:43:03 +01:00
Style.
This commit is contained in:
parent
fd7ace4273
commit
b1cd34726c
@ -165,9 +165,7 @@ namespace Jrd
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
FPTR_INT Module::lookup(const TEXT* module,
|
FPTR_INT Module::lookup(const TEXT* module, const TEXT* name, DatabaseModules& interest)
|
||||||
const TEXT* name,
|
|
||||||
DatabaseModules& interest)
|
|
||||||
{
|
{
|
||||||
FPTR_INT function = FUNCTIONS_entrypoint(module, name);
|
FPTR_INT function = FUNCTIONS_entrypoint(module, name);
|
||||||
if (function)
|
if (function)
|
||||||
@ -196,8 +194,7 @@ namespace Jrd
|
|||||||
return (FPTR_INT)rc;
|
return (FPTR_INT)rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
FPTR_INT Module::lookup(const TEXT* module,
|
FPTR_INT Module::lookup(const TEXT* module, const TEXT* name)
|
||||||
const TEXT* name)
|
|
||||||
{
|
{
|
||||||
FPTR_INT function = FUNCTIONS_entrypoint(module, name);
|
FPTR_INT function = FUNCTIONS_entrypoint(module, name);
|
||||||
if (function)
|
if (function)
|
||||||
@ -266,8 +263,7 @@ namespace Jrd
|
|||||||
// Search for module name in UdfAccess restricted
|
// Search for module name in UdfAccess restricted
|
||||||
// paths list
|
// paths list
|
||||||
PathUtils::splitLastComponent(path, relative, fixedModule);
|
PathUtils::splitLastComponent(path, relative, fixedModule);
|
||||||
if (path.length() == 0 &&
|
if (path.length() == 0 && PathUtils::isRelative(fixedModule))
|
||||||
PathUtils::isRelative(fixedModule))
|
|
||||||
{
|
{
|
||||||
path = fixedModule;
|
path = fixedModule;
|
||||||
if (! iUdfDirectoryList().expandFileName(fixedModule, path))
|
if (! iUdfDirectoryList().expandFileName(fixedModule, path))
|
||||||
@ -289,8 +285,7 @@ namespace Jrd
|
|||||||
if (mlm)
|
if (mlm)
|
||||||
{
|
{
|
||||||
im = FB_NEW(*getDefaultMemoryPool())
|
im = FB_NEW(*getDefaultMemoryPool())
|
||||||
InternalModule(*getDefaultMemoryPool(), mlm,
|
InternalModule(*getDefaultMemoryPool(), mlm, initialModule, fixedModule);
|
||||||
initialModule, fixedModule);
|
|
||||||
loadedModules().add(im);
|
loadedModules().add(im);
|
||||||
return Module(im);
|
return Module(im);
|
||||||
}
|
}
|
||||||
@ -302,8 +297,7 @@ namespace Jrd
|
|||||||
if (mlm)
|
if (mlm)
|
||||||
{
|
{
|
||||||
im = FB_NEW(*getDefaultMemoryPool())
|
im = FB_NEW(*getDefaultMemoryPool())
|
||||||
InternalModule(*getDefaultMemoryPool(), mlm,
|
InternalModule(*getDefaultMemoryPool(), mlm, initialModule, fixedModule);
|
||||||
initialModule, fixedModule);
|
|
||||||
loadedModules().add(im);
|
loadedModules().add(im);
|
||||||
im->acquire(); // make permanent
|
im->acquire(); // make permanent
|
||||||
return Module(im);
|
return Module(im);
|
||||||
|
Loading…
Reference in New Issue
Block a user