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

Misc.

Browse Source
This commit is contained in:
asfernandes 2011-06-15 00:47:19 +00:00
parent 18ef64b242
commit 9c84e1a03f
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/classes/GetPlugins.h
View File

@ -42,8 +42,9 @@ public:
GetPlugins(unsigned int interfaceType, unsigned int desiredVersion,
UpgradeInfo* ui, const char* namesList = NULL)
: masterInterface(), pluginInterface(masterInterface),
pluginSet(pluginInterface->getPlugins(interfaceType, namesList ? namesList : Config::getPlugins(interfaceType),
desiredVersion, ui, NULL)),
pluginSet(pluginInterface->getPlugins(interfaceType,
namesList ? namesList : Config::getPlugins(interfaceType),
desiredVersion, ui, NULL)),
currentPlugin(NULL)
{
pluginSet->release();
@ -53,8 +54,9 @@ public:
GetPlugins(unsigned int interfaceType, unsigned int desiredVersion, UpgradeInfo* ui,
Config* knownConfig, const char* namesList = NULL)
: masterInterface(), pluginInterface(masterInterface),
pluginSet(pluginInterface->getPlugins(interfaceType, namesList ? namesList : Config::getPlugins(interfaceType),
desiredVersion, ui, new FirebirdConf(knownConfig))),
pluginSet(pluginInterface->getPlugins(interfaceType,
namesList ? namesList : Config::getPlugins(interfaceType),
desiredVersion, ui, new FirebirdConf(knownConfig))),
currentPlugin(NULL)
{
pluginSet->release();

2
src/common/classes/alloc.cpp
View File

@ -600,7 +600,7 @@ void MemoryPool::releaseBlock(MemBlock *block) throw ()
}
int slot = length / roundingSize;
void *next = freeObjects[slot];
void* next = freeObjects[slot];
block->pool = (MemoryPool*) next;
freeObjects[slot] = block;

2
src/utilities/ntrace/traceplugin.cpp
View File

@ -96,7 +96,7 @@ TracePlugin* FB_CARG TraceFactoryImpl::trace_create(Firebird::IStatus* status, T
return new TracePluginImpl(config, initInfo); // Everything is ok, we created a plugin
}
catch(Firebird::Exception& ex)
catch (Firebird::Exception& ex)
{
// put error into trace log
TraceLogWriter* logWriter = initInfo->getLogWriter();

16
src/yvalve/MasterImplementation.cpp
View File

@ -220,20 +220,20 @@ void releaseUpgradeTabs(IPluginModule* module)
WriteLockGuard sync(mapLock);
GenericMap<FunctionPair>::Accessor scan(&functionMap);
if (scan.getFirst()) do
if (scan.getFirst())
{
UpgradeKey& cur(scan.current()->first);
if (cur.contains(module))
do
{
removeList.add(cur);
}
UpgradeKey& cur(scan.current()->first);
if (cur.contains(module))
removeList.add(cur);
} while (scan.getNext());
}
while (scan.getNext());
for(unsigned int i = 0; i < removeList.getCount(); ++i)
{
functionMap->remove(removeList[i]);
}
}
} // namespace Why

3
src/yvalve/PluginManager.cpp
View File

@ -910,8 +910,7 @@ IPluginSet* FB_CARG PluginManager::getPlugins(unsigned int interfaceType, const
{
MutexLockGuard g(plugins->mutex);
IPluginSet* rc = new PluginSet(interfaceType, namesList, desiredVersion,
ui, firebirdConf);
IPluginSet* rc = new PluginSet(interfaceType, namesList, desiredVersion, ui, firebirdConf);
rc->addRef();
return rc;
}