From: <asf...@us...> - 2014-12-19 15:24:57
|
Revision: 60397 http://sourceforge.net/p/firebird/code/60397 Author: asfernandes Date: 2014-12-19 15:24:44 +0000 (Fri, 19 Dec 2014) Log Message: ----------- Generate interfaces with I-prefix. Modified Paths: -------------- firebird/trunk/examples/dbcrypt/CryptApplication.cpp firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp firebird/trunk/examples/dbcrypt/DbCrypt.cpp firebird/trunk/examples/interfaces/ifaceExamples.h firebird/trunk/src/auth/AuthDbg.h firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp firebird/trunk/src/auth/trusted/AuthSspi.h firebird/trunk/src/common/Auth.h firebird/trunk/src/common/MsgMetadata.h firebird/trunk/src/common/StatusHolder.h firebird/trunk/src/common/classes/ImplementHelper.h firebird/trunk/src/common/config/config.h firebird/trunk/src/common/isc_sync.cpp firebird/trunk/src/common/security.h firebird/trunk/src/gpre/boot/gpre_meta_boot.cpp firebird/trunk/src/include/firebird/IdlFbInterfaces.h firebird/trunk/src/include/firebird/Interface.h firebird/trunk/src/include/firebird/Message.h firebird/trunk/src/include/firebird/UdrCppEngine.h firebird/trunk/src/include/firebird/UdrEngine.h firebird/trunk/src/include/gen/ids.h firebird/trunk/src/isql/show.epp firebird/trunk/src/jrd/Database.h firebird/trunk/src/jrd/EngineInterface.h firebird/trunk/src/jrd/ExtEngineManager.h firebird/trunk/src/jrd/UserManagement.cpp firebird/trunk/src/jrd/jrd.cpp firebird/trunk/src/jrd/trace/TraceConfigStorage.h firebird/trunk/src/jrd/trace/TraceObjects.cpp firebird/trunk/src/jrd/trace/TraceObjects.h firebird/trunk/src/plugins/crypt/arc4/Arc4.cpp firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp firebird/trunk/src/remote/client/interface.cpp firebird/trunk/src/remote/remote.h firebird/trunk/src/remote/server/server.cpp firebird/trunk/src/utilities/gsec/gsec.cpp firebird/trunk/src/utilities/ntrace/PluginLogWriter.h firebird/trunk/src/utilities/ntrace/TracePluginImpl.h firebird/trunk/src/utilities/ntrace/traceplugin.cpp firebird/trunk/src/yvalve/DistributedTransaction.cpp firebird/trunk/src/yvalve/MasterImplementation.cpp firebird/trunk/src/yvalve/MasterImplementation.h firebird/trunk/src/yvalve/PluginManager.cpp firebird/trunk/src/yvalve/PluginManager.h firebird/trunk/src/yvalve/YObjects.h firebird/trunk/src/yvalve/utl.cpp firebird/trunk/src/yvalve/why.cpp Modified: firebird/trunk/examples/dbcrypt/CryptApplication.cpp =================================================================== --- firebird/trunk/examples/dbcrypt/CryptApplication.cpp 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/examples/dbcrypt/CryptApplication.cpp 2014-12-19 15:24:44 UTC (rev 60397) @@ -34,7 +34,7 @@ using namespace Firebird; -class CryptKey : public Api::CryptKeyCallbackImpl<CryptKey> +class CryptKey : public Api::ICryptKeyCallbackImpl<CryptKey> { public: unsigned int callback(unsigned int, const void*, unsigned int length, void* buffer) Modified: firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp =================================================================== --- firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2014-12-19 15:24:44 UTC (rev 60397) @@ -44,7 +44,7 @@ IMaster* master = NULL; IPluginManager* pluginManager = NULL; -class PluginModule : public Api::PluginModuleImpl<PluginModule> +class PluginModule : public Api::IPluginModuleImpl<PluginModule> { public: PluginModule() @@ -82,7 +82,7 @@ PluginModule module; -class CryptKeyHolder : public Api::KeyHolderPluginImpl<CryptKeyHolder> +class CryptKeyHolder : public Api::IKeyHolderPluginImpl<CryptKeyHolder> { public: explicit CryptKeyHolder(IPluginConfig* cnf) throw() @@ -136,7 +136,7 @@ } private: - class CallbackInterface : public Api::CryptKeyCallbackImpl<CallbackInterface> + class CallbackInterface : public Api::ICryptKeyCallbackImpl<CallbackInterface> { public: explicit CallbackInterface(CryptKeyHolder* p) @@ -235,7 +235,7 @@ return &callbackInterface; } -class Factory : public Api::PluginFactoryImpl<Factory> +class Factory : public Api::IPluginFactoryImpl<Factory> { public: IPluginModule* getModule() Modified: firebird/trunk/examples/dbcrypt/DbCrypt.cpp =================================================================== --- firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2014-12-19 15:24:44 UTC (rev 60397) @@ -41,7 +41,7 @@ IMaster* master = NULL; IPluginManager* pluginManager = NULL; -class PluginModule : public Api::PluginModuleImpl<PluginModule> +class PluginModule : public Api::IPluginModuleImpl<PluginModule> { public: PluginModule() @@ -79,7 +79,7 @@ PluginModule module; -class DbCrypt : public Api::DbCryptPluginImpl<DbCrypt> +class DbCrypt : public Api::IDbCryptPluginImpl<DbCrypt> { public: explicit DbCrypt(IPluginConfig* cnf) throw() @@ -243,7 +243,7 @@ noKeyError(status); } -class Factory : public Api::PluginFactoryImpl<Factory> +class Factory : public Api::IPluginFactoryImpl<Factory> { public: IPluginModule* getModule() Modified: firebird/trunk/examples/interfaces/ifaceExamples.h =================================================================== --- firebird/trunk/examples/interfaces/ifaceExamples.h 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/examples/interfaces/ifaceExamples.h 2014-12-19 15:24:44 UTC (rev 60397) @@ -34,7 +34,7 @@ using namespace Firebird; typedef FirebirdApi<class ExamplesPolicy> Api; -FB_USE_API(Api, I) +FB_USE_API(Api) // Dummy policy - to be enhanced class ExamplesPolicy @@ -43,9 +43,9 @@ template <unsigned V, typename T> static inline bool checkVersion(T* versioned, IStatus* status) { return true; } - static void checkException(Api::Status*) { } - static void catchException(Api::Status*) { } - typedef Api::Status* Status; + static void checkException(Api::IStatus*) { } + static void catchException(Api::IStatus*) { } + typedef Api::IStatus* IStatus; }; Modified: firebird/trunk/src/auth/AuthDbg.h =================================================================== --- firebird/trunk/src/auth/AuthDbg.h 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/auth/AuthDbg.h 2014-12-19 15:24:44 UTC (rev 60397) @@ -46,7 +46,7 @@ // 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::Api::ServerImpl<DebugServer> > +class DebugServer FB_FINAL : public Firebird::StdPlugin<Firebird::Api::IServerImpl<DebugServer> > { public: explicit DebugServer(Firebird::IPluginConfig*); @@ -60,7 +60,7 @@ Firebird::RefPtr<Firebird::IConfig> config; }; -class DebugClient FB_FINAL : public Firebird::StdPlugin<Firebird::Api::ClientImpl<DebugClient> > +class DebugClient FB_FINAL : public Firebird::StdPlugin<Firebird::Api::IClientImpl<DebugClient> > { public: DebugClient(Firebird::IPluginConfig*); Modified: firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp =================================================================== --- firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp 2014-12-19 15:24:44 UTC (rev 60397) @@ -34,7 +34,7 @@ namespace Auth { -class SrpClient FB_FINAL : public StdPlugin<Api::ClientImpl<SrpClient> > +class SrpClient FB_FINAL : public StdPlugin<Api::IClientImpl<SrpClient> > { public: explicit SrpClient(IPluginConfig*) Modified: firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp =================================================================== --- firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2014-12-19 15:24:44 UTC (rev 60397) @@ -60,7 +60,7 @@ namespace Auth { -class SrpManagement FB_FINAL : public Firebird::StdPlugin<Firebird::Api::ManagementImpl<SrpManagement> > +class SrpManagement FB_FINAL : public Firebird::StdPlugin<Firebird::Api::IManagementImpl<SrpManagement> > { public: explicit SrpManagement(Firebird::IPluginConfig* par) Modified: firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp =================================================================== --- firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2014-12-19 15:24:44 UTC (rev 60397) @@ -48,7 +48,7 @@ namespace Auth { -class SrpServer FB_FINAL : public StdPlugin<Api::ServerImpl<SrpServer> > +class SrpServer FB_FINAL : public StdPlugin<Api::IServerImpl<SrpServer> > { public: explicit SrpServer(IPluginConfig* par) Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h =================================================================== --- firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h 2014-12-19 15:24:44 UTC (rev 60397) @@ -35,7 +35,7 @@ // 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::Api::ClientImpl<SecurityDatabaseClient> > +class SecurityDatabaseClient FB_FINAL : public Firebird::StdPlugin<Firebird::Api::IClientImpl<SecurityDatabaseClient> > { public: explicit SecurityDatabaseClient(Firebird::IPluginConfig*) Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h =================================================================== --- firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h 2014-12-19 15:24:44 UTC (rev 60397) @@ -33,7 +33,7 @@ namespace Auth { -class SecurityDatabaseManagement FB_FINAL : public Firebird::StdPlugin<Firebird::Api::ManagementImpl<SecurityDatabaseManagement> > +class SecurityDatabaseManagement FB_FINAL : public Firebird::StdPlugin<Firebird::Api::IManagementImpl<SecurityDatabaseManagement> > { public: explicit SecurityDatabaseManagement(Firebird::IPluginConfig* par); Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp =================================================================== --- firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2014-12-19 15:24:44 UTC (rev 60397) @@ -123,7 +123,7 @@ namespace Auth { -class SecurityDatabaseServer FB_FINAL : public Firebird::StdPlugin<Firebird::Api::ServerImpl<SecurityDatabaseServer> > +class SecurityDatabaseServer FB_FINAL : public Firebird::StdPlugin<Firebird::Api::IServerImpl<SecurityDatabaseServer> > { public: explicit SecurityDatabaseServer(Firebird::IPluginConfig* p) @@ -138,7 +138,7 @@ Firebird::RefPtr<Firebird::IPluginConfig> iParameter; }; -class SecurityDatabase FB_FINAL : public Firebird::RefCntIface<Firebird::Api::TimerImpl<SecurityDatabase> > +class SecurityDatabase FB_FINAL : public Firebird::RefCntIface<Firebird::Api::ITimerImpl<SecurityDatabase> > { public: int verify(IWriter* authBlock, IServerBlock* sBlock); Modified: firebird/trunk/src/auth/trusted/AuthSspi.h =================================================================== --- firebird/trunk/src/auth/trusted/AuthSspi.h 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/auth/trusted/AuthSspi.h 2014-12-19 15:24:44 UTC (rev 60397) @@ -100,7 +100,7 @@ bool getLogin(Firebird::string& login, bool& wh); }; -class WinSspiServer : public Firebird::StdPlugin<Firebird::Api::ServerImpl<WinSspiServer> > +class WinSspiServer : public Firebird::StdPlugin<Firebird::Api::IServerImpl<WinSspiServer> > { public: // IServer implementation @@ -114,7 +114,7 @@ AuthSspi sspi; }; -class WinSspiClient : public Firebird::StdPlugin<Firebird::Api::ClientImpl<WinSspiClient> > +class WinSspiClient : public Firebird::StdPlugin<Firebird::Api::IClientImpl<WinSspiClient> > { public: // IClient implementation Modified: firebird/trunk/src/common/Auth.h =================================================================== --- firebird/trunk/src/common/Auth.h 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/common/Auth.h 2014-12-19 15:24:44 UTC (rev 60397) @@ -39,7 +39,7 @@ namespace Auth { -class WriterImplementation : public Firebird::AutoIface<Firebird::Api::WriterImpl<WriterImplementation> > +class WriterImplementation : public Firebird::AutoIface<Firebird::Api::IWriterImpl<WriterImplementation> > { public: WriterImplementation(); Modified: firebird/trunk/src/common/MsgMetadata.h =================================================================== --- firebird/trunk/src/common/MsgMetadata.h 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/common/MsgMetadata.h 2014-12-19 15:24:44 UTC (rev 60397) @@ -38,7 +38,7 @@ class StatementMetadata; class MetadataFromBlr; -class MsgMetadata : public RefCntIface<Api::MessageMetadataImpl<MsgMetadata> > +class MsgMetadata : public RefCntIface<Api::IMessageMetadataImpl<MsgMetadata> > { friend class MetadataBuilder; friend class StatementMetadata; @@ -278,7 +278,7 @@ unsigned length; }; -//class AttMetadata : public Api::MessageMetadataBaseImpl<AttMetadata, MsgMetadata> +//class AttMetadata : public Api::IMessageMetadataBaseImpl<AttMetadata, MsgMetadata> class AttMetadata : public MsgMetadata { public: @@ -292,7 +292,7 @@ RefPtr<RefCounted> attachment; }; -class MetadataBuilder FB_FINAL : public RefCntIface<Api::MetadataBuilderImpl<MetadataBuilder> > +class MetadataBuilder FB_FINAL : public RefCntIface<Api::IMetadataBuilderImpl<MetadataBuilder> > { public: explicit MetadataBuilder(const MsgMetadata* from); Modified: firebird/trunk/src/common/StatusHolder.h =================================================================== --- firebird/trunk/src/common/StatusHolder.h 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/common/StatusHolder.h 2014-12-19 15:24:44 UTC (rev 60397) @@ -37,7 +37,7 @@ namespace Firebird { template <class Final> -class BaseStatus : public Api::StatusImpl<Final> +class BaseStatus : public Api::IStatusImpl<Final> { public: // IStatus implementation Modified: firebird/trunk/src/common/classes/ImplementHelper.h =================================================================== --- firebird/trunk/src/common/classes/ImplementHelper.h 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/common/classes/ImplementHelper.h 2014-12-19 15:24:44 UTC (rev 60397) @@ -135,7 +135,7 @@ // Trivial factory template <class P> -class SimpleFactoryBase : public AutoIface<Api::PluginFactoryImpl<SimpleFactoryBase<P> > > +class SimpleFactoryBase : public AutoIface<Api::IPluginFactoryImpl<SimpleFactoryBase<P> > > { public: IPluginBase* createPlugin(IStatus* status, IPluginConfig* factoryParameter) @@ -266,7 +266,7 @@ // 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<Api::PluginModuleImpl<UnloadDetectorHelper> > +class UnloadDetectorHelper FB_FINAL : public VersionedIface<Api::IPluginModuleImpl<UnloadDetectorHelper> > { public: typedef void VoidNoParam(); Modified: firebird/trunk/src/common/config/config.h =================================================================== --- firebird/trunk/src/common/config/config.h 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/common/config/config.h 2014-12-19 15:24:44 UTC (rev 60397) @@ -339,7 +339,7 @@ }; // Implementation of interface to access master configuration file -class FirebirdConf FB_FINAL : public Firebird::RefCntIface<Firebird::Api::FirebirdConfImpl<FirebirdConf> > +class FirebirdConf FB_FINAL : public Firebird::RefCntIface<Firebird::Api::IFirebirdConfImpl<FirebirdConf> > { public: FirebirdConf(Config* existingConfig) Modified: firebird/trunk/src/common/isc_sync.cpp =================================================================== --- firebird/trunk/src/common/isc_sync.cpp 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/common/isc_sync.cpp 2014-12-19 15:24:44 UTC (rev 60397) @@ -952,7 +952,7 @@ namespace { -class TimerEntry FB_FINAL : public Firebird::RefCntIface<Firebird::Api::TimerImpl<TimerEntry> > +class TimerEntry FB_FINAL : public Firebird::RefCntIface<Firebird::Api::ITimerImpl<TimerEntry> > { public: TimerEntry(int id, USHORT num) Modified: firebird/trunk/src/common/security.h =================================================================== --- firebird/trunk/src/common/security.h 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/common/security.h 2014-12-19 15:24:44 UTC (rev 60397) @@ -31,7 +31,7 @@ namespace Auth { -class CharField : public Firebird::AutoIface<Firebird::Api::CharUserFieldImpl<CharField> > +class CharField : public Firebird::AutoIface<Firebird::Api::ICharUserFieldImpl<CharField> > { public: CharField() @@ -96,7 +96,7 @@ Firebird::string value; }; -class IntField : public Firebird::AutoIface<Firebird::Api::IntUserFieldImpl<IntField> > +class IntField : public Firebird::AutoIface<Firebird::Api::IIntUserFieldImpl<IntField> > { public: IntField() @@ -151,7 +151,7 @@ typedef Firebird::Array<UCHAR> AuthenticationBlock; -class UserData : public Firebird::VersionedIface<Firebird::Api::UserImpl<UserData> > +class UserData : public Firebird::VersionedIface<Firebird::Api::IUserImpl<UserData> > { public: UserData() Modified: firebird/trunk/src/gpre/boot/gpre_meta_boot.cpp =================================================================== --- firebird/trunk/src/gpre/boot/gpre_meta_boot.cpp 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/gpre/boot/gpre_meta_boot.cpp 2014-12-19 15:24:44 UTC (rev 60397) @@ -684,7 +684,7 @@ using namespace Firebird; -class DummyMasterImpl : public FirebirdApi<FirebirdPolicy>::MasterImpl<DummyMasterImpl> +class DummyMasterImpl : public FirebirdApi<FirebirdPolicy>::IMasterImpl<DummyMasterImpl> { public: // IMaster implementation (almost dummy, for boot build) Modified: firebird/trunk/src/include/firebird/IdlFbInterfaces.h =================================================================== --- firebird/trunk/src/include/firebird/IdlFbInterfaces.h 2014-12-19 14:49:44 UTC (rev 60396) +++ firebird/trunk/src/include/firebird/IdlFbInterfaces.h 2014-12-19 15:24:44 UTC (rev 60397) @@ -3,6 +3,8 @@ #ifndef IDL_FB_INTERFACES_H #define IDL_FB_INTERFACES_H +#include <stdint.h> + #ifndef CLOOP_CARG #define CLOOP_CARG #endif @@ -29,133 +31,133 @@ public: // Forward interfaces declarations - class Versioned; - class ReferenceCounted; - class Disposable; - class Status; - class Master; - class PluginBase; - class PluginSet; - class ConfigEntry; - class Config; - class FirebirdConf; - class PluginConfig; - class PluginFactory; - class PluginModule; - class PluginManager; - class ConfigManager; - class EventCallback; - class Blob; - class Transaction; - class MessageMetadata; - class MetadataBuilder; - class ResultSet; - class Statement; - class Request; - class Events; - class Attachment; - class Service; - class Provider; - class DtcStart; - class Dtc; - class Auth; - class Writer; - class ServerBlock; - class ClientBlock; - class Server; - class Client; - class UserField; - class CharUserField; - class IntUserField; - class User; - class ListUsers; - class LogonInfo; - class Management; - class WireCryptPlugin; - class CryptKeyCallback; - class KeyHolderPlugin; - class DbCryptPlugin; - class ExternalContext; - class ExternalResultSet; - class ExternalFunction; - class ExternalProcedure; - class ExternalTrigger; - class RoutineMetadata; - class ExternalEngine; - class Timer; - class TimerControl; - class VersionCallback; - class Utl; - class TraceConnection; - class TraceDatabaseConnection; - class TraceTransaction; - class TraceParams; - class TraceStatement; - class TraceSQLStatement; - class TraceBLRStatement; - class TraceDYNRequest; - class TraceContextVariable; - class TraceProcedure; - class TraceFunction; - class TraceTrigger; - class TraceServiceConnection; - class TraceStatusVector; - class TraceSweepInfo; - class TraceLogWriter; - class TraceInitInfo; - class TracePlugin; - class TraceFactory; + class IVersioned; + class IReferenceCounted; + class IDisposable; + class IStatus; + class IMaster; + class IPluginBase; + class IPluginSet; + class IConfigEntry; + class IConfig; + class IFirebirdConf; + class IPluginConfig; + class IPluginFactory; + class IPluginModule; + class IPluginManager; + class IConfigManager; + class IEventCallback; + class IBlob; + class ITransaction; + class IMessageMetadata; + class IMetadataBuilder; + class IResultSet; + class IStatement; + class IRequest; + class IEvents; + class IAttachment; + class IService; + class IProvider; + class IDtcStart; + class IDtc; + class IAuth; + class IWriter; + class IServerBlock; + class IClientBlock; + class IServer; + class IClient; + class IUserField; + class ICharUserField; + class IIntUserField; + class IUser; + class IListUsers; + class ILogonInfo; + class IManagement; + class IWireCryptPlugin; + class ICryptKeyCallback; + class IKeyHolderPlugin; + class IDbCryptPlugin; + class IExternalContext; + class IExternalResultSet; + class IExternalFunction; + class IExternalProcedure; + class IExternalTrigger; + class IRoutineMetadata; + class IExternalEngine; + class ITimer; + class ITimerControl; + class IVersionCallback; + class IUtl; + class ITraceConnection; + class ITraceDatabaseConnection; + class ITraceTransaction; + class ITraceParams; + class ITraceStatement; + class ITraceSQLStatement; + class ITraceBLRStatement; + class ITraceDYNRequest; + class ITraceContextVariable; + class ITraceProcedure; + class ITraceFunction; + class ITraceTrigger; + class ITraceServiceConnection; + class ITraceStatusVector; + class ITraceSweepInfo; + class ITraceLogWriter; + class ITraceInitInfo; + class ITracePlugin; + class ITraceFactory; // Interfaces declarations - class Versioned + class IVersioned { public: struct VTable { void* cloopDummy[1]; uintptr_t version; - PluginModule* (CLOOP_CARG *getModule)(Versioned* self) throw(); + IPluginModule* (CLOOP_CARG *getModule)(IVersioned* self) throw(); }; void* cloopDummy[1]; VTable* cloopVTable; protected: - Versioned(DoNotInherit) + IVersioned(DoNotInherit) { } - ~Versioned() + ~IVersioned() { } public: static const unsigned VERSION = 1; - PluginModule* getModule() + IPluginModule* getModule() { - PluginModule* ret = static_cast<VTable*>(this->cloopVTable)->getModule(this); + IPluginModule* ret = static_cast<VTable*>(this->cloopVTable)->getModule(this); return ret; } }; - class ReferenceCounted : public Versioned + class IReferenceCounted : public IVersioned { public: - struct VTable : public Versioned::VTable + struct VTable : public IVersioned::VTable { - void (CLOOP_CARG *addRef)(ReferenceCounted* self) throw(); - int (CLOOP_CARG *release)(ReferenceCounted* self) throw(); + void (CLOOP_CARG *addRef)(IReferenceCounted* self) throw(); + int (CLOOP_CARG *release)(IReferenceCounted* self) throw(); }; protected: - ReferenceCounted(DoNotInherit) - : Versioned(DoNotInherit()) + IReferenceCounted(DoNotInherit) + : IVersioned(DoNotInherit()) { } - ~ReferenceCounted() + ~IReferenceCounted() { } @@ -174,21 +176,21 @@ } }; - class Disposable : public Versioned + class IDisposable : public IVersioned { public: - struct VTable : public Versioned::VTable + struct VTable : public IVersioned::VTable { - void (CLOOP_CARG *dispose)(Disposable* self) throw(); + void (CLOOP_CARG *dispose)(IDisposable* self) throw(); }; protected: - Disposable(DoNotInherit) - : Versioned(DoNotInherit()) + IDisposable(DoNotInherit) + : IVersioned(DoNotInherit()) { } - ~Disposable() + ~IDisposable() { } @@ -201,28 +203,28 @@ } }; - class Status : public Disposable + class IStatus : public IDisposable { public: - struct VTable : public Disposable::VTable + struct VTable : public IDisposable::VTable { - void (CLOOP_CARG *init)(Status* self) throw(); - unsigned (CLOOP_CARG *getStatus)(const Status* self) throw(); - void (CLOOP_CARG *setErrors2)(Status* self, unsigned length, const intptr_t* value) throw(); - void (CLOOP_CARG *setWarnings2)(Status* self, unsigned length, const intptr_t* value) throw(); - void (CLOOP_CARG *setErrors)(Status* self, const intptr_t* value) throw(); - void (CLOOP_CARG *setWarnings)(Status* self, const intptr_t* value) throw(); - const intptr_t* (CLOOP_CARG *getErrors)(const Status* self) throw(); - const intptr_t* (CLOOP_CARG *getWarnings)(const Status* self) throw(); + void (CLOOP_CARG *init)(IStatus* self) throw(); + unsigned (CLOOP_CARG *getStatus)(const IStatus* self) throw(); + void (CLOOP_CARG *setErrors2)(IStatus* self, unsigned length, const intptr_t* value) throw(); + void (CLOOP_CARG *setWarnings2)(IStatus* self, unsigned length, const intptr_t* value) throw(); + void (CLOOP_CARG *setErrors)(IStatus* self, const intptr_t* value) throw(); + void (CLOOP_CARG *setWarnings)(IStatus* self, const intptr_t* value) throw(); + const intptr_t* (CLOOP_CARG *getErrors)(const IStatus* self) throw(); + const intptr_t* (CLOOP_CARG *getWarnings)(const IStatus* self) throw(); }; protected: - Status(DoNotInherit) - : Disposable(DoNotInherit()) + IStatus(DoNotInherit) + : IDisposable(DoNotInherit()) { } - ~Status() + ~IStatus() { } @@ -280,54 +282,54 @@ } }; - class Master : public Versioned + class IMaster : public IVersioned { public: - struct VTable : public Versioned::VTable + struct VTable : public IVersioned::VTable { - Status* (CLOOP_CARG *getStatus)(Master* self) throw(); - Provider* (CLOOP_CARG *getDispatcher)(Master* self) throw(); - PluginManager* (CLOOP_CARG *getPluginManager)(Master* self) throw(); - const char* (CLOOP_CARG *circularAlloc)(Master* self, const char* s, unsigned len, intptr_t thr) throw(); - TimerControl* (CLOOP_CARG *getTimerControl)(Master* self) throw(); - Dtc* (CLOOP_CARG *getDtc)(Master* self) throw(); - Attachment* (CLOOP_CARG *registerAttachment)(Master* self, Provider* provider, Attachment* attachment) throw(); - Transaction* (CLOOP_CARG *registerTransaction)(Master* self, Attachment* attachment, Transaction* transaction) throw(); - int (CLOOP_CARG *same)(Master* self, Versioned* first, Versioned* second) throw(); - MetadataBuilder* (CLOOP_CARG *getMetadataBuilder)(Master* self, Status* status, unsigned fieldCount) throw(); - int (CLOOP_CARG *serverMode)(Master* self, int mode) throw(); - Utl* (CLOOP_CARG *getUtlInterface)(Master* self) throw(); - ConfigManager* (CLOOP_CARG *getConfigManager)(Master* self) throw(); + IStatus* (CLOOP_CARG *getStatus)(IMaster* self) throw(); + IProvider* (CLOOP_CARG *getDispatcher)(IMaster* self) throw(); + IPluginManager* (CLOOP_CARG *getPluginManager)(IMaster* self) throw(); + const char* (CLOOP_CARG *circularAlloc)(IMaster* self, const char* s, unsigned len, intptr_t thr) throw(); + ITimerControl* (CLOOP_CARG *getTimerControl)(IMaster* self) throw(); + IDtc* (CLOOP_CARG *getDtc)(IMaster* self) throw(); + IAttachment* (CLOOP_CARG *registerAttachment)(IMaster* self, IProvider* provider, IAttachment* attachment) throw(); + ITransaction* (CLOOP_CARG *registerTransaction)(IMaster* self, IAttachment* attachment, ITransaction* transaction) throw(); + int (CLOOP_CARG *same)(IMaster* self, IVersioned* first, IVersioned* second) throw(); + IMetadataBuilder* (CLOOP_CARG *getMetadataBuilder)(IMaster* self, IStatus* status, unsigned fieldCount) throw(); + int (CLOOP_CARG *serverMode)(IMaster* self, int mode) throw(); + IUtl* (CLOOP_CARG *getUtlInterface)(IMaster* self) throw(); + IConfigManager* (CLOOP_CARG *getConfigManager)(IMaster* self) throw(); }; protected: - Master(DoNotInherit) - : Versioned(DoNotInherit()) + IMaster(DoNotInherit) + : IVersioned(DoNotInherit()) { } - ~Master() + ~IMaster() { } public: static const unsigned VERSION = 2; - Status* getStatus() + IStatus* getStatus() { - Status* ret = static_cast<VTable*>(this->cloopVTable)->getStatus(this); + IStatus* ret = static_cast<VTable*>(this->cloopVTable)->getStatus(this); return ret; } - Provider* getDispatcher() + IProvider* getDispatcher() { - Provider* ret = static_cast<VTable*>(this->cloopVTable)->getDispatcher(this); + IProvider* ret = static_cast<VTable*>(this->cloopVTable)->getDispatcher(this); return ret; } - PluginManager* getPluginManager() + IPluginManager* getPluginManager() { - PluginManager* ret = static_cast<VTable*>(this->cloopVTable)->getPluginManager(this); + IPluginManager* ret = static_cast<VTable*>(this->cloopVTable)->getPluginManager(this); return ret; } @@ -337,40 +339,40 @@ return ret; } - TimerControl* getTimerControl() + ITimerControl* getTimerControl() { - TimerControl* ret = static_cast<VTable*>(this->cloopVTable)->getTimerControl(this); + ITimerControl* ret = static_cast<VTable*>(this->cloopVTable)->getTimerControl(this); return ret; } - Dtc* getDtc() + IDtc* getDtc() { - Dtc* ret = static_cast<VTable*>(this->cloopVTable)->getDtc(this); + IDtc* ret = static_cast<VTable*>(this->cloopVTable)->getDtc(this); return ret; } - Attachment* registerAttachment(Provider* provider, Attachment* attachment) + IAttachment* registerAttachment(IProvider* provider, IAttachment* attachment) { - Attachment* ret = static_cast<VTable*>(this->cloopVTable)->registerAttachment(this, provider, attachment); + IAttachment* ret = static_cast<VTable*>(this->cloopVTable)->registerAttachment(this, provider, attachment); return ret; } - Transaction* registerTransaction(Attachment* attachment, Transaction* transaction) + ITransaction* registerTransaction(IAttachment* attachment, ITransaction* transaction) { - Transaction* ret = static_cast<VTable*>(this->cloopVTable)->registerTransaction(this, attachment, transaction); + ITransaction* ret = static_cast<VTable*>(this->cloopVTable)->registerTransaction(this, attachment, transaction); return ret; } - int same(Versioned* first, Versioned* second) + int same(IVersioned* first, IVersioned* second) { int ret = static_cast<VTable*>(this->cloopVTable)->same(this, first, second); return ret; } - MetadataBuilder* getMetadataBuilder(Status* status, unsigned fieldCount) + IMetadataBuilder* getMetadataBuilder(IStatus* status, unsigned fieldCount) { - typename Policy::Status status2(status); - MetadataBuilder* ret = static_cast<VTable*>(this->cloopVTable)->getMetadataBuilder(this, status2, fieldCount); + typename Policy::IStatus status2(status); + IMetadataBuilder* ret = static_cast<VTable*>(this->cloopVTable)->getMetadataBuilder(this, status2, fieldCount); Policy::checkException(status2); return ret; } @@ -381,72 +383,72 @@ return ret; } - Utl* getUtlInterface() + IUtl* getUtlInterface() { - Utl* ret = static_cast<VTable*>(this->cloopVTable)->getUtlInterface(this); + IUtl* ret = static_cast<VTable*>(this->cloopVTable)->getUtlInterface(this); return ret; } - ConfigManager* getConfigManager() + IConfigManager* getConfigManager() { - ConfigManager* ret = static_cast<VTable*>(this->cloopVTable)->getConfigManager(this); + IConfigManager* ret = static_cast<VTable*>(this->cloopVTable)->getConfigManager(this); return ret; } }; - class PluginBase : public ReferenceCounted + class IPluginBase : public IReferenceCounted { public: - struct VTable : public ReferenceCounted::VTable + struct VTable : public IReferenceCounted::VTable { - void (CLOOP_CARG *setOwner)(PluginBase* self, ReferenceCounted* r) throw(); - ReferenceCounted* (CLOOP_CARG *getOwner)(PluginBase* self) throw(); + void (CLOOP_CARG *setOwner)(IPluginBase* self, IReferenceCounted* r) throw(); + IReferenceCounted* (CLOOP_CARG *getOwner)(IPluginBase* self) throw(); }; protected: - PluginBase(DoNotInherit) - : ReferenceCounted(DoNotInherit()) + IPluginBase(DoNotInherit) + : IReferenceCounted(DoNotInherit()) { } - ~PluginBase() + ~IPluginBase() { } public: static const unsigned VERSION = 3; - void setOwner(ReferenceCounted* r) + void setOwner(IReferenceCounted* r) { static_cast<VTable*>(this->cloopVTable)->setOwner(this, r); } - ReferenceCounted* getOwner() + IReferenceCounted* getOwner() { - ReferenceCounted* ret = static_cast<VTable*>(this->cloopVTable)->getOwner(this); + IReferenceCounted* ret = static_cast<VTable*>(this->cloopVTable)->getOwner(this); return ret; } }; - class PluginSet : public ReferenceCounted + class IPluginSet : public IReferenceCounted { public: - struct VTable : public ReferenceCounted::VTable + struct VTable : public IReferenceCounted::VTable { - const char* (CLOOP_CARG *getName)(const PluginSet* self) throw(); - const char* (CLOOP_CARG *getModuleName)(const PluginSet* self) throw(); - PluginBase* (CLOOP_CARG *getPlugin)(PluginSet* self, Status* status) throw(); - void (CLOOP_CARG *next)(PluginSet* self, Status* status) throw(); - void (CLOOP_CARG *set)(PluginSet* self, Status* status, const char* s) throw(); + const char* (CLOOP_CARG *getName)(const IPluginSet* self) throw(); + const char* (CLOOP_CARG *getModuleName)(const IPluginSet* self) throw(); + IPluginBase* (CLOOP_CARG *getPlugin)(IPluginSet* self, IStatus* status) throw(); + void (CLOOP_CARG *next)(IPluginSet* self, IStatus* status) throw(); + void (CLOOP_CARG *set)(IPluginSet* self, IStatus* status, const char* s) throw(); }; protected: - PluginSet(DoNotInherit) - : ReferenceCounted(DoNotInherit()) + IPluginSet(DoNotInherit) + : IReferenceCounted(DoNotInherit()) { } - ~PluginSet() + ~IPluginSet() { } @@ -465,48 +467,48 @@ return ret; } - PluginBase* getPlugin(Status* status) + IPluginBase* getPlugin(IStatus* status) { - typename Policy::Status status2(status); - PluginBase* ret = static_cast<VTable*>(this->cloopVTable)->getPlugin(this, status2); + typename Policy::IStatus status2(status); + IPluginBase* ret = static_cast<VTable*>(this->cloopVTable)->getPlugin(this, status2); Policy::checkException(status2); return ret; } - void next(Status* status) + void next(IStatus* status) { - typename Policy::Status status2(status); + typename Policy::IStatus status2(status); static_cast<VTable*>(this->cloopVTable)->next(this, status2); Policy::checkException(status2); } - void set(Status* status, const char* s) + void set(IStatus* status, const char* s) { - typename Policy::Status status2(status); + typename Policy::IStatus status2(status); static_cast<VTable*>(this->cloopVTable)->set(this, status2, s); Policy::checkException(status2); } }; - class ConfigEntry : public ReferenceCounted + class IConfigEntry : public IReferenceCounted { public: - struct VTable : public ReferenceCounted::VTable + struct VTable : public IReferenceCounted::VTable { - const char* (CLOOP_CARG *getName)(ConfigEntry* self) throw(); - const char* (CLOOP_CARG *getValue)(ConfigEntry* self) throw(); - ISC_INT64 (CLOOP_CARG *getIntValue)(ConfigEntry* self) throw(); - FB_BOOLEAN (CLOOP_CARG *getBoolValue)(ConfigEntry* self) throw(); - Config* (CLOOP_CARG *getSubConfig)(ConfigEntry* self, Status* status) throw(); + const char* (CLOOP_CARG *getName)(IConfigEntry* self) throw(); + const char* (CLOOP_CARG *getValue)(IConfigEntry* self) throw(); + ISC_INT64 (CLOOP_CARG *getIntValue)(IConfigEntry* self) throw(); + FB_BOOLEAN (CLOOP_CARG *getBoolValue)(IConfigEntry* self) throw(); + IConfig* (CLOOP_CARG *getSubConfig)(IConfigEntry* self, IStatus* status) throw(); }; protected: - ConfigEntry(DoNotInherit) - : ReferenceCounted(DoNotInherit()) + IConfigEntry(DoNotInherit) + : IReferenceCounted(DoNotInherit()) { } - ~ConfigEntry() + ~IConfigEntry() { } @@ -537,81 +539,81 @@ return ret; } - Config* getSubConfig(Status* status) + IConfig* getSubConfig(IStatus* status) { - typename Policy::Status status2(status); - Config* ret = static_cast<VTable*>(this->cloopVTable)->getSubConfig(this, status2); + typename Policy::IStatus status2(status); + IConfig* ret = static_cast<VTable*>(this->cloopVTable)->getSubConfig(this, status2); Policy::checkException(status2); return ret; } }; - class Config : public ReferenceCounted + class IConfig : public IReferenceCounted { public: - struct VTable : public ReferenceCounted::VTable + struct VTable : public IReferenceCounted::VTable { - ConfigEntry* (CLOOP_CARG *find)(Config* self, Status* status, const char* name) throw(); - ConfigEntry* (CLOOP_CARG *findValue)(Config* self, Status* status, const char* name, const char* value) throw(); - ConfigEntry* (CLOOP_CARG *findPos)(Config* self, Status* status, const char* name, unsigned pos) throw(); + IConfigEntry* (CLOOP_CARG *find)(IConfig* self, IStatus* status, const char* name) throw(); + IConfigEntry* (CLOOP_CARG *findValue)(IConfig* self, IStatus* status, const char* name, const char* value) throw(); + IConfigEntry* (CLOOP_CARG *findPos)(IConfig* self, IStatus* status, const char* name, unsigned pos) throw(); }; protected: - Config(DoNotInherit) - : ReferenceCounted(DoNotInherit()) + IConfig(DoNotInherit) + : IReferenceCounted(DoNotInherit()) { } - ~Config() + ~IConfig() { } public: static const unsigned VERSION = 3; - ConfigEntry* find(Status* status, const char* name) + IConfigEntry* find(IStatus* status, const char* name) { - typename Policy::Status status2(status); - ConfigEntry* ret = static_cast<VTable*>(this->cloopVTable)->find(this, status2, name); + typename Policy::IStatus status2(status); + IConfigEntry* ret = static_cast<VTable*>(this->cloopVTable)->find(this, status2, name); Policy::checkException(status2); return ret; } - ConfigEntry* findValue(Status* status, const char* name, const char* value) + IConfigEntry* findValue(IStatus* status, const char* name, const char* value) { - typename Policy::Status status2(status); - ConfigEntry* ret = static_cast<VTable*>(this->cloopVTable)->findValue(this, status2, name, value); + typename Policy::IStatus status2(status); + IConfigEntry* ret = static_cast<VTable*>(this->cloopVTable)->findValue(this, status2, name, value); Policy::checkException(status2); return ret; } - ConfigEntry* findPos(Status* status, const char* name, unsigned pos) + IConfigEntry* findPos(IStatus* status, const char* name, unsigned pos) { - typename Policy::Status status2(status); - ConfigEntry* ret = static_cast<VTable*>(this->cloopVTable)->findPos(this, status2, name, pos); + typename Policy::IStatus status2(status); + IConfigEntry* ret = static_cast<VTable*>(this->cloopVTable)->findPos(this, status2, name, pos); Policy::checkException(status2); return ret; } }; - class FirebirdConf : public ReferenceCounted + class IFirebirdConf : public IReferenceCounted { public: - struct VTable : public ReferenceCounted::VTable + struct VTable : public IReferenceCounted::VTable { - unsigned (CLOOP_CARG *getKey)(FirebirdConf* self, const char* name) throw(); - ISC_INT64 (CLOOP_CARG *asInteger)(FirebirdConf* self, unsigned key) throw(); - const char* (CLOOP_CARG *asString)(FirebirdConf* self, unsigned key) throw(); - FB_BOOLEAN (CLOOP_CARG *asBoolean)(FirebirdConf* self, unsigned key) throw(); + unsigned (CLOOP_CARG *getKey)(IFirebirdConf* self, const char* name) throw(); + ISC_INT64 (CLOOP_CARG *asInteger)(IFirebirdConf* self, unsigned key) throw(); + const char* (CLOOP_CARG *asString)(IFirebirdConf* self, unsigned key) throw(); + FB_BOOLEAN (CLOOP_CARG *asBoolean)(IFirebirdConf* self, unsigned key) throw(); }; protected: - FirebirdConf(DoNotInherit) - : ReferenceCounted(DoNotInherit()) + IFirebirdConf(DoNotInherit) + : IReferenceCounted(DoNotInherit()) { } - ~FirebirdConf() + ~IFirebirdConf() { } @@ -643,24 +645,24 @@ } }; - class PluginConfig : public ReferenceCounted + class IPluginConfig : public IReferenceCounted { public: - struct VTable : public ReferenceCounted::VTable + struct VTable : public IReferenceCounted::VTable { - const char* (CLOOP_CARG *getConfigFileName)(PluginConfig* self) throw(); - Config* (CLOOP_CARG *getDefaultConfig)(PluginConfig* self, Status* status) throw(); - FirebirdConf* (CLOOP_CARG *getFirebirdConf)(PluginConfig* self, Status* status) throw(); - void (CLOOP_CARG *setReleaseDelay)(PluginConfig* self, Status* status, ISC_UINT64 microSeconds) throw(); + const char* (CLOOP_CARG *getConfigFileName)(IPluginConfig* self) throw(); + IConfig* (CLOOP_CARG *getDefaultConfig)(IPluginConfig* self, IStatus* status) throw(); + IFirebirdConf* (CLOOP_CARG *getFirebirdConf)(IPluginConfig* self, IStatus* status) throw(); + void (CLOOP_CARG *setReleaseDelay)(IPluginConfig* self, IStatus* status, ISC_UINT64 microSeconds) throw(); }; protected: - PluginConfig(DoNotInherit) - : ReferenceCounted(DoNotInherit()) + IPluginConfig(DoNotInherit) + : IReferenceCounted(DoNotInherit()) { } - ~PluginConfig() + ~IPluginConfig() { } @@ -673,75 +675,75 @@ return ret; } - Config* getDefaultConfig(Status* status) + IConfig* getDefaultConfig(IStatus* status) { - typename Policy::Status status2(status); - Config* ret = static_cast<VTable*>(this->cloopVTable)->getDefaultConfig(this, status2); + typename Policy::IStatus status2(status); + IConfig* ret = static_cast<VTable*>(this->cloopVTable)->getDefaultConfig(this, status2); Policy::checkException(status2); return ret; } - FirebirdConf* getFirebirdConf(Status* status) + IFirebirdConf* getFirebirdConf(IStatus* status) { - typename Policy::Status status2(status); - FirebirdConf* ret = static_cast<VTable*>(this->cloopVTable)->getFirebirdConf(this, status2); + typename Policy::IStatus status2(status); + IFirebirdConf* ret = static_cast<VTable*>(this->cloopVTable)->getFirebirdConf(this, status2); Policy::checkException(status2); return ret; } - void setReleaseDelay(Status* status, ISC_UINT64 microSeconds) + void setReleaseDelay(IStatus* status, ISC_UINT64 microSeconds) { - typename Policy::Status status2(status); + typename Policy::IStatus status2(status); static_cast<VTable*>(this->cloopVTable)->setReleaseDelay(this, status2, microSeconds); Policy::checkException(status2); } }; - class PluginFactory : public Versioned + class IPluginFactory : public IVersioned { public: - struct VTable : public Versioned::VTable + struct VTable : public IVersioned::VTable { - PluginBase* (CLOOP_CARG *createPlugin)(PluginFactory* self, Status* status, PluginConfig* factoryParameter) throw(); + IPluginBase* (CLOOP_CARG *createPlugin)(IPluginFactory* self, IStatus* status, IPluginConfig* factoryParameter) throw(); }; protected: - PluginFactory(DoNotInherit) - : Versioned(DoNotInherit()) + IPluginFactory(DoNotInherit) + : IVersioned(DoNotInherit()) { } - ~PluginFactory() + ~IPluginFactory() { } public: static const unsigned VERSION = 2; - PluginBase* createPlugin(Status* status, PluginConfig* factoryParameter) + IPluginBase* createPlugin(IStatus* status, IPluginConfig* factoryParameter) { - typename Policy::Status status2(status); - PluginBase* ret = static_cast<VTable*>(this->cloopVTable)->createPlugin(this, status2, factoryParameter); + typename Policy::IStatus status2(status); + IPluginBase* ret = static_cast<VTable*>(this->cloopVTable)->createPlugin(this, status2, factoryParameter); Policy::checkException(status2); return ret; } }; - class PluginModule : public Versioned + class IPluginModule : public IVersioned { public: - struct VTable : public Versioned::VTable + struct VTable : public IVersioned::VTable { - void (CLOOP_CARG *doClean)(PluginModule* self) throw(); + void (CLOOP_CARG *doClean)(IPluginModule* self) throw(); }; protected: - PluginModule(DoNotInherit) - : Versioned(DoNotInherit()) + IPluginModule(DoNotInherit) + : IVersioned(DoNotInherit()) { } - ~PluginModule() + ~IPluginModule() { } @@ -754,26 +756,26 @@ } }; - class PluginManager : public Versioned + class IPluginManager : public IVersioned { public: - struct VTable : public Versioned::VTable + struct VTable : public IVersioned::VTable { - void (CLOOP_CARG *registerPluginFactory)(PluginManager* self, unsigned pluginType, const char* defaultName, PluginFactory* factory) throw(); - void (CLOOP_CARG *registerModule)(PluginManager* self, PluginModule* cleanup) throw(); - void (CLOOP_CARG *unregisterModule)(PluginManager* self, PluginModule* cleanup) throw(); - PluginSet* (CLOOP_CARG *getPlugins)(PluginManager* self, Status* status, unsigned pluginType, const char* namesList, FirebirdConf* firebirdConf) throw(); - Config* (CLOOP_CARG *getConfig)(PluginManager* self, Status* status, const char* filename) throw(); - void (CLOOP_CARG *releasePlugin)(PluginManager* self, PluginBase* plugin) throw(); + void (CLOOP_CARG *registerPluginFactory)(IPluginManager* self, unsigned pluginType, const char* defaultName, IPluginFactory* factory) throw(); + void (CLOOP_CARG *registerModule)(IPluginManager* self, IPluginModule* cleanup) throw(); + void (CLOOP_CARG *unregisterModule)(IPluginManager* self, IPluginModule* cleanup) throw(); + IPluginSet* (CLOOP_CARG *getPlugins)(IPluginManager* self, IStatus* status, unsigned pluginType, const char* namesList, IFirebirdConf* firebirdConf) throw(); + IConfig* (CLOOP_CARG *getConfig)(IPluginManager* self, IStatus* status, const char* filename) throw(); + void (CLOOP_CARG *releasePlugin)(IPluginManager* self, IPluginBase* plugin) throw(); }; protected: - PluginManager(DoNotInherit) - : Versioned(DoNotInherit()) + IPluginManager(DoNotInherit) + : IVersioned(DoNotInherit()) { } - ~PluginManager() + ~IPluginManager() { } @@ -792,63 +794,63 @@ static const unsigned KeyHolder = 10; static const unsigned MaxType = 11; - void registerPluginFactory(unsigned pluginType, const char* defaultName, PluginFactory* factory) + void registerPluginFactory(unsigned pluginType, const char* defaultName, IPluginFactory* factory) { static_cast<VTable*>(this->cloopVTable)->registerPluginFactory(this, pluginType, defaultName, factory); } - void registerModule(PluginModule* cleanup) + void registerModule(IPluginModule* cleanup) { static_cast<VTable*>(this->cloopVTable)->registerModule(this, cleanup); } - void unregisterModule(PluginModule* cleanup) + void unregisterModule(IPluginModule* cleanup) { static_cast<VTable*>(this->cloopVTable)->unregisterModule(this, cleanup); } - PluginSet* getPlugins(Status* status, unsigned pluginType, const char* namesList, FirebirdConf* firebirdConf) + IPluginSet* getPlugins(IStatus* status, unsigned pluginType, const char* namesList, IFirebirdConf* firebirdConf) { - typename Policy::Status status2(status); - PluginSet* ret = static_cast<VTable*>(this->cloopVTable)->getPlugins(this, status2, pluginType, namesList, firebirdConf); + typename Policy::IStatus status2(status); + IPluginSet* ret = static_cast<VTable*>(this->cloopVTable)->getPlugins(this, status2, pluginType, namesList, firebirdConf); Policy::checkException(status2); return ret; } - Config* getConfig(Status* status, const char* filename) + IConfig* getConfig(IStatus* status, const char* filename) { - typename Policy::Status status2(status); - Config* ret = static_cast<VTable*>(this->cloopVTable)->getConfig(this, status2, filename); + typename Policy::IStatus status2(status); + IConfig* ret = static_cast<VTable*>(this->cloopVTable)->getConfig(this, status2, filename); Policy::checkException(status2); return ret; } - void releasePlugin(PluginBase* plugin) + void releasePlugin(IPluginBase* plugin) { static_cast<VTable*>(this->cloopVTable)->releasePlugin(this, plugin); } }; - class ConfigManager : public Versioned + class IConfigManager : public IVersioned { public: - struct VTable : public Versioned::VTable + struct VTable : public IVersioned::VTable { - const char* (CLOOP_CARG *getDirectory)(ConfigManager* self, unsigned code) throw(); - FirebirdConf* (CLOOP_CARG *getFirebirdConf)(ConfigManager* self) throw(); - FirebirdConf* (CLOOP_CARG *getDatabaseConf)(ConfigManager* self, const char* dbName) throw(); - Config* (CLOOP_CARG *getPluginConfig)(ConfigManager* self, const char* configuredPlugin) throw(); - const char* (CLOOP_CARG *getInstallDirectory)(ConfigManager* self) throw(); - const char* (CLOOP_CARG *getRootDirectory)(ConfigManager* self) throw(); + const char* (CLOOP_CARG *getDirectory)(IConfigManager* self, unsigned code) throw(); + IFirebirdConf* (CLOOP_CARG *getFirebirdConf)(IConfigManager* self) throw(); + IFirebirdConf* (CLOOP_CARG *getDatabaseConf)(IConfigManager* self, const char* dbName) throw(); + IConfig* (CLOOP_CARG *getPluginConfig)(IConfigManager* self, const char* configuredPlugin) throw(); + const char* (CLOOP_CARG *getInstallDirectory)(IConfigManager* self) throw(); + const char* (CLOOP_CARG *getRootDirectory)(IConfigManager* self) throw(); }; protected: - ConfigManager(DoNotInherit) - : Versioned(DoNotInherit()) + IConfigManager(DoNotInherit) + : IVersioned(DoNotInherit()) { } - ~ConfigManager() + ~IConfigManager() { } @@ -880,21 +882,21 @@ return ret; } - FirebirdConf* getFirebirdConf() + IFirebirdConf* getFirebirdConf() { - FirebirdConf* ret = static_cast<VTable*>(this->cloopVTable)->getFirebirdConf(this); + IFirebirdConf* ret = static_cast<VTable*>(this->cloopVTable)->getFirebirdConf(this); return ret; } - FirebirdConf* getDatabaseConf(const char* dbName) + IFirebirdConf* getDatabaseConf(const char* dbName) { - FirebirdConf* ret = static_cast<VTable*>(this->cloopVTable)->getDatabaseConf(this, dbName); + IFirebirdConf* ret = static_cast<VTable*>(this->cloopVTable)->getDatabaseConf(this, dbName); return ret; } - Config* getPluginConfig(const char* configuredPlugin) + IConfig* getPluginConfig(const char* configuredPlugin) { - Config* ret = static_cast<VTable*>(this->cloopVTable)->getPluginConfig(this, configuredPlugin); + IConfig* ret = static_cast<VTable*>(this->cloopVTable)->getPluginConfig(this, configuredPlugin); return ret; } @@ -911,21 +913,21 @@ } }; - class EventCallback : public ReferenceCounted + class IEventCallback : public IReferenceCounted { public: - struct VTable : public ReferenceCounted::VTable + struct VTable : public IReferenceCounted::VTable { - void (CLOOP_CARG *eventCallbackFunction)(EventCallback* self, unsigned length, const unsigned char* events) throw(); + void (CLOOP_CARG *eventCallbackFunction)(IEventCallback* self, unsigned length, const unsigned char* events) throw(); }; protected: - EventCallback(DoNotInherit) - : ReferenceCounted(DoNotInherit()) + IEventCallback(DoNotInherit) + : IReferenceCounted(DoNotInherit()) { } - ~EventCallback() + ~IEventCallback() { } @@ -938,583 +940,583 @@ } }; - class Blob : public ReferenceCounted + class IBlob : public IReferenceCounted { public: - struct VTable : public ReferenceCounted::VTable + struct VTable : public IReferenceCounted::VTable { - void (CLOOP_CARG *getInfo)(Blob* self, Status* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) throw(); - int (CLOOP_CARG *getSegment)(Blob* self, Status* status, unsigned bufferLength, void* buffer, unsigned* segmentLength) throw(); - void (CLOOP_CARG *putSegment)(Blob* self, Status* status, unsigned length, const void* buffer) throw(); - void (CLOOP_CARG *cancel)(Blob* self, Status* status) throw(); - void (CLOOP_CARG *close)(Blob* self, Status* status) throw(); - int (CLOOP_CARG *seek)(Blob* self, Status* status, int mode, int offset) throw(); + void (CLOOP_CARG *getInfo)(IBlob* self, IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) throw(); + int (CLOOP_CARG *getSegment)(IBlob* self, IStatus* status, unsigned bufferLength, void* buffer, unsigned* segmentLength) throw(); + void (CLOOP_CARG *putSegment)(IBlob* self, IStatus* status, unsigned length, const void* buffer) throw(); + void (CLOOP_CARG *cancel)(IBlob* self, IStatus* status) throw(); + void (CLOOP_CARG *close)(IBlob* self, IStatus* status) throw(); + int (CLOOP_CARG *seek)(IBlob* self, IStatus* status, int mode, int offset) throw(); }; protected: - Blob(DoNotInherit) - : ReferenceCounted(DoNotInherit()) + IBlob(DoNotInherit) + : IReferenceCounted(DoNotInherit()) { } - ~Blob() + ~IBlob() { } public: static const unsigned VERSION = 3; - void getInfo(Status* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) + void getInfo(IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) { - typename Policy::Status status2(status); + typename Policy::IStatus status2(status); static_cast<VTable*>(this->cloopVTable)->getInfo(this, status2, itemsLength, items, bufferLength, buffer); Policy::checkException(status2); } - int getSegment(Status* status, unsigned bufferLength, void* buffer, unsigned* segmentLength) + int getSegment(IStatus* status, unsigned bufferLength, void* buffer, unsigned* segmentLength) { - typename Policy::Status status2(status); + typename Policy::IStatus status2(status); int ret = static_cast<VTable*>(this->cloopVTable)->getSegment(this, status2, bufferLength, buffer, segmentLength); Policy::checkException(status2); return ret; } - void putSegment(Status* status, unsigned length, const void* buffer) + void putSegment(IStatus* status, unsigned length, const void* buffer) { - typename Policy::Status status2(status); + typename Policy::IStatus status2(status); static_cast<VTable*>(this->cloopVTable)->putSegment(this, status2, length, buffer); Policy::checkException(status2); } - void cancel(Status* status) + void cancel(IStatus* status) { - typename Policy::Status status2(status); + typename Policy::IStatus status2(status); static_cast<VTable*>(this->cloopVTable)->cancel(this, status2); Policy::checkException(status2); } - void close(Status* status) + void close(IStatus* status) { - typename Policy::Status status2(status); + typename Policy::IStatus status2(status); static_cast<VTable*>(this->cloopVTable)->close(this, status2); Policy::checkException(status2); } - int seek(Status* status, int mode, int offset) + int seek(IStatus* status, int mode, int offset) { - typename Policy::Status status2(status); + typename Policy::IStatus status2(status); int ret = static_cast<VTable*>(this->cloopVTable)->seek(this, status2, mode, offset); Policy::checkException(status2); return ret; } }; - class Transaction : public ReferenceCounted + class ITransaction : public IReferenceCounted { public: - struct VTable : public ReferenceCounted::VTable + struct VTable : public IReferenceCounted::VTable { - void (CLOOP_CARG *getInfo)(Transaction* self, Status* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) throw(); - void (CLOOP_CARG *prepare)(Transaction* self, Status* status, unsigned msgLength, const unsigned char* message) throw(); - void (CLOOP_CARG *commit)(Transaction* self, Status* status) throw(); - void (CLOOP_CARG *commitRetaining)(Transaction* self, Status* status) throw(); - void (CLOOP_CARG *rollback)(Transaction* self, Status* status) throw(); - void (CLOOP_CARG *rollbackRetaining)(Transaction* self, Status* status) throw(); - void (CLOOP_CARG *disconnect)(Transaction* self, Status* status) throw(); - Transaction* (CLOOP_CARG *join)(Transaction* self, Status* status, Transaction* transaction) throw(); - Transaction* (CLOOP_CARG *validate)(Transaction* self, Status* status, Attachment* attachment) throw(); - Transaction* (CLOOP_CARG *enterDtc)(Transaction* self, Status* status) throw(); + void (CLOOP_CARG *getInfo)(ITransaction* self, IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) throw(); + void (CLOOP_CARG *prepare)(ITransaction* self, IStatus* status, unsigned msgLength, const unsigned char* message) throw(); + void (CLOOP_CARG *commit)(ITransaction* self, IStatus* status) throw(); + void (CLOOP_CARG *commitRetaining)(ITransaction* self, IStatus* status) throw(); + void (CLOOP_CARG *rollback)(ITransaction* self, IStatus* status) throw(); + void (CLOOP_CARG *rollbackRetaining)(ITransaction* self, IStatus* status) throw(); + void (CLOOP_CARG *disconnect)(ITransaction* self, IStatus* status) throw(); + ITransaction* (CLOOP_CARG *join)(ITransaction* self, IStatus* status, ITransaction* transaction) throw(); + ITransaction* (CLOOP_CARG *validate)(ITransaction* self, IStatus* status, IAttachment* attachment) throw(); + ITransaction* (CLOOP_CARG *enterDtc)(ITransaction* self, IStatus* status) throw(); }; protected: - Transaction(DoNotInherit) - : ReferenceCounted(DoNotInherit()) + ITransaction(DoNotInherit) + : IReferenceCounted(DoNotInherit()) { } - ~Transaction() + ~ITransaction() { } public: static const unsigned VERSION = 3; - void getInfo(Status* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) + void getInfo(IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) { - typename Policy::Status status2(status); + typename Policy::IStatus status2(status); static_cast<VTable*>(this->cloopVTable)->getInfo(this, status2, itemsLength, items, bufferLength, buffer); Policy::checkException(status2); } - void prepare(Status* status, unsigned msgLength, const unsigned char* message) + void prepare(IStatus* status, unsigned msgLength, const unsigned char* message) { - typename Policy::Status status2(status); + typename Policy::IStatus status2(status); static_cast<VTable*>(this->cloopVTable)->prepare(this, status2, msgLength, message); Policy::checkException(status2); } - void commit(Status* status) + void commit(IStatus* status) { - typename Policy::Status status2(status); + typename Policy::IStatus status2(status); static_cast<VTable*>(this->cloopVTable)->commit(this, status2); Policy::checkException(status2); } - void commitRetaining(Status* status) + void commitRetaining(IStatus* status) { - typename Policy::Status status2(status); + typename Policy::IStatus status2(status); static_cast<VTable*>(this->cloopVTable)->commitRetaining(this,... [truncated message content] |