diff --git a/src/common/classes/ImplementHelper.h b/src/common/classes/ImplementHelper.h index 9aebedc76f..08053979d1 100644 --- a/src/common/classes/ImplementHelper.h +++ b/src/common/classes/ImplementHelper.h @@ -251,11 +251,11 @@ public: // Misc utl access -class UtlInterfacePtr : public AccessAutoInterface +class UtilInterfacePtr : public AccessAutoInterface { public: - UtlInterfacePtr() - : AccessAutoInterface(getMasterInterface()->getUtlInterface()) + UtilInterfacePtr() + : AccessAutoInterface(getMasterInterface()->getUtilInterface()) { } }; diff --git a/src/gpre/boot/gpre_meta_boot.cpp b/src/gpre/boot/gpre_meta_boot.cpp index c76061e837..8487ccf70c 100644 --- a/src/gpre/boot/gpre_meta_boot.cpp +++ b/src/gpre/boot/gpre_meta_boot.cpp @@ -755,7 +755,7 @@ public: return -1; } - IUtl* getUtlInterface() + IUtil* getUtilInterface() { fb_assert(false); return NULL; diff --git a/src/include/firebird/FirebirdInterface.idl b/src/include/firebird/FirebirdInterface.idl index 8890794da5..751718527f 100644 --- a/src/include/firebird/FirebirdInterface.idl +++ b/src/include/firebird/FirebirdInterface.idl @@ -90,7 +90,7 @@ interface Master : Versioned MetadataBuilder getMetadataBuilder(Status status, uint fieldCount); int serverMode(int mode); - Utl getUtlInterface(); + Util getUtilInterface(); ConfigManager getConfigManager(); } @@ -900,7 +900,7 @@ interface VersionCallback : Versioned void callback(Status status, const string text); } -interface Utl : Versioned +interface Util : Versioned { void getFbVersion(Status status, Attachment att, VersionCallback callback); diff --git a/src/include/firebird/IdlFbInterfaces.h b/src/include/firebird/IdlFbInterfaces.h index 6560a15a87..18d7643ab2 100644 --- a/src/include/firebird/IdlFbInterfaces.h +++ b/src/include/firebird/IdlFbInterfaces.h @@ -82,7 +82,7 @@ namespace Firebird class ITimer; class ITimerControl; class IVersionCallback; - class IUtl; + class IUtil; class ITraceConnection; class ITraceDatabaseConnection; class ITraceTransaction; @@ -295,7 +295,7 @@ namespace Firebird ITransaction* (CLOOP_CARG *registerTransaction)(IMaster* self, IAttachment* attachment, ITransaction* transaction) 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(); + IUtil* (CLOOP_CARG *getUtilInterface)(IMaster* self) throw(); IConfigManager* (CLOOP_CARG *getConfigManager)(IMaster* self) throw(); }; @@ -373,9 +373,9 @@ namespace Firebird return ret; } - IUtl* getUtlInterface() + IUtil* getUtilInterface() { - IUtl* ret = static_cast(this->cloopVTable)->getUtlInterface(this); + IUtil* ret = static_cast(this->cloopVTable)->getUtilInterface(this); return ret; } @@ -3225,25 +3225,25 @@ namespace Firebird } }; - class IUtl : public IVersioned + class IUtil : public IVersioned { public: struct VTable : public IVersioned::VTable { - void (CLOOP_CARG *getFbVersion)(IUtl* self, IStatus* status, IAttachment* att, IVersionCallback* callback) throw(); - void (CLOOP_CARG *loadBlob)(IUtl* self, IStatus* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt) throw(); - void (CLOOP_CARG *dumpBlob)(IUtl* self, IStatus* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt) throw(); - void (CLOOP_CARG *getPerfCounters)(IUtl* self, IStatus* status, IAttachment* att, const char* countersSet, ISC_INT64* counters) throw(); - IAttachment* (CLOOP_CARG *executeCreateDatabase)(IUtl* self, IStatus* status, unsigned stmtLength, const char* creatDBstatement, unsigned dialect, FB_BOOLEAN* stmtIsCreateDb) throw(); + void (CLOOP_CARG *getFbVersion)(IUtil* self, IStatus* status, IAttachment* att, IVersionCallback* callback) throw(); + void (CLOOP_CARG *loadBlob)(IUtil* self, IStatus* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt) throw(); + void (CLOOP_CARG *dumpBlob)(IUtil* self, IStatus* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt) throw(); + void (CLOOP_CARG *getPerfCounters)(IUtil* self, IStatus* status, IAttachment* att, const char* countersSet, ISC_INT64* counters) throw(); + IAttachment* (CLOOP_CARG *executeCreateDatabase)(IUtil* self, IStatus* status, unsigned stmtLength, const char* creatDBstatement, unsigned dialect, FB_BOOLEAN* stmtIsCreateDb) throw(); }; protected: - IUtl(DoNotInherit) + IUtil(DoNotInherit) : IVersioned(DoNotInherit()) { } - ~IUtl() + ~IUtil() { } @@ -4806,7 +4806,7 @@ namespace Firebird this->registerTransaction = &Name::cloopregisterTransactionDispatcher; this->getMetadataBuilder = &Name::cloopgetMetadataBuilderDispatcher; this->serverMode = &Name::cloopserverModeDispatcher; - this->getUtlInterface = &Name::cloopgetUtlInterfaceDispatcher; + this->getUtilInterface = &Name::cloopgetUtilInterfaceDispatcher; this->getConfigManager = &Name::cloopgetConfigManagerDispatcher; } } vTable; @@ -4946,16 +4946,16 @@ namespace Firebird } } - static IUtl* CLOOP_CARG cloopgetUtlInterfaceDispatcher(IMaster* self) throw() + static IUtil* CLOOP_CARG cloopgetUtilInterfaceDispatcher(IMaster* self) throw() { try { - return static_cast(self)->Name::getUtlInterface(); + return static_cast(self)->Name::getUtilInterface(); } catch (...) { StatusType::catchException(0); - return static_cast(0); + return static_cast(0); } } @@ -4996,7 +4996,7 @@ namespace Firebird virtual ITransaction* registerTransaction(IAttachment* attachment, ITransaction* transaction) = 0; virtual IMetadataBuilder* getMetadataBuilder(StatusType* status, unsigned fieldCount) = 0; virtual int serverMode(int mode) = 0; - virtual IUtl* getUtlInterface() = 0; + virtual IUtil* getUtilInterface() = 0; virtual IConfigManager* getConfigManager() = 0; }; @@ -11671,12 +11671,12 @@ namespace Firebird }; template - class IUtlBaseImpl : public Base + class IUtilBaseImpl : public Base { public: - typedef IUtl Declaration; + typedef IUtil Declaration; - IUtlBaseImpl(DoNotInherit = DoNotInherit()) + IUtilBaseImpl(DoNotInherit = DoNotInherit()) { static struct VTableImpl : Base::VTable { @@ -11694,7 +11694,7 @@ namespace Firebird this->cloopVTable = &vTable; } - static void CLOOP_CARG cloopgetFbVersionDispatcher(IUtl* self, IStatus* status, IAttachment* att, IVersionCallback* callback) throw() + static void CLOOP_CARG cloopgetFbVersionDispatcher(IUtil* self, IStatus* status, IAttachment* att, IVersionCallback* callback) throw() { StatusType status2(status); @@ -11708,7 +11708,7 @@ namespace Firebird } } - static void CLOOP_CARG clooploadBlobDispatcher(IUtl* self, IStatus* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt) throw() + static void CLOOP_CARG clooploadBlobDispatcher(IUtil* self, IStatus* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt) throw() { StatusType status2(status); @@ -11722,7 +11722,7 @@ namespace Firebird } } - static void CLOOP_CARG cloopdumpBlobDispatcher(IUtl* self, IStatus* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt) throw() + static void CLOOP_CARG cloopdumpBlobDispatcher(IUtil* self, IStatus* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt) throw() { StatusType status2(status); @@ -11736,7 +11736,7 @@ namespace Firebird } } - static void CLOOP_CARG cloopgetPerfCountersDispatcher(IUtl* self, IStatus* status, IAttachment* att, const char* countersSet, ISC_INT64* counters) throw() + static void CLOOP_CARG cloopgetPerfCountersDispatcher(IUtil* self, IStatus* status, IAttachment* att, const char* countersSet, ISC_INT64* counters) throw() { StatusType status2(status); @@ -11750,7 +11750,7 @@ namespace Firebird } } - static IAttachment* CLOOP_CARG cloopexecuteCreateDatabaseDispatcher(IUtl* self, IStatus* status, unsigned stmtLength, const char* creatDBstatement, unsigned dialect, FB_BOOLEAN* stmtIsCreateDb) throw() + static IAttachment* CLOOP_CARG cloopexecuteCreateDatabaseDispatcher(IUtil* self, IStatus* status, unsigned stmtLength, const char* creatDBstatement, unsigned dialect, FB_BOOLEAN* stmtIsCreateDb) throw() { StatusType status2(status); @@ -11766,16 +11766,16 @@ namespace Firebird } }; - template > > - class IUtlImpl : public IUtlBaseImpl + template > > + class IUtilImpl : public IUtilBaseImpl { protected: - IUtlImpl(DoNotInherit = DoNotInherit()) + IUtilImpl(DoNotInherit = DoNotInherit()) { } public: - virtual ~IUtlImpl() + virtual ~IUtilImpl() { } diff --git a/src/isql/isql.epp b/src/isql/isql.epp index f8456d5f62..a5536a618c 100644 --- a/src/isql/isql.epp +++ b/src/isql/isql.epp @@ -2203,7 +2203,7 @@ static processing_state add_row(TEXT* tabname) else { gds__edit(ftmp.c_str(), 0); - Firebird::UtlInterfacePtr()->loadBlob(fbStatus, blobid, DB, M__trans, + Firebird::UtilInterfacePtr()->loadBlob(fbStatus, blobid, DB, M__trans, ftmp.c_str(), FB_TRUE); unlink(ftmp.c_str()); res = succeeded(); @@ -2215,7 +2215,7 @@ static processing_state add_row(TEXT* tabname) // being loaded. As we aren't sure, we'll // do binary operation - this is NEW data in // the database, not updating existing info - Firebird::UtlInterfacePtr()->loadBlob(fbStatus, blobid, DB, M__trans, + Firebird::UtilInterfacePtr()->loadBlob(fbStatus, blobid, DB, M__trans, lastInputLine, FB_FALSE); res = succeeded(); } @@ -2481,7 +2481,7 @@ static processing_state blobedit(const TEXT* action, const TEXT* const* cmd) processing_state rc = SKIP; if (!strcmp(action, "BLOBVIEW")) { - Firebird::UtlInterfacePtr utl; + Firebird::UtilInterfacePtr utl; PathName tmpf = TempFile::create(fbStatus, "blob"); if (ISQL_errmsg(fbStatus)) return ps_ERR; @@ -2502,7 +2502,7 @@ static processing_state blobedit(const TEXT* action, const TEXT* const* cmd) // as we're not sure, we'll dump it in BINARY mode. TEXT path[MAXPATHLEN]; strip_quotes(cmd[2], path); - Firebird::UtlInterfacePtr()->dumpBlob(fbStatus, &blobid, DB, M__trans, path, FB_FALSE); + Firebird::UtilInterfacePtr()->dumpBlob(fbStatus, &blobid, DB, M__trans, path, FB_FALSE); } else rc = ps_ERR; @@ -2577,7 +2577,7 @@ static processing_state bulk_insert_hack(const char* command) SINT64 perf_before[ISQL_COUNTERS]; if (setValues.Stats) { - Firebird::UtlInterfacePtr()->getPerfCounters(fbStatus, + Firebird::UtilInterfacePtr()->getPerfCounters(fbStatus, DB, ISQL_COUNTERS_SET, perf_before); if (ISQL_errmsg(fbStatus)) { @@ -3828,7 +3828,7 @@ static processing_state create_db(const TEXT* statement, TEXT* d_name) unsigned dialect = (isqlGlob.SQL_dialect == 0 || isqlGlob.SQL_dialect == SQL_DIALECT_V6_TRANSITION) ? requested_SQL_dialect : isqlGlob.SQL_dialect; - DB = Firebird::UtlInterfacePtr()->executeCreateDatabase(fbStatus, local_statement.length(), + DB = Firebird::UtilInterfacePtr()->executeCreateDatabase(fbStatus, local_statement.length(), local_statement.c_str(), dialect, NULL); if ((!DB) && (createWithoutRole == 0) && (fbStatus->getErrors()[1] == isc_dsql_error)) @@ -7791,7 +7791,7 @@ static processing_state print_performance(const SINT64* perf_before) static Firebird::GlobalPtr diag; SINT64 perf_after[ISQL_COUNTERS]; - Firebird::UtlInterfacePtr()->getPerfCounters(fbStatus, DB, ISQL_COUNTERS_SET, perf_after); + Firebird::UtilInterfacePtr()->getPerfCounters(fbStatus, DB, ISQL_COUNTERS_SET, perf_after); if (ISQL_errmsg(fbStatus)) { return ps_ERR; @@ -8279,7 +8279,7 @@ static processing_state process_statement(const TEXT* str2) SINT64 perf_before[ISQL_COUNTERS]; if (setValues.Stats) { - Firebird::UtlInterfacePtr()->getPerfCounters(fbStatus, + Firebird::UtilInterfacePtr()->getPerfCounters(fbStatus, DB, ISQL_COUNTERS_SET, perf_before); if (ISQL_errmsg(fbStatus)) { diff --git a/src/isql/show.epp b/src/isql/show.epp index 66782c2667..be23a58cbb 100644 --- a/src/isql/show.epp +++ b/src/isql/show.epp @@ -120,7 +120,7 @@ static bool reReadDbOwner = true; namespace { // Used to make sure that local calls to print stuff go to isqlGlob.Out -// and not to stdout if IUtl::version gets called +// and not to stdout if IUtil::version gets called class VersionCallback : public Firebird::AutoIface > { @@ -1768,7 +1768,7 @@ processing_state SHOW_metadata(const SCHAR* const* cmd, SCHAR** lcmd) isqlGlob.printf("%s%s", msg_string, NEWLINE); isqlGlob.printf("Server version:%s", NEWLINE); VersionCallback callback; - Firebird::UtlInterfacePtr()->getFbVersion(fbStatus, DB, &callback); + Firebird::UtilInterfacePtr()->getFbVersion(fbStatus, DB, &callback); if (fbStatus->getStatus() & Firebird::IStatus::FB_HAS_ERRORS) { IUTILS_msg_get(CANNOT_GET_SRV_VER, msg_string); diff --git a/src/yvalve/MasterImplementation.cpp b/src/yvalve/MasterImplementation.cpp index e036d37708..e290b145fa 100644 --- a/src/yvalve/MasterImplementation.cpp +++ b/src/yvalve/MasterImplementation.cpp @@ -663,14 +663,14 @@ Mutex& pauseTimer() // -// Utl (misc calls) +// Util (misc calls) // namespace Why { - extern UtlInterface utlInterface; // Implemented in utl.cpp + extern UtilInterface utlInterface; // Implemented in utl.cpp - IUtl* MasterImplementation::getUtlInterface() + IUtil* MasterImplementation::getUtilInterface() { return &utlInterface; } diff --git a/src/yvalve/MasterImplementation.h b/src/yvalve/MasterImplementation.h index bd4a5235cb..61f44bb4a3 100644 --- a/src/yvalve/MasterImplementation.h +++ b/src/yvalve/MasterImplementation.h @@ -71,7 +71,7 @@ namespace Why Firebird::IMetadataBuilder* getMetadataBuilder(Firebird::CheckStatusWrapper* status, unsigned fieldCount); //Firebird::IDebug* getDebug(); int serverMode(int mode); - Firebird::IUtl* getUtlInterface(); + Firebird::IUtil* getUtilInterface(); Firebird::IConfigManager* getConfigManager(); }; diff --git a/src/yvalve/YObjects.h b/src/yvalve/YObjects.h index 9d71b91e59..98616d5f97 100644 --- a/src/yvalve/YObjects.h +++ b/src/yvalve/YObjects.h @@ -528,9 +528,9 @@ private: Firebird::ICryptKeyCallback* cryptCallback; }; -class UtlInterface FB_FINAL : public Firebird::AutoIface > +class UtilInterface FB_FINAL : public Firebird::AutoIface > { - // IUtl implementation + // IUtil implementation public: void getFbVersion(Firebird::CheckStatusWrapper* status, Firebird::IAttachment* att, Firebird::IVersionCallback* callback); diff --git a/src/yvalve/perf.cpp b/src/yvalve/perf.cpp index fc980debf7..6b2ffa3288 100644 --- a/src/yvalve/perf.cpp +++ b/src/yvalve/perf.cpp @@ -443,7 +443,7 @@ KnownCounters knownCounters[TOTAL_COUNTERS] = { } // anonymous namespace -void Why::UtlInterface::getPerfCounters(Firebird::CheckStatusWrapper* status, Firebird::IAttachment* att, +void Why::UtilInterface::getPerfCounters(Firebird::CheckStatusWrapper* status, Firebird::IAttachment* att, const char* countersSet, ISC_INT64* counters) { try diff --git a/src/yvalve/utl.cpp b/src/yvalve/utl.cpp index ee2aaa5cbb..d947c11fc4 100644 --- a/src/yvalve/utl.cpp +++ b/src/yvalve/utl.cpp @@ -360,9 +360,9 @@ FB_BOOLEAN edit(CheckStatusWrapper* status, ISC_QUAD* blob_id, IAttachment* att, namespace Why { -UtlInterface utlInterface; +UtilInterface utlInterface; -void UtlInterface::dumpBlob(CheckStatusWrapper* status, ISC_QUAD* blobId, +void UtilInterface::dumpBlob(CheckStatusWrapper* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file_name, FB_BOOLEAN txt) { FILE* file = os_utils::fopen(file_name, txt ? FOPEN_WRITE_TYPE_TEXT : FOPEN_WRITE_TYPE); @@ -385,7 +385,7 @@ void UtlInterface::dumpBlob(CheckStatusWrapper* status, ISC_QUAD* blobId, fclose(file); } -void UtlInterface::loadBlob(CheckStatusWrapper* status, ISC_QUAD* blobId, +void UtilInterface::loadBlob(CheckStatusWrapper* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file_name, FB_BOOLEAN txt) { /************************************** @@ -418,7 +418,7 @@ void UtlInterface::loadBlob(CheckStatusWrapper* status, ISC_QUAD* blobId, fclose(file); } -void UtlInterface::getFbVersion(CheckStatusWrapper* status, IAttachment* att, +void UtilInterface::getFbVersion(CheckStatusWrapper* status, IAttachment* att, IVersionCallback* callback) { /************************************** @@ -568,7 +568,7 @@ void UtlInterface::getFbVersion(CheckStatusWrapper* status, IAttachment* att, } } -YAttachment* UtlInterface::executeCreateDatabase( +YAttachment* UtilInterface::executeCreateDatabase( Firebird::CheckStatusWrapper* status, unsigned stmtLength, const char* creatDBstatement, unsigned dialect, FB_BOOLEAN* stmtIsCreateDb) { @@ -1477,7 +1477,7 @@ int API_ROUTINE isc_version(FB_API_HANDLE* handle, FPTR_VERSION_CALLBACK routine return FB_FAILURE; VersionCallback callback(routine, user_arg); - UtlInterfacePtr()->getFbVersion(&st, att, &callback); + UtilInterfacePtr()->getFbVersion(&st, att, &callback); return st.getStatus() & IStatus::FB_HAS_ERRORS ? FB_FAILURE : FB_SUCCESS; } @@ -1719,7 +1719,7 @@ static int any_text_dump(ISC_QUAD* blob_id, if (st.getStatus() & Firebird::IStatus::FB_HAS_ERRORS) return FB_FAILURE; - UtlInterfacePtr()->dumpBlob(&st, blob_id, att, tra, file_name, txt); + UtilInterfacePtr()->dumpBlob(&st, blob_id, att, tra, file_name, txt); if (st.getStatus() & Firebird::IStatus::FB_HAS_ERRORS) { @@ -1935,7 +1935,7 @@ static int any_text_load(ISC_QUAD* blob_id, if (st.getStatus() & Firebird::IStatus::FB_HAS_ERRORS) return FB_FAILURE; - UtlInterfacePtr()->loadBlob(&st, blob_id, att, tra, file_name, flag); + UtilInterfacePtr()->loadBlob(&st, blob_id, att, tra, file_name, flag); if (st.getStatus() & Firebird::IStatus::FB_HAS_ERRORS) { diff --git a/src/yvalve/why.cpp b/src/yvalve/why.cpp index f46cf920cb..79f890fdb4 100644 --- a/src/yvalve/why.cpp +++ b/src/yvalve/why.cpp @@ -99,7 +99,7 @@ static const USHORT DESCRIBE_BUFFER_SIZE = 1024; // size of buffer used in isc_d namespace Why { class StatusVector; - extern UtlInterface utlInterface; + extern UtilInterface utlInterface; }; namespace {