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

Misc.

Browse Source
This commit is contained in:
asfernandes 2015-01-15 01:17:27 +00:00
parent 509c832bac
commit 2a857cb415
36 changed files with 170 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/auth/AuthDbg.h
View File

@ -46,7 +46,8 @@ namespace Auth {
// The idea of debug plugin is to send some data from server to client,
// modify them on client and return result (which becomes login name) to the server
class DebugServer FB_FINAL : public Firebird::StdPlugin<Firebird::IServerImpl<DebugServer, Firebird::CheckStatusWrapper> >
class DebugServer FB_FINAL :
public Firebird::StdPlugin<Firebird::IServerImpl<DebugServer, Firebird::CheckStatusWrapper> >
{
public:
explicit DebugServer(Firebird::IPluginConfig*);
@ -60,7 +61,8 @@ private:
Firebird::RefPtr<Firebird::IConfig> config;
};
class DebugClient FB_FINAL : public Firebird::StdPlugin<Firebird::IClientImpl<DebugClient, Firebird::CheckStatusWrapper> >
class DebugClient FB_FINAL :
public Firebird::StdPlugin<Firebird::IClientImpl<DebugClient, Firebird::CheckStatusWrapper> >
{
public:
DebugClient(Firebird::IPluginConfig*);

3
src/auth/SecurityDatabase/LegacyClient.h
View File

@ -35,7 +35,8 @@ namespace Auth {
// Required to stop analyzing rest of plugins before first roundtrip to server
// if legacy login is present in DPB
class SecurityDatabaseClient FB_FINAL : public Firebird::StdPlugin<Firebird::IClientImpl<SecurityDatabaseClient, Firebird::CheckStatusWrapper> >
class SecurityDatabaseClient FB_FINAL :
public Firebird::StdPlugin<Firebird::IClientImpl<SecurityDatabaseClient, Firebird::CheckStatusWrapper> >
{
public:
explicit SecurityDatabaseClient(Firebird::IPluginConfig*)

3
src/auth/SecurityDatabase/LegacyManagement.epp
View File

@ -233,7 +233,8 @@ static inline void strStore(char* to, const char* from, size_t len)
strncpy(to, from, len);
}
int SecurityDatabaseManagement::execute(Firebird::CheckStatusWrapper* st, Firebird::IUser* user, Firebird::IListUsers* callback)
int SecurityDatabaseManagement::execute(Firebird::CheckStatusWrapper* st, Firebird::IUser* user,
Firebird::IListUsers* callback)
{
/*************************************
*

3
src/auth/SecurityDatabase/LegacyManagement.h
View File

@ -33,7 +33,8 @@
namespace Auth {
class SecurityDatabaseManagement FB_FINAL : public Firebird::StdPlugin<Firebird::IManagementImpl<SecurityDatabaseManagement, Firebird::CheckStatusWrapper> >
class SecurityDatabaseManagement FB_FINAL :
public Firebird::StdPlugin<Firebird::IManagementImpl<SecurityDatabaseManagement, Firebird::CheckStatusWrapper> >
{
public:
explicit SecurityDatabaseManagement(Firebird::IPluginConfig* par);

6
src/auth/SecurityDatabase/LegacyServer.cpp
View File

@ -123,7 +123,8 @@ const UCHAR TPB[4] =
namespace Auth {
class SecurityDatabaseServer FB_FINAL : public StdPlugin<IServerImpl<SecurityDatabaseServer, CheckStatusWrapper> >
class SecurityDatabaseServer FB_FINAL :
public StdPlugin<IServerImpl<SecurityDatabaseServer, CheckStatusWrapper> >
{
public:
explicit SecurityDatabaseServer(Firebird::IPluginConfig* p)
@ -131,7 +132,8 @@ public:
{ }
// IServer implementation
int authenticate(Firebird::CheckStatusWrapper* status, Firebird::IServerBlock* sBlock, Firebird::IWriter* writerInterface);
int authenticate(Firebird::CheckStatusWrapper* status, Firebird::IServerBlock* sBlock,
Firebird::IWriter* writerInterface);
int release();
private:

9
src/auth/trusted/AuthSspi.h
View File

@ -100,11 +100,13 @@ public:
bool getLogin(Firebird::string& login, bool& wh);
};
class WinSspiServer : public Firebird::StdPlugin<Firebird::IServerImpl<WinSspiServer, Firebird::CheckStatusWrapper> >
class WinSspiServer :
public Firebird::StdPlugin<Firebird::IServerImpl<WinSspiServer, Firebird::CheckStatusWrapper> >
{
public:
// IServer implementation
int authenticate(Firebird::CheckStatusWrapper* status, Firebird::IServerBlock* sBlock, Firebird::IWriter* writerInterface);
int authenticate(Firebird::CheckStatusWrapper* status, Firebird::IServerBlock* sBlock,
Firebird::IWriter* writerInterface);
int release();
WinSspiServer(Firebird::IPluginConfig*);
@ -114,7 +116,8 @@ private:
AuthSspi sspi;
};
class WinSspiClient : public Firebird::StdPlugin<Firebird::IClientImpl<WinSspiClient, Firebird::CheckStatusWrapper> >
class WinSspiClient :
public Firebird::StdPlugin<Firebird::IClientImpl<WinSspiClient, Firebird::CheckStatusWrapper> >
{
public:
// IClient implementation

3
src/common/Auth.h
View File

@ -39,7 +39,8 @@
namespace Auth {
class WriterImplementation : public Firebird::AutoIface<Firebird::IWriterImpl<WriterImplementation, Firebird::CheckStatusWrapper> >
class WriterImplementation :
public Firebird::AutoIface<Firebird::IWriterImpl<WriterImplementation, Firebird::CheckStatusWrapper> >
{
public:
WriterImplementation();

3
src/common/MsgMetadata.h
View File

@ -292,7 +292,8 @@ public:
RefPtr<RefCounted> attachment;
};
class MetadataBuilder FB_FINAL : public RefCntIface<IMetadataBuilderImpl<MetadataBuilder, CheckStatusWrapper> >
class MetadataBuilder FB_FINAL :
public RefCntIface<IMetadataBuilderImpl<MetadataBuilder, CheckStatusWrapper> >
{
public:
explicit MetadataBuilder(const MsgMetadata* from);

3
src/common/classes/ImplementHelper.h
View File

@ -265,7 +265,8 @@ public:
// when yvalve is starting fb_shutdown(). This causes almost unavoidable segfault.
// To avoid it this class is added - it detects spontaneous (not by PluginManager)
// module unload and notifies PluginManager about this said fact.
class UnloadDetectorHelper FB_FINAL : public VersionedIface<IPluginModuleImpl<UnloadDetectorHelper, CheckStatusWrapper> >
class UnloadDetectorHelper FB_FINAL :
public VersionedIface<IPluginModuleImpl<UnloadDetectorHelper, CheckStatusWrapper> >
{
public:
typedef void VoidNoParam();

3
src/common/classes/TempFile.h
View File

@ -67,7 +67,8 @@ public:
static PathName getTempPath();
static PathName create(const PathName& prefix, const PathName& directory = "");
static PathName create(CheckStatusWrapper* status, const PathName& prefix, const PathName& directory = "");
static PathName create(CheckStatusWrapper* status, const PathName& prefix,
const PathName& directory = "");
private:
void init(const PathName&, const PathName&);

3
src/common/config/config.h
View File

@ -339,7 +339,8 @@ public:
};
// Implementation of interface to access master configuration file
class FirebirdConf FB_FINAL : public Firebird::RefCntIface<Firebird::IFirebirdConfImpl<FirebirdConf, Firebird::CheckStatusWrapper> >
class FirebirdConf FB_FINAL :
public Firebird::RefCntIface<Firebird::IFirebirdConfImpl<FirebirdConf, Firebird::CheckStatusWrapper> >
{
public:
FirebirdConf(Config* existingConfig)

3
src/common/isc_sync.cpp
View File

@ -952,7 +952,8 @@ static bool make_object_name(TEXT*, size_t, const TEXT*, const TEXT*);
namespace {
class TimerEntry FB_FINAL : public Firebird::RefCntIface<Firebird::ITimerImpl<TimerEntry, CheckStatusWrapper> >
class TimerEntry FB_FINAL :
public Firebird::RefCntIface<Firebird::ITimerImpl<TimerEntry, CheckStatusWrapper> >
{
public:
TimerEntry(int id, USHORT num)

9
src/common/security.h
View File

@ -32,7 +32,8 @@
namespace Auth {
class CharField : public Firebird::AutoIface<Firebird::ICharUserFieldImpl<CharField, Firebird::CheckStatusWrapper> >
class CharField :
public Firebird::AutoIface<Firebird::ICharUserFieldImpl<CharField, Firebird::CheckStatusWrapper> >
{
public:
CharField()
@ -97,7 +98,8 @@ private:
Firebird::string value;
};
class IntField : public Firebird::AutoIface<Firebird::IIntUserFieldImpl<IntField, Firebird::CheckStatusWrapper> >
class IntField :
public Firebird::AutoIface<Firebird::IIntUserFieldImpl<IntField, Firebird::CheckStatusWrapper> >
{
public:
IntField()
@ -152,7 +154,8 @@ private:
typedef Firebird::Array<UCHAR> AuthenticationBlock;
class UserData : public Firebird::VersionedIface<Firebird::IUserImpl<UserData, Firebird::CheckStatusWrapper> >
class UserData :
public Firebird::VersionedIface<Firebird::IUserImpl<UserData, Firebird::CheckStatusWrapper> >
{
public:
UserData()

3
src/dsql/DdlNodes.epp
View File

@ -149,7 +149,8 @@ void ExecInSecurityDb::executeInSecurityDb(jrd_tra* localTransaction)
{
runInSecurityDb(secDbContext);
secDbContext->att->execute(&statusWrapper, secDbContext->tra, 0, ("RELEASE SAVEPOINT " + savePoint).c_str(),
secDbContext->att->execute(&statusWrapper, secDbContext->tra, 0,
("RELEASE SAVEPOINT " + savePoint).c_str(),
SQL_DIALECT_V6, NULL, NULL, NULL, NULL);
savePoint.erase();
check(&statusWrapper);

1
src/include/firebird/UdrEngine.h
View File

@ -39,6 +39,7 @@ namespace Firebird
//------------------------------------------------------------------------------
//// TODO: review
// Routine registration functions.
extern "C" void FB_EXPORTED fbUdrRegFunction(const char* name, IUdrFunctionFactory* factory);
extern "C" void FB_EXPORTED fbUdrRegProcedure(const char* name, IUdrProcedureFactory* factory);

3
src/isql/show.epp
View File

@ -122,7 +122,8 @@ namespace {
// Used to make sure that local calls to print stuff go to isqlGlob.Out
// and not to stdout if IUtil::version gets called
class VersionCallback : public Firebird::AutoIface<Firebird::IVersionCallbackImpl<VersionCallback, Firebird::CheckStatusWrapper> >
class VersionCallback :
public Firebird::AutoIface<Firebird::IVersionCallbackImpl<VersionCallback, Firebird::CheckStatusWrapper> >
{
public:
// IVersionCallback implementation

3
src/jrd/Database.h
View File

@ -308,7 +308,8 @@ public:
bool exist;
};
class Linger FB_FINAL : public Firebird::RefCntIface<Firebird::ITimerImpl<Linger, Firebird::CheckStatusWrapper> >
class Linger FB_FINAL :
public Firebird::RefCntIface<Firebird::ITimerImpl<Linger, Firebird::CheckStatusWrapper> >
{
public:
explicit Linger(Database* a_dbb)

34
src/jrd/EngineInterface.h
View File

@ -44,7 +44,8 @@ class JStatement;
class JAttachment;
class JProvider;
class JBlob FB_FINAL : public Firebird::RefCntIface<Firebird::IBlobImpl<JBlob, Firebird::CheckStatusWrapper> >
class JBlob FB_FINAL :
public Firebird::RefCntIface<Firebird::IBlobImpl<JBlob, Firebird::CheckStatusWrapper> >
{
public:
// IBlob implementation
@ -84,7 +85,8 @@ private:
void freeEngineData(Firebird::CheckStatusWrapper* status);
};
class JTransaction FB_FINAL : public Firebird::RefCntIface<Firebird::ITransactionImpl<JTransaction, Firebird::CheckStatusWrapper> >
class JTransaction FB_FINAL :
public Firebird::RefCntIface<Firebird::ITransactionImpl<JTransaction, Firebird::CheckStatusWrapper> >
{
public:
// ITransaction implementation
@ -136,7 +138,8 @@ private:
void freeEngineData(Firebird::CheckStatusWrapper* status);
};
class JResultSet FB_FINAL : public Firebird::RefCntIface<Firebird::IResultSetImpl<JResultSet, Firebird::CheckStatusWrapper> >
class JResultSet FB_FINAL :
public Firebird::RefCntIface<Firebird::IResultSetImpl<JResultSet, Firebird::CheckStatusWrapper> >
{
public:
// IResultSet implementation
@ -173,7 +176,8 @@ private:
void freeEngineData(Firebird::CheckStatusWrapper* status);
};
class JStatement FB_FINAL : public Firebird::RefCntIface<Firebird::IStatementImpl<JStatement, Firebird::CheckStatusWrapper> >
class JStatement FB_FINAL :
public Firebird::RefCntIface<Firebird::IStatementImpl<JStatement, Firebird::CheckStatusWrapper> >
{
public:
// IStatement implementation
@ -228,7 +232,8 @@ inline dsql_req* JResultSet::getHandle() throw()
return statement->getHandle();
}
class JRequest FB_FINAL : public Firebird::RefCntIface<Firebird::IRequestImpl<JRequest, Firebird::CheckStatusWrapper> >
class JRequest FB_FINAL :
public Firebird::RefCntIface<Firebird::IRequestImpl<JRequest, Firebird::CheckStatusWrapper> >
{
public:
// IRequest implementation
@ -294,7 +299,8 @@ private:
void freeEngineData(Firebird::CheckStatusWrapper* status);
};
class JAttachment FB_FINAL : public Firebird::RefCntIface<Firebird::IAttachmentImpl<JAttachment, Firebird::CheckStatusWrapper> >
class JAttachment FB_FINAL :
public Firebird::RefCntIface<Firebird::IAttachmentImpl<JAttachment, Firebird::CheckStatusWrapper> >
{
public:
// IAttachment implementation
@ -306,8 +312,10 @@ public:
unsigned int bufferLength, unsigned char* buffer);
JTransaction* startTransaction(Firebird::CheckStatusWrapper* status,
unsigned int tpbLength, const unsigned char* tpb);
JTransaction* reconnectTransaction(Firebird::CheckStatusWrapper* status, unsigned int length, const unsigned char* id);
JRequest* compileRequest(Firebird::CheckStatusWrapper* status, unsigned int blr_length, const unsigned char* blr);
JTransaction* reconnectTransaction(Firebird::CheckStatusWrapper* status,
unsigned int length, const unsigned char* id);
JRequest* compileRequest(Firebird::CheckStatusWrapper* status,
unsigned int blr_length, const unsigned char* blr);
void transactRequest(Firebird::CheckStatusWrapper* status, Firebird::ITransaction* transaction,
unsigned int blr_length, const unsigned char* blr,
unsigned int in_msg_length, const unsigned char* in_msg,
@ -324,8 +332,8 @@ public:
unsigned int sdl_length, const unsigned char* sdl,
unsigned int param_length, const unsigned char* param,
int sliceLength, unsigned char* slice);
void executeDyn(Firebird::CheckStatusWrapper* status, Firebird::ITransaction* transaction, unsigned int length,
const unsigned char* dyn);
void executeDyn(Firebird::CheckStatusWrapper* status, Firebird::ITransaction* transaction,
unsigned int length, const unsigned char* dyn);
JStatement* prepare(Firebird::CheckStatusWrapper* status, Firebird::ITransaction* tra,
unsigned int stmtLength, const char* sqlStmt, unsigned int dialect, unsigned int flags);
Firebird::ITransaction* execute(Firebird::CheckStatusWrapper* status,
@ -367,7 +375,8 @@ private:
void freeEngineData(Firebird::CheckStatusWrapper* status);
};
class JService FB_FINAL : public Firebird::RefCntIface<Firebird::IServiceImpl<JService, Firebird::CheckStatusWrapper> >
class JService FB_FINAL :
public Firebird::RefCntIface<Firebird::IServiceImpl<JService, Firebird::CheckStatusWrapper> >
{
public:
// IService implementation
@ -389,7 +398,8 @@ private:
void freeEngineData(Firebird::CheckStatusWrapper* status);
};
class JProvider FB_FINAL : public Firebird::StdPlugin<Firebird::IProviderImpl<JProvider, Firebird::CheckStatusWrapper> >
class JProvider FB_FINAL :
public Firebird::StdPlugin<Firebird::IProviderImpl<JProvider, Firebird::CheckStatusWrapper> >
{
public:
explicit JProvider(Firebird::IPluginConfig* pConf)

3
src/jrd/ExtEngineManager.h
View File

@ -140,7 +140,8 @@ private:
}
};
class ExternalContextImpl : public Firebird::VersionedIface<Firebird::IExternalContextImpl<ExternalContextImpl, Firebird::CheckStatusWrapper> >
class ExternalContextImpl :
public Firebird::VersionedIface<Firebird::IExternalContextImpl<ExternalContextImpl, Firebird::CheckStatusWrapper> >
{
friend class AttachmentImpl;

4
src/jrd/extds/InternalDS.cpp
View File

@ -375,7 +375,6 @@ void InternalStatement::doPrepare(thread_db* tdbb, const string& sql)
LocalStatus status;
CheckStatusWrapper statusWrapper(&status);
if (m_request)
{
doClose(tdbb, true);
@ -417,7 +416,8 @@ void InternalStatement::doPrepare(thread_db* tdbb, const string& sql)
tran->getHandle()->tra_caller_name = CallerName();
}
m_request = att->prepare(&statusWrapper, tran, sql.length(), sql.c_str(), m_connection.getSqlDialect(), 0);
m_request = att->prepare(&statusWrapper, tran, sql.length(), sql.c_str(),
m_connection.getSqlDialect(), 0);
m_allocated = (m_request != NULL);
tran->getHandle()->tra_caller_name = save_caller_name;

3
src/jrd/jrd.cpp
View File

@ -958,7 +958,8 @@ private:
/// trace manager support
class TraceFailedConnection : public AutoIface<ITraceDatabaseConnectionImpl<TraceFailedConnection, CheckStatusWrapper> >
class TraceFailedConnection :
public AutoIface<ITraceDatabaseConnectionImpl<TraceFailedConnection, CheckStatusWrapper> >
{
public:
TraceFailedConnection(const char* filename, const DatabaseOptions* options);

3
src/jrd/trace/TraceConfigStorage.h
View File

@ -70,7 +70,8 @@ private:
void checkFile();
void touchFile();
class TouchFile FB_FINAL : public Firebird::RefCntIface<Firebird::ITimerImpl<TouchFile, Firebird::CheckStatusWrapper> >
class TouchFile FB_FINAL :
public Firebird::RefCntIface<Firebird::ITimerImpl<TouchFile, Firebird::CheckStatusWrapper> >
{
public:
void handler();

3
src/jrd/trace/TraceObjects.cpp
View File

@ -416,7 +416,8 @@ const char* TraceTriggerImpl::getRelationName()
/// TraceLogWriterImpl
class TraceLogWriterImpl FB_FINAL : public RefCntIface<ITraceLogWriterImpl<TraceLogWriterImpl, CheckStatusWrapper> >
class TraceLogWriterImpl FB_FINAL :
public RefCntIface<ITraceLogWriterImpl<TraceLogWriterImpl, CheckStatusWrapper> >
{
public:
TraceLogWriterImpl(const TraceSession& session) :

45
src/jrd/trace/TraceObjects.h
View File

@ -51,7 +51,8 @@ class Database;
class Attachment;
class jrd_tra;
class TraceConnectionImpl : public Firebird::AutoIface<Firebird::ITraceDatabaseConnectionImpl<TraceConnectionImpl, Firebird::CheckStatusWrapper> >
class TraceConnectionImpl :
public Firebird::AutoIface<Firebird::ITraceDatabaseConnectionImpl<TraceConnectionImpl, Firebird::CheckStatusWrapper> >
{
public:
TraceConnectionImpl(const Attachment* att) :
@ -77,7 +78,8 @@ private:
};
class TraceTransactionImpl : public Firebird::AutoIface<Firebird::ITraceTransactionImpl<TraceTransactionImpl, Firebird::CheckStatusWrapper> >
class TraceTransactionImpl :
public Firebird::AutoIface<Firebird::ITraceTransactionImpl<TraceTransactionImpl, Firebird::CheckStatusWrapper> >
{
public:
TraceTransactionImpl(const jrd_tra* tran, PerformanceInfo* perf = NULL) :
@ -99,7 +101,8 @@ private:
template <class Final>
class BLRPrinter : public Firebird::AutoIface<Firebird::ITraceBLRStatementImpl<Final, Firebird::CheckStatusWrapper> >
class BLRPrinter :
public Firebird::AutoIface<Firebird::ITraceBLRStatementImpl<Final, Firebird::CheckStatusWrapper> >
{
public:
BLRPrinter(const unsigned char* blr, unsigned length) :
@ -164,7 +167,8 @@ public:
};
class TraceSQLStatementImpl : public Firebird::AutoIface<Firebird::ITraceSQLStatementImpl<TraceSQLStatementImpl, Firebird::CheckStatusWrapper> >
class TraceSQLStatementImpl :
public Firebird::AutoIface<Firebird::ITraceSQLStatementImpl<TraceSQLStatementImpl, Firebird::CheckStatusWrapper> >
{
public:
TraceSQLStatementImpl(const dsql_req* stmt, PerformanceInfo* perf) :
@ -184,7 +188,8 @@ public:
const char* getExplainedPlan();
private:
class DSQLParamsImpl : public Firebird::AutoIface<Firebird::ITraceParamsImpl<DSQLParamsImpl, Firebird::CheckStatusWrapper> >
class DSQLParamsImpl :
public Firebird::AutoIface<Firebird::ITraceParamsImpl<DSQLParamsImpl, Firebird::CheckStatusWrapper> >
{
public:
DSQLParamsImpl(Firebird::MemoryPool& pool, const dsql_req* const stmt) :
@ -219,7 +224,8 @@ private:
};
class TraceFailedSQLStatement : public Firebird::AutoIface<Firebird::ITraceSQLStatementImpl<TraceFailedSQLStatement, Firebird::CheckStatusWrapper> >
class TraceFailedSQLStatement :
public Firebird::AutoIface<Firebird::ITraceSQLStatementImpl<TraceFailedSQLStatement, Firebird::CheckStatusWrapper> >
{
public:
TraceFailedSQLStatement(Firebird::string& text) :
@ -241,7 +247,8 @@ private:
};
class TraceContextVarImpl : public Firebird::AutoIface<Firebird::ITraceContextVariableImpl<TraceContextVarImpl, Firebird::CheckStatusWrapper> >
class TraceContextVarImpl :
public Firebird::AutoIface<Firebird::ITraceContextVariableImpl<TraceContextVarImpl, Firebird::CheckStatusWrapper> >
{
public:
TraceContextVarImpl(const char* ns, const char* name, const char* value) :
@ -265,7 +272,8 @@ private:
// forward declaration
class TraceDescriptors;
class TraceParamsImpl : public Firebird::AutoIface<Firebird::ITraceParamsImpl<TraceParamsImpl, Firebird::CheckStatusWrapper> >
class TraceParamsImpl :
public Firebird::AutoIface<Firebird::ITraceParamsImpl<TraceParamsImpl, Firebird::CheckStatusWrapper> >
{
public:
explicit TraceParamsImpl(TraceDescriptors *descs) :
@ -380,7 +388,8 @@ protected:
};
class TraceProcedureImpl : public Firebird::AutoIface<Firebird::ITraceProcedureImpl<TraceProcedureImpl, Firebird::CheckStatusWrapper> >
class TraceProcedureImpl :
public Firebird::AutoIface<Firebird::ITraceProcedureImpl<TraceProcedureImpl, Firebird::CheckStatusWrapper> >
{
public:
TraceProcedureImpl(jrd_req* request, PerformanceInfo* perf) :
@ -408,7 +417,8 @@ private:
};
class TraceFunctionImpl : public Firebird::AutoIface<Firebird::ITraceFunctionImpl<TraceFunctionImpl, Firebird::CheckStatusWrapper> >
class TraceFunctionImpl :
public Firebird::AutoIface<Firebird::ITraceFunctionImpl<TraceFunctionImpl, Firebird::CheckStatusWrapper> >
{
public:
TraceFunctionImpl(jrd_req* request, Firebird::ITraceParams* inputs, PerformanceInfo* perf, const dsc* value) :
@ -438,7 +448,8 @@ private:
};
class TraceTriggerImpl : public Firebird::AutoIface<Firebird::ITraceTriggerImpl<TraceTriggerImpl, Firebird::CheckStatusWrapper> >
class TraceTriggerImpl :
public Firebird::AutoIface<Firebird::ITraceTriggerImpl<TraceTriggerImpl, Firebird::CheckStatusWrapper> >
{
public:
TraceTriggerImpl(const jrd_req* trig, SSHORT which, PerformanceInfo* perf) :
@ -461,7 +472,8 @@ private:
};
class TraceServiceImpl : public Firebird::AutoIface<Firebird::ITraceServiceConnectionImpl<TraceServiceImpl, Firebird::CheckStatusWrapper> >
class TraceServiceImpl :
public Firebird::AutoIface<Firebird::ITraceServiceConnectionImpl<TraceServiceImpl, Firebird::CheckStatusWrapper> >
{
public:
TraceServiceImpl(const Service* svc) :
@ -503,7 +515,8 @@ private:
};
class TraceInitInfoImpl : public Firebird::AutoIface<Firebird::ITraceInitInfoImpl<TraceInitInfoImpl, Firebird::CheckStatusWrapper> >
class TraceInitInfoImpl :
public Firebird::AutoIface<Firebird::ITraceInitInfoImpl<TraceInitInfoImpl, Firebird::CheckStatusWrapper> >
{
public:
TraceInitInfoImpl(const Firebird::TraceSession& session, const Attachment* att,
@ -545,7 +558,8 @@ private:
};
class TraceStatusVectorImpl : public Firebird::AutoIface<Firebird::ITraceStatusVectorImpl<TraceStatusVectorImpl, Firebird::CheckStatusWrapper> >
class TraceStatusVectorImpl :
public Firebird::AutoIface<Firebird::ITraceStatusVectorImpl<TraceStatusVectorImpl, Firebird::CheckStatusWrapper> >
{
public:
explicit TraceStatusVectorImpl(const ISC_STATUS* status) :
@ -575,7 +589,8 @@ private:
Firebird::string m_error;
};
class TraceSweepImpl : public Firebird::AutoIface<Firebird::ITraceSweepInfoImpl<TraceSweepImpl, Firebird::CheckStatusWrapper> >
class TraceSweepImpl :
public Firebird::AutoIface<Firebird::ITraceSweepInfoImpl<TraceSweepImpl, Firebird::CheckStatusWrapper> >
{
public:
TraceSweepImpl()

2
src/plugins/udr_engine/UdrEngine.cpp
View File

@ -609,7 +609,7 @@ void Engine::openAttachment(ThrowStatusWrapper* /*status*/, IExternalContext* /*
}
void Engine::closeAttachment(ThrowStatusWrapper* status, IExternalContext* context)
void Engine::closeAttachment(ThrowStatusWrapper* /*status*/, IExternalContext* context)
{
MutexLockGuard guard(childrenMutex, FB_FUNCTION);

6
src/remote/remote.h
View File

@ -675,7 +675,8 @@ typedef Firebird::GetPlugins<Firebird::IClient> AuthClientPlugins;
// Representation of authentication data, visible for plugin
// Transfered in format, depending upon type of the packet (phase of handshake)
class ClntAuthBlock FB_FINAL : public Firebird::RefCntIface<Firebird::IClientBlockImpl<ClntAuthBlock, Firebird::CheckStatusWrapper> >
class ClntAuthBlock FB_FINAL :
public Firebird::RefCntIface<Firebird::IClientBlockImpl<ClntAuthBlock, Firebird::CheckStatusWrapper> >
{
private:
Firebird::PathName pluginList; // To be passed to server
@ -730,7 +731,8 @@ public:
// Transfered from client data in format, suitable for plugins access
typedef Firebird::GetPlugins<Firebird::IServer> AuthServerPlugins;
class SrvAuthBlock FB_FINAL : public Firebird::VersionedIface<Firebird::IServerBlockImpl<SrvAuthBlock, Firebird::CheckStatusWrapper> >,
class SrvAuthBlock FB_FINAL :
public Firebird::VersionedIface<Firebird::IServerBlockImpl<SrvAuthBlock, Firebird::CheckStatusWrapper> >,
public Firebird::GlobalStorage
{
private:

9
src/utilities/gsec/gsec.cpp
View File

@ -150,7 +150,8 @@ static void merge(Firebird::IIntUserField* to, Firebird::IIntUserField* from)
}
namespace {
class GsecInfo : public Firebird::AutoIface<Firebird::ILogonInfoImpl<GsecInfo, Firebird::CheckStatusWrapper> >
class GsecInfo :
public Firebird::AutoIface<Firebird::ILogonInfoImpl<GsecInfo, Firebird::CheckStatusWrapper> >
{
public:
GsecInfo(const char* pDba, const char* pRole,
@ -227,7 +228,8 @@ namespace {
}
};
class Display : public Firebird::AutoIface<Firebird::IListUsersImpl<Display, Firebird::CheckStatusWrapper> >
class Display :
public Firebird::AutoIface<Firebird::IListUsersImpl<Display, Firebird::CheckStatusWrapper> >
{
public:
explicit Display(tsec* t)
@ -289,7 +291,8 @@ namespace {
};
class Callback : public Firebird::AutoIface<Firebird::IListUsersImpl<Callback, Firebird::CheckStatusWrapper> >
class Callback :
public Firebird::AutoIface<Firebird::IListUsersImpl<Callback, Firebird::CheckStatusWrapper> >
{
public:
explicit Callback(StackUserData* pu)

3
src/utilities/ntrace/PluginLogWriter.h
View File

@ -47,7 +47,8 @@
#include <sys/stat.h>
class PluginLogWriter FB_FINAL : public Firebird::RefCntIface<Firebird::ITraceLogWriterImpl<PluginLogWriter, Firebird::CheckStatusWrapper> >
class PluginLogWriter FB_FINAL :
public Firebird::RefCntIface<Firebird::ITraceLogWriterImpl<PluginLogWriter, Firebird::CheckStatusWrapper> >
{
public:
PluginLogWriter(const char* fileName, size_t maxSize);

3
src/utilities/ntrace/TracePluginImpl.h
View File

@ -45,7 +45,8 @@
// Bring in off_t
#include <sys/types.h>
class TracePluginImpl FB_FINAL : public Firebird::RefCntIface<Firebird::ITracePluginImpl<TracePluginImpl, Firebird::CheckStatusWrapper> >
class TracePluginImpl FB_FINAL :
public Firebird::RefCntIface<Firebird::ITracePluginImpl<TracePluginImpl, Firebird::CheckStatusWrapper> >
{
public:
// Serialize exception to TLS buffer to return it to user

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

@ -32,7 +32,8 @@
#include "TraceConfiguration.h"
#include "TracePluginImpl.h"
class TraceFactoryImpl FB_FINAL : public Firebird::StdPlugin<Firebird::ITraceFactoryImpl<TraceFactoryImpl, Firebird::CheckStatusWrapper> >
class TraceFactoryImpl FB_FINAL :
public Firebird::StdPlugin<Firebird::ITraceFactoryImpl<TraceFactoryImpl, Firebird::CheckStatusWrapper> >
{
public:
explicit TraceFactoryImpl(Firebird::IPluginConfig*)
@ -40,7 +41,8 @@ public:
// TraceFactory implementation
ntrace_mask_t trace_needs();
Firebird::ITracePlugin* trace_create(Firebird::CheckStatusWrapper* status, Firebird::ITraceInitInfo* init_info);
Firebird::ITracePlugin* trace_create(Firebird::CheckStatusWrapper* status,
Firebird::ITraceInitInfo* init_info);
int release();
};

3
src/yvalve/MasterImplementation.cpp
View File

@ -575,7 +575,8 @@ THREAD_ENTRY_DECLARE TimerEntry::timeThread(THREAD_ENTRY_PARAM)
} // namespace
class TimerImplementation : public AutoIface<ITimerControlImpl<TimerImplementation, CheckStatusWrapper> >
class TimerImplementation :
public AutoIface<ITimerControlImpl<TimerImplementation, CheckStatusWrapper> >
{
public:
// ITimerControl implementation

3
src/yvalve/MasterImplementation.h
View File

@ -51,7 +51,8 @@ namespace Why
Firebird::IDtcStart* startBuilder(Firebird::CheckStatusWrapper* status);
};
class MasterImplementation : public Firebird::AutoIface<Firebird::IMasterImpl<MasterImplementation, Firebird::CheckStatusWrapper> >
class MasterImplementation :
public Firebird::AutoIface<Firebird::IMasterImpl<MasterImplementation, Firebird::CheckStatusWrapper> >
{
public:
static Firebird::Static<Dtc> dtc;

12
src/yvalve/PluginManager.cpp
View File

@ -111,7 +111,8 @@ namespace
bool flShutdown = false;
class ConfigParameterAccess FB_FINAL : public RefCntIface<IConfigEntryImpl<ConfigParameterAccess, CheckStatusWrapper> >
class ConfigParameterAccess FB_FINAL :
public RefCntIface<IConfigEntryImpl<ConfigParameterAccess, CheckStatusWrapper> >
{
public:
ConfigParameterAccess(IReferenceCounted* c, const ConfigFile::Parameter* p) : cf(c), par(p) { }
@ -155,7 +156,8 @@ namespace
const ConfigFile::Parameter* par;
};
class ConfigAccess FB_FINAL : public RefCntIface<IConfigImpl<ConfigAccess, CheckStatusWrapper> >
class ConfigAccess FB_FINAL :
public RefCntIface<IConfigImpl<ConfigAccess, CheckStatusWrapper> >
{
public:
ConfigAccess(RefPtr<ConfigFile> c) : confFile(c) { }
@ -431,7 +433,8 @@ namespace
// Provides most of configuration services for plugins,
// except per-database configuration in databases.conf
class ConfiguredPlugin FB_FINAL : public RefCntIface<ITimerImpl<ConfiguredPlugin, CheckStatusWrapper> >
class ConfiguredPlugin FB_FINAL :
public RefCntIface<ITimerImpl<ConfiguredPlugin, CheckStatusWrapper> >
{
public:
ConfiguredPlugin(RefPtr<PluginModule> pmodule, unsigned int preg,
@ -515,7 +518,8 @@ namespace
};
// Provides per-database configuration from databases.conf.
class FactoryParameter FB_FINAL : public RefCntIface<IPluginConfigImpl<FactoryParameter, CheckStatusWrapper> >
class FactoryParameter FB_FINAL :
public RefCntIface<IPluginConfigImpl<FactoryParameter, CheckStatusWrapper> >
{
public:
FactoryParameter(ConfiguredPlugin* cp, IFirebirdConf* fc)

27
src/yvalve/YObjects.h
View File

@ -164,7 +164,8 @@ public:
Firebird::RefPtr<NextInterface> next;
};
class YEvents FB_FINAL : public YHelper<YEvents, Firebird::IEventsImpl<YEvents, Firebird::CheckStatusWrapper> >
class YEvents FB_FINAL :
public YHelper<YEvents, Firebird::IEventsImpl<YEvents, Firebird::CheckStatusWrapper> >
{
public:
static const ISC_STATUS ERROR_CODE = isc_bad_events_handle;
@ -182,7 +183,8 @@ public:
Firebird::RefPtr<Firebird::IEventCallback> callback;
};
class YRequest FB_FINAL : public YHelper<YRequest, Firebird::IRequestImpl<YRequest, Firebird::CheckStatusWrapper> >
class YRequest FB_FINAL :
public YHelper<YRequest, Firebird::IRequestImpl<YRequest, Firebird::CheckStatusWrapper> >
{
public:
static const ISC_STATUS ERROR_CODE = isc_bad_req_handle;
@ -210,7 +212,8 @@ public:
FB_API_HANDLE* userHandle;
};
class YTransaction FB_FINAL : public YHelper<YTransaction, Firebird::ITransactionImpl<YTransaction, Firebird::CheckStatusWrapper> >
class YTransaction FB_FINAL :
public YHelper<YTransaction, Firebird::ITransactionImpl<YTransaction, Firebird::CheckStatusWrapper> >
{
public:
static const ISC_STATUS ERROR_CODE = isc_bad_trans_handle;
@ -287,7 +290,8 @@ public:
YTransaction* transaction;
};
class YResultSet FB_FINAL : public YHelper<YResultSet, Firebird::IResultSetImpl<YResultSet, Firebird::CheckStatusWrapper> >
class YResultSet FB_FINAL :
public YHelper<YResultSet, Firebird::IResultSetImpl<YResultSet, Firebird::CheckStatusWrapper> >
{
public:
static const ISC_STATUS ERROR_CODE = isc_bad_result_set;
@ -332,7 +336,8 @@ private:
bool input;
};
class YStatement FB_FINAL : public YHelper<YStatement, Firebird::IStatementImpl<YStatement, Firebird::CheckStatusWrapper> >
class YStatement FB_FINAL :
public YHelper<YStatement, Firebird::IStatementImpl<YStatement, Firebird::CheckStatusWrapper> >
{
public:
static const ISC_STATUS ERROR_CODE = isc_bad_stmt_handle;
@ -386,7 +391,8 @@ public:
Firebird::Mutex enterMutex;
};
class YAttachment FB_FINAL : public YHelper<YAttachment, Firebird::IAttachmentImpl<YAttachment, Firebird::CheckStatusWrapper> >,
class YAttachment FB_FINAL :
public YHelper<YAttachment, Firebird::IAttachmentImpl<YAttachment, Firebird::CheckStatusWrapper> >,
public EnterCount
{
public:
@ -461,7 +467,8 @@ public:
Firebird::StatusHolder savedStatus; // Do not use raise() method of this class in yValve.
};
class YService FB_FINAL : public YHelper<YService, Firebird::IServiceImpl<YService, Firebird::CheckStatusWrapper> >,
class YService FB_FINAL :
public YHelper<YService, Firebird::IServiceImpl<YService, Firebird::CheckStatusWrapper> >,
public EnterCount
{
public:
@ -492,7 +499,8 @@ private:
bool utf8Connection; // Client talks to us using UTF8, else - system default charset
};
class Dispatcher FB_FINAL : public Firebird::StdPlugin<Firebird::IProviderImpl<Dispatcher, Firebird::CheckStatusWrapper> >
class Dispatcher FB_FINAL :
public Firebird::StdPlugin<Firebird::IProviderImpl<Dispatcher, Firebird::CheckStatusWrapper> >
{
public:
Dispatcher()
@ -528,7 +536,8 @@ private:
Firebird::ICryptKeyCallback* cryptCallback;
};
class UtilInterface FB_FINAL : public Firebird::AutoIface<Firebird::IUtilImpl<UtilInterface, Firebird::CheckStatusWrapper> >
class UtilInterface FB_FINAL :
public Firebird::AutoIface<Firebird::IUtilImpl<UtilInterface, Firebird::CheckStatusWrapper> >
{
// IUtil implementation
public:

4
src/yvalve/perf.cpp
View File

@ -443,8 +443,8 @@ KnownCounters knownCounters[TOTAL_COUNTERS] = {
} // anonymous namespace
void Why::UtilInterface::getPerfCounters(Firebird::CheckStatusWrapper* status, Firebird::IAttachment* att,
const char* countersSet, ISC_INT64* counters)
void Why::UtilInterface::getPerfCounters(Firebird::CheckStatusWrapper* status,
Firebird::IAttachment* att, const char* countersSet, ISC_INT64* counters)
{
try
{

19
src/yvalve/why.cpp
View File

@ -106,7 +106,8 @@ namespace {
// Class-wrapper around external SQLDA.
// Can be used as local variable, but do it with care
class SQLDAMetadata FB_FINAL : public RefCntIface<IMessageMetadataImpl<SQLDAMetadata, CheckStatusWrapper> >
class SQLDAMetadata FB_FINAL :
public RefCntIface<IMessageMetadataImpl<SQLDAMetadata, CheckStatusWrapper> >
{
friend class SQLDAMetadataLauncher;
private:
@ -1385,7 +1386,8 @@ namespace {
}
}
FB_BOOLEAN IscStatement::fetch(CheckStatusWrapper* status, IMessageMetadata* outMetadata, UCHAR* outBuffer)
FB_BOOLEAN IscStatement::fetch(CheckStatusWrapper* status, IMessageMetadata* outMetadata,
UCHAR* outBuffer)
{
checkCursorOpened();
@ -2762,7 +2764,8 @@ int API_ROUTINE gds__enable_subsystem(TEXT* /*subsystem*/)
namespace
{
class WaitCallback FB_FINAL : public RefCntIface<IEventCallbackImpl<WaitCallback, CheckStatusWrapper> >
class WaitCallback FB_FINAL :
public RefCntIface<IEventCallbackImpl<WaitCallback, CheckStatusWrapper> >
{
public:
explicit WaitCallback(UCHAR* aBuffer)
@ -4011,7 +4014,8 @@ void YBlob::getInfo(CheckStatusWrapper* status, unsigned int itemsLength,
}
}
int YBlob::getSegment(CheckStatusWrapper* status, unsigned int bufferLength, void* buffer, unsigned int* segmentLength)
int YBlob::getSegment(CheckStatusWrapper* status, unsigned int bufferLength,
void* buffer, unsigned int* segmentLength)
{
try
{
@ -4649,7 +4653,8 @@ void YTransaction::getInfo(CheckStatusWrapper* status, unsigned int itemsLength,
}
}
void YTransaction::prepare(CheckStatusWrapper* status, unsigned int msgLength, const unsigned char* message)
void YTransaction::prepare(CheckStatusWrapper* status, unsigned int msgLength,
const unsigned char* message)
{
try
{
@ -5366,7 +5371,8 @@ YTransaction* YAttachment::getTransaction(CheckStatusWrapper* status, ITransacti
}
void YAttachment::getNextTransaction(CheckStatusWrapper* status, ITransaction* tra, NextTransaction& next)
void YAttachment::getNextTransaction(CheckStatusWrapper* status, ITransaction* tra,
NextTransaction& next)
{
next = getTransaction(status, tra)->next;
if (!next.hasData())
@ -5695,7 +5701,6 @@ void Dispatcher::shutdown(CheckStatusWrapper* userStatus, unsigned int timeout,
StatusVector status(NULL);
CheckStatusWrapper statusWrapper(&status);
#ifdef DEV_BUILD
// Make timeout huge in debug build: hard to debug something during 5-10 sec
if (timeout)