Menu
▾
▴
firebird-checkins
|
From: <fir...@us...> - 2015-02-16 00:14:44
|
Revision: 60698
http://sourceforge.net/p/firebird/code/60698
Author: firebirds
Date: 2015-02-16 00:14:36 +0000 (Mon, 16 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-02-15 15:00:50 UTC (rev 60697)
+++ firebird/trunk/ChangeLog 2015-02-16 00:14:36 UTC (rev 60698)
@@ -1,3 +1,16 @@
+ 2015-02-15 13:25 dimitr
+ M src/jrd/blb.h
+Misc.
+
+ 2015-02-15 10:38 dimitr
+ M src/dsql/StmtNodes.cpp
+Misc.
+
+ 2015-02-15 08:31 dimitr
+ M builds/win32/msvc10/srp.vcxproj
+ M builds/win32/msvc12/srp.vcxproj
+Postfixes for Windows builds.
+
2015-02-14 18:55 asfernandes
M builds/posix/udr_plugin.vers
M examples/interfaces/01.create.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-02-15 15:00:50 UTC (rev 60697)
+++ firebird/trunk/src/jrd/build_no.h 2015-02-16 00:14:36 UTC (rev 60698)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31644
+ FORMAL BUILD NUMBER:31647
*/
-#define PRODUCT_VER_STRING "3.0.0.31644"
-#define FILE_VER_STRING "WI-T3.0.0.31644"
-#define LICENSE_VER_STRING "WI-T3.0.0.31644"
-#define FILE_VER_NUMBER 3, 0, 0, 31644
+#define PRODUCT_VER_STRING "3.0.0.31647"
+#define FILE_VER_STRING "WI-T3.0.0.31647"
+#define LICENSE_VER_STRING "WI-T3.0.0.31647"
+#define FILE_VER_NUMBER 3, 0, 0, 31647
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31644"
+#define FB_BUILD_NO "31647"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-02-15 15:00:50 UTC (rev 60697)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-02-16 00:14:36 UTC (rev 60698)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31644
+BuildNum=31647
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-02-17 00:14:25
|
Revision: 60704
http://sourceforge.net/p/firebird/code/60704
Author: firebirds
Date: 2015-02-17 00:14:17 +0000 (Tue, 17 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-02-16 13:57:28 UTC (rev 60703)
+++ firebird/trunk/ChangeLog 2015-02-17 00:14:17 UTC (rev 60704)
@@ -1,3 +1,26 @@
+ 2015-02-16 13:57 hvlad
+ M src/jrd/Attachment.cpp
+ M src/jrd/Attachment.h
+ M src/jrd/cch.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/vio.cpp
+Memory leak (CORE-4683)
+
+ 2015-02-16 13:56 hvlad
+ M src/jrd/Database.cpp
+ M src/jrd/tpc.cpp
+Memory leak (CORE-4683)
+
+ 2015-02-16 13:54 hvlad
+ M src/auth/SecureRemotePassword/client/SrpClient.cpp
+ M src/auth/SecureRemotePassword/server/SrpServer.cpp
+Two small memory leaks (CORE-4683)
+
+ 2015-02-16 13:53 hvlad
+ M src/common/classes/alloc.cpp
+ M src/common/classes/alloc.h
+Correct accounting of mapped memory
+
2015-02-15 13:25 dimitr
M src/jrd/blb.h
Misc.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-02-16 13:57:28 UTC (rev 60703)
+++ firebird/trunk/src/jrd/build_no.h 2015-02-17 00:14:17 UTC (rev 60704)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31647
+ FORMAL BUILD NUMBER:31651
*/
-#define PRODUCT_VER_STRING "3.0.0.31647"
-#define FILE_VER_STRING "WI-T3.0.0.31647"
-#define LICENSE_VER_STRING "WI-T3.0.0.31647"
-#define FILE_VER_NUMBER 3, 0, 0, 31647
+#define PRODUCT_VER_STRING "3.0.0.31651"
+#define FILE_VER_STRING "WI-T3.0.0.31651"
+#define LICENSE_VER_STRING "WI-T3.0.0.31651"
+#define FILE_VER_NUMBER 3, 0, 0, 31651
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31647"
+#define FB_BUILD_NO "31651"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-02-16 13:57:28 UTC (rev 60703)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-02-17 00:14:17 UTC (rev 60704)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31647
+BuildNum=31651
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <asf...@us...> - 2015-02-17 14:57:03
|
Revision: 60707
http://sourceforge.net/p/firebird/code/60707
Author: asfernandes
Date: 2015-02-17 14:56:59 +0000 (Tue, 17 Feb 2015)
Log Message:
-----------
Better constant names: avoid FB, enclosing class (double prefix) or wrong prefixes.
Left some TODOs in FirebirdInterface.idl and utilities/ntrace/TracePluginImpl.cpp related to trace.
Modified Paths:
--------------
firebird/trunk/examples/dbcrypt/CryptApplication.cpp
firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
firebird/trunk/examples/dbcrypt/DbCrypt.cpp
firebird/trunk/src/auth/AuthDbg.cpp
firebird/trunk/src/auth/SecureRemotePassword/Message.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.cpp
firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp
firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
firebird/trunk/src/auth/trusted/AuthSspi.cpp
firebird/trunk/src/common/IntlParametersBlock.cpp
firebird/trunk/src/common/StatusArg.cpp
firebird/trunk/src/common/StatusHolder.h
firebird/trunk/src/common/call_service.cpp
firebird/trunk/src/common/classes/ImplementHelper.h
firebird/trunk/src/common/classes/MsgPrint.cpp
firebird/trunk/src/common/config/config.cpp
firebird/trunk/src/common/config/config_file.cpp
firebird/trunk/src/common/db_alias.cpp
firebird/trunk/src/common/os/win32/mod_loader.cpp
firebird/trunk/src/common/security.cpp
firebird/trunk/src/common/unicode_util.cpp
firebird/trunk/src/common/utils.cpp
firebird/trunk/src/dsql/DdlNodes.epp
firebird/trunk/src/dsql/DsqlCursor.cpp
firebird/trunk/src/dsql/ExprNodes.cpp
firebird/trunk/src/dsql/StmtNodes.cpp
firebird/trunk/src/dsql/dsql.cpp
firebird/trunk/src/gpre/languages/ftn.cpp
firebird/trunk/src/gpre/obj_cxx.cpp
firebird/trunk/src/include/firebird/FirebirdInterface.idl
firebird/trunk/src/include/firebird/IdlFbInterfaces.h
firebird/trunk/src/include/firebird/Interface.h
firebird/trunk/src/include/firebird/UdrCppEngine.h
firebird/trunk/src/isql/isql.epp
firebird/trunk/src/isql/show.epp
firebird/trunk/src/jrd/CryptoManager.cpp
firebird/trunk/src/jrd/Database.cpp
firebird/trunk/src/jrd/DbCreators.cpp
firebird/trunk/src/jrd/ExtEngineManager.cpp
firebird/trunk/src/jrd/IntlManager.cpp
firebird/trunk/src/jrd/Mapping.cpp
firebird/trunk/src/jrd/SysFunction.cpp
firebird/trunk/src/jrd/UserManagement.cpp
firebird/trunk/src/jrd/exe.cpp
firebird/trunk/src/jrd/extds/InternalDS.cpp
firebird/trunk/src/jrd/fun.epp
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/jrd.h
firebird/trunk/src/jrd/recsrc/ProcedureScan.cpp
firebird/trunk/src/jrd/svc.cpp
firebird/trunk/src/jrd/tra.cpp
firebird/trunk/src/jrd/trace/TraceDSQLHelpers.h
firebird/trunk/src/jrd/trace/TraceJrdHelpers.h
firebird/trunk/src/jrd/trace/TraceManager.cpp
firebird/trunk/src/jrd/trace/TraceObjects.cpp
firebird/trunk/src/plugins/crypt/arc4/Arc4.cpp
firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
firebird/trunk/src/qli/help.epp
firebird/trunk/src/remote/client/interface.cpp
firebird/trunk/src/remote/inet.cpp
firebird/trunk/src/remote/os/win32/wnet.cpp
firebird/trunk/src/remote/remote.cpp
firebird/trunk/src/remote/server/os/posix/inet_server.cpp
firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp
firebird/trunk/src/remote/server/server.cpp
firebird/trunk/src/utilities/gsec/gsec.cpp
firebird/trunk/src/utilities/guard/util.cpp
firebird/trunk/src/utilities/ibmgr/srvrmgr.cpp
firebird/trunk/src/utilities/ntrace/TracePluginImpl.cpp
firebird/trunk/src/utilities/ntrace/traceplugin.cpp
firebird/trunk/src/yvalve/DistributedTransaction.cpp
firebird/trunk/src/yvalve/PluginManager.cpp
firebird/trunk/src/yvalve/gds.cpp
firebird/trunk/src/yvalve/perf.cpp
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 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/examples/dbcrypt/CryptApplication.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -67,7 +67,7 @@
if (tra)
{
tra->rollback(status);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
print("rollback");
tra->release();
@@ -76,7 +76,7 @@
if (att)
{
att->detach(status);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
print("detach");
att->release();
@@ -98,19 +98,19 @@
p = master->getDispatcher();
p->setDbCryptCallback(status, &key);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
throw "setDbCryptCallback";
char s[256];
sprintf(s, "localhost:%s", dbName);
att = p->attachDatabase(status, s, 0, NULL);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
throw "attachDatabase";
if (a != NONE)
{
tra = att->startTransaction(status, 0, NULL);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
throw "startTransaction";
}
@@ -118,20 +118,20 @@
{
att->execute(status, tra, 0,
"ALTER DATABASE ENCRYPT WITH \"DbCrypt_example\"", 3, NULL, NULL, NULL, NULL);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
throw "execute";
}
if (a == DEC)
{
att->execute(status, tra, 0, "ALTER DATABASE DECRYPT", 3, NULL, NULL, NULL, NULL);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
throw "execute";
}
if (tra)
{
tra->commit(status);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
throw "commit";
tra = NULL;
}
@@ -140,7 +140,7 @@
getchar();
att->detach(status);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
throw "detach";
att = NULL;
Modified: firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -196,12 +196,12 @@
return 1;
IConfig* def = config->getDefaultConfig(status);
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
return 1;
IConfigEntry* confEntry = def->find(status, "Auto");
def->release();
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
return 1;
if (confEntry)
@@ -269,6 +269,6 @@
pluginManager = master->getPluginManager();
module.registerMe();
- pluginManager->registerPluginFactory(IPluginManager::KeyHolder, "CryptKeyHolder_example",
+ pluginManager->registerPluginFactory(IPluginManager::TYPE_KEY_HOLDER, "CryptKeyHolder_example",
&factory);
}
Modified: firebird/trunk/examples/dbcrypt/DbCrypt.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -194,11 +194,11 @@
return;
IConfig* def = config->getDefaultConfig(status);
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
return;
IConfigEntry* confEntry = def->find(status, "Auto");
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
{
def->release();
return;
@@ -231,7 +231,7 @@
for (unsigned n = 0; n < length; ++n)
{
ICryptKeyCallback* callback = sources[n]->keyHandle(status, "sample");
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
return;
if (callback && callback->callback(0, NULL, 1, &key) == 1)
@@ -277,5 +277,5 @@
pluginManager = master->getPluginManager();
module.registerMe();
- pluginManager->registerPluginFactory(IPluginManager::DbCrypt, "DbCrypt_example", &factory);
+ pluginManager->registerPluginFactory(IPluginManager::TYPE_DB_CRYPT, "DbCrypt_example", &factory);
}
Modified: firebird/trunk/src/auth/AuthDbg.cpp
===================================================================
--- firebird/trunk/src/auth/AuthDbg.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/auth/AuthDbg.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -46,8 +46,8 @@
Firebird::PluginManagerInterfacePtr iPlugin;
- iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthClient, name, &clientFactory);
- iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthServer, name, &serverFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_CLIENT, name, &clientFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_SERVER, name, &serverFactory);
}
@@ -84,7 +84,7 @@
fprintf(stderr, "DebugServer::authenticate1: %s\n", str.c_str());
#endif
sb->putData(status, str.length(), str.c_str());
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
@@ -165,7 +165,7 @@
fprintf(stderr, "DebugClient::authenticate: sending %s\n", str.c_str());
#endif
cb->putData(status, str.length(), str.c_str());
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
Modified: firebird/trunk/src/auth/SecureRemotePassword/Message.h
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/Message.h 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/auth/SecureRemotePassword/Message.h 2015-02-17 14:56:59 UTC (rev 60707)
@@ -28,7 +28,7 @@
{
Firebird::LocalStatus st;
Firebird::IMessageMetadata* m = out ? stmt->getOutputMetadata(&st) : stmt->getInputMetadata(&st);
- if (st.getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (st.getState() & Firebird::IStatus::STATE_ERRORS)
{
Firebird::status_exception::raise(&st);
}
@@ -175,7 +175,7 @@
static void check(Firebird::IStatus* status)
{
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
{
#ifdef INTERNAL_FIREBIRD
Firebird::status_exception::raise(status);
Modified: firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -80,7 +80,7 @@
client->genClientKey(data);
dumpIt("Clnt: clientPubKey", data);
cb->putData(status, data.length(), data.begin());
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
return AUTH_FAILED;
return AUTH_MORE_DATA;
}
@@ -132,19 +132,19 @@
cProof.getText(data);
cb->putData(status, data.length(), data.c_str());
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
// output the key
ICryptKey* cKey = cb->newKey(status);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
cKey->setSymmetric(status, "Symmetric", sessionKey.getCount(), sessionKey.begin());
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
@@ -175,7 +175,7 @@
void registerSrpClient(IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(IPluginManager::AuthClient, RemotePassword::plugName, &factory);
+ iPlugin->registerPluginFactory(IPluginManager::TYPE_AUTH_CLIENT, RemotePassword::plugName, &factory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -164,7 +164,7 @@
selGrantor.c_str(), SQL_DIALECT_V6, NULL, NULL, out.getMetadata(), NULL, 0);
check(&statusWrapper);
- bool hasGrant = curs->fetchNext(&statusWrapper, out.getBuffer()) == Firebird::IStatus::FB_OK;
+ bool hasGrant = curs->fetchNext(&statusWrapper, out.getBuffer()) == Firebird::IStatus::OK;
curs->close(&statusWrapper);
check(&statusWrapper);
@@ -301,7 +301,7 @@
for (unsigned repeat = 0; ; ++repeat)
{
stmt = att->prepare(status, tra, 0, insert, SQL_DIALECT_V6, Firebird::IStatement::PREPARE_PREFETCH_METADATA);
- if (!(status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS))
+ if (!(status->getState() & Firebird::IStatus::STATE_ERRORS))
{
break;
}
@@ -566,7 +566,7 @@
(par ? par->getBuffer() : NULL), om, 0);
check(status);
- while (rs->fetchNext(status, di.getBuffer()) == Firebird::IStatus::FB_OK)
+ while (rs->fetchNext(status, di.getBuffer()) == Firebird::IStatus::OK)
{
listField(user->userName(), login);
listField(user->firstName(), first);
@@ -617,7 +617,7 @@
if (tra)
{
tra->commit(status);
- if (!(status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS))
+ if (!(status->getState() & Firebird::IStatus::STATE_ERRORS))
{
tra = NULL;
}
@@ -629,7 +629,7 @@
if (tra)
{
tra->rollback(status);
- if (!(status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS))
+ if (!(status->getState() & Firebird::IStatus::STATE_ERRORS))
{
tra = NULL;
}
@@ -646,7 +646,7 @@
if (att)
{
att->detach(&statusWrapper);
- if (!(status.getStatus() & Firebird::IStatus::FB_HAS_ERRORS))
+ if (!(status.getState() & Firebird::IStatus::STATE_ERRORS))
{
att = NULL;
}
@@ -695,7 +695,7 @@
static void check(Firebird::CheckStatusWrapper* status)
{
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
{
checkStatusVectorForMissingTable(status->getErrors());
Firebird::status_exception::raise(status);
@@ -853,7 +853,7 @@
{
int cc = blob->getSegment(&statusWrapper, sizeof(segbuf), segbuf, &len);
check(&statusWrapper);
- if (cc == Firebird::IStatus::FB_NO_DATA)
+ if (cc == Firebird::IStatus::NO_DATA)
break;
s.append(segbuf, len);
}
@@ -908,6 +908,6 @@
extern "C" void FB_EXPORTED FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
{
Firebird::CachedMasterInterface::set(master);
- Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::IPluginManager::AuthUserManagement, Auth::RemotePassword::plugName, &Auth::factory);
+ Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_USER_MANAGEMENT, Auth::RemotePassword::plugName, &Auth::factory);
Firebird::getUnloadDetector()->registerMe();
}
Modified: firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -154,7 +154,7 @@
const char* sql =
"SELECT PLG$VERIFIER, PLG$SALT FROM PLG$SRP WHERE PLG$USER_NAME = ? AND PLG$ACTIVE";
stmt = att->prepare(status, tra, 0, sql, 3, IStatement::PREPARE_PREFETCH_METADATA);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
checkStatusVectorForMissingTable(status->getErrors());
status_exception::raise(status);
@@ -223,7 +223,7 @@
dumpIt("Srv: serverPubKey", serverPubKey);
dumpBin("Srv: data", data);
sb->putData(status, data.length(), data.c_str());
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
@@ -233,12 +233,12 @@
// output the key
ICryptKey* cKey = sb->newKey(status);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
cKey->setSymmetric(status, "Symmetric", sessionKey.getCount(), sessionKey.begin());
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
@@ -256,12 +256,12 @@
if (clientProof == serverProof)
{
writerInterface->add(status, account.c_str());
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
writerInterface->setDb(status, secDbName);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
@@ -294,7 +294,7 @@
void registerSrpServer(IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(IPluginManager::AuthServer, RemotePassword::plugName, &factory);
+ iPlugin->registerPluginFactory(IPluginManager::TYPE_AUTH_SERVER, RemotePassword::plugName, &factory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -46,7 +46,7 @@
TEXT pwt[MAX_LEGACY_PASSWORD_LENGTH + 2];
ENC_crypt(pwt, sizeof pwt, cb->getPassword(), LEGACY_PASSWORD_SALT);
cb->putData(status, static_cast<unsigned>(strlen(&pwt[2])), &pwt[2]);
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
@@ -70,7 +70,7 @@
void registerLegacyClient(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthClient, "Legacy_Auth", &factory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_CLIENT, "Legacy_Auth", &factory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -765,6 +765,6 @@
extern "C" void FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
{
Firebird::CachedMasterInterface::set(master);
- Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::IPluginManager::AuthUserManagement, "Legacy_UserManager", &factory);
+ Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_USER_MANAGEMENT, "Legacy_UserManager", &factory);
Firebird::getUnloadDetector()->registerMe();
}
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -528,7 +528,7 @@
#ifdef USE_ATT_RQ_CACHE
LocalStatus s;
TimerInterfacePtr()->start(&s, instance, 10 * 1000 * 1000);
- if (s.getStatus() & IStatus::FB_HAS_ERRORS)
+ if (s.getState() & IStatus::STATE_ERRORS)
instance->handler();
#else
instance->handler();
@@ -563,7 +563,7 @@
void registerLegacyServer(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthServer, "Legacy_Auth", &factory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_SERVER, "Legacy_Auth", &factory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/trusted/AuthSspi.cpp
===================================================================
--- firebird/trunk/src/auth/trusted/AuthSspi.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/auth/trusted/AuthSspi.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -440,12 +440,12 @@
void registerTrustedClient(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthClient, plugName, &clientFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_CLIENT, plugName, &clientFactory);
}
void registerTrustedServer(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthServer, plugName, &serverFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_SERVER, plugName, &serverFactory);
}
} // namespace Auth
Modified: firebird/trunk/src/common/IntlParametersBlock.cpp
===================================================================
--- firebird/trunk/src/common/IntlParametersBlock.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/common/IntlParametersBlock.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -163,7 +163,7 @@
{
LocalStatus l;
st.stuffException(&l);
- if ((l.getStatus() & IStatus::FB_HAS_ERRORS) && (l.getErrors()[1] == isc_bad_conn_str) && tagName)
+ if ((l.getState() & IStatus::STATE_ERRORS) && (l.getErrors()[1] == isc_bad_conn_str) && tagName)
{
Arg::Gds newErrors(isc_random);
string message("Bad international character in tag ");
Modified: firebird/trunk/src/common/StatusArg.cpp
===================================================================
--- firebird/trunk/src/common/StatusArg.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/common/StatusArg.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -77,10 +77,10 @@
clear();
- if (s->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (s->getState() & IStatus::STATE_ERRORS)
append(s->getErrors(), FB_NELEM(m_status_vector) - 1);
- if (s->getStatus() & IStatus::FB_HAS_WARNINGS)
+ if (s->getState() & IStatus::STATE_WARNINGS)
append(s->getWarnings(), FB_NELEM(m_status_vector) - 1);
}
Modified: firebird/trunk/src/common/StatusHolder.h
===================================================================
--- firebird/trunk/src/common/StatusHolder.h 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/common/StatusHolder.h 2015-02-17 14:56:59 UTC (rev 60707)
@@ -77,10 +77,10 @@
return warnings.get();
}
- unsigned getStatus() const
+ unsigned getState() const
{
- return (errors.vector[1] ? IStatus::FB_HAS_ERRORS : 0) |
- (warnings.vector[1] ? IStatus::FB_HAS_WARNINGS : 0);
+ return (errors.vector[1] ? IStatus::STATE_ERRORS : 0) |
+ (warnings.vector[1] ? IStatus::STATE_WARNINGS : 0);
}
IStatus* clone() const
Modified: firebird/trunk/src/common/call_service.cpp
===================================================================
--- firebird/trunk/src/common/call_service.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/common/call_service.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -335,7 +335,7 @@
setAttr(attr, "Uid", &u->u);
setAttr(attr, "Gid", &u->g);
u->attributes()->set(status, attr.c_str());
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
return;
u->attributes()->setEntered(status, attr.hasData());
}
Modified: firebird/trunk/src/common/classes/ImplementHelper.h
===================================================================
--- firebird/trunk/src/common/classes/ImplementHelper.h 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/common/classes/ImplementHelper.h 2015-02-17 14:56:59 UTC (rev 60707)
@@ -322,7 +322,7 @@
// Generic status checker
inline void check(IStatus* status)
{
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
status_exception::raise(status);
}
Modified: firebird/trunk/src/common/classes/MsgPrint.cpp
===================================================================
--- firebird/trunk/src/common/classes/MsgPrint.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/common/classes/MsgPrint.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -385,7 +385,7 @@
else if (n == -2)
{
s += "message file ";
- s += fb_utils::getPrefix(Firebird::IConfigManager::FB_DIR_MSG, MSG_FILE).ToString();
+ s += fb_utils::getPrefix(Firebird::IConfigManager::DIR_MSG, MSG_FILE).ToString();
s += " not found";
}
else
Modified: firebird/trunk/src/common/config/config.cpp
===================================================================
--- firebird/trunk/src/common/config/config.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/common/config/config.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -51,7 +51,7 @@
{
try
{
- ConfigFile file(fb_utils::getPrefix(Firebird::IConfigManager::FB_DIR_CONF, CONFIG_FILE),
+ ConfigFile file(fb_utils::getPrefix(Firebird::IConfigManager::DIR_CONF, CONFIG_FILE),
ConfigFile::ERROR_WHEN_MISS);
defaultConfig = new Config(file);
}
@@ -692,19 +692,19 @@
{
switch (type)
{
- case Firebird::IPluginManager::Provider:
+ case Firebird::IPluginManager::TYPE_PROVIDER:
return (const char*) values[KEY_PLUG_PROVIDERS];
- case Firebird::IPluginManager::AuthServer:
+ case Firebird::IPluginManager::TYPE_AUTH_SERVER:
return (const char*) values[KEY_PLUG_AUTH_SERVER];
- case Firebird::IPluginManager::AuthClient:
+ case Firebird::IPluginManager::TYPE_AUTH_CLIENT:
return (const char*) values[KEY_PLUG_AUTH_CLIENT];
- case Firebird::IPluginManager::AuthUserManagement:
+ case Firebird::IPluginManager::TYPE_AUTH_USER_MANAGEMENT:
return (const char*) values[KEY_PLUG_AUTH_MANAGE];
- case Firebird::IPluginManager::Trace:
+ case Firebird::IPluginManager::TYPE_TRACE:
return (const char*) values[KEY_PLUG_TRACE];
- case Firebird::IPluginManager::WireCrypt:
+ case Firebird::IPluginManager::TYPE_WIRE_CRYPT:
return (const char*) values[KEY_PLUG_WIRE_CRYPT];
- case Firebird::IPluginManager::KeyHolder:
+ case Firebird::IPluginManager::TYPE_KEY_HOLDER:
return (const char*) values[KEY_PLUG_KEY_HOLDER];
}
Modified: firebird/trunk/src/common/config/config_file.cpp
===================================================================
--- firebird/trunk/src/common/config/config_file.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/common/config/config_file.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -503,17 +503,17 @@
unsigned code;
const char* name;
} dirs[] = {
-#define NMDIR(a) {Firebird::IConfigManager::a, #a},
- NMDIR(FB_DIR_CONF)
- NMDIR(FB_DIR_SECDB)
- NMDIR(FB_DIR_PLUGINS)
- NMDIR(FB_DIR_UDF)
- NMDIR(FB_DIR_SAMPLE)
- NMDIR(FB_DIR_SAMPLEDB)
- NMDIR(FB_DIR_INTL)
- NMDIR(FB_DIR_MSG)
+#define NMDIR(a) {Firebird::IConfigManager::a, "FB_"#a},
+ NMDIR(DIR_CONF)
+ NMDIR(DIR_SECDB)
+ NMDIR(DIR_PLUGINS)
+ NMDIR(DIR_UDF)
+ NMDIR(DIR_SAMPLE)
+ NMDIR(DIR_SAMPLEDB)
+ NMDIR(DIR_INTL)
+ NMDIR(DIR_MSG)
#undef NMDIR
- {Firebird::IConfigManager::FB_DIRCOUNT, NULL}
+ {Firebird::IConfigManager::DIR_COUNT, NULL}
};
for (const Dir* d = dirs; d->name; ++d)
Modified: firebird/trunk/src/common/db_alias.cpp
===================================================================
--- firebird/trunk/src/common/db_alias.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/common/db_alias.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -260,7 +260,7 @@
{
public:
explicit AliasesConf(MemoryPool& p)
- : ConfigCache(p, fb_utils::getPrefix(Firebird::IConfigManager::FB_DIR_CONF, ALIAS_FILE)),
+ : ConfigCache(p, fb_utils::getPrefix(Firebird::IConfigManager::DIR_CONF, ALIAS_FILE)),
databases(getPool()), aliases(getPool())
#ifdef HAVE_ID_BY_NAME
, ids(getPool())
Modified: firebird/trunk/src/common/os/win32/mod_loader.cpp
===================================================================
--- firebird/trunk/src/common/os/win32/mod_loader.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/common/os/win32/mod_loader.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -201,7 +201,7 @@
if (PathUtils::isRelative(modPath))
{
MasterInterfacePtr master;
- const char* baseDir = master->getConfigManager()->getDirectory(IConfigManager::FB_DIR_BIN);
+ const char* baseDir = master->getConfigManager()->getDirectory(IConfigManager::DIR_BIN);
PathName fullName;
PathUtils::concatPath(fullName, baseDir, modPath);
Modified: firebird/trunk/src/common/security.cpp
===================================================================
--- firebird/trunk/src/common/security.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/common/security.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -42,7 +42,7 @@
namespace Auth {
Get::Get(Config* firebirdConf)
- : GetPlugins<Firebird::IManagement>(IPluginManager::AuthUserManagement, firebirdConf)
+ : GetPlugins<Firebird::IManagement>(IPluginManager::TYPE_AUTH_USER_MANAGEMENT, firebirdConf)
{
if (!hasData())
{
@@ -51,7 +51,7 @@
}
Get::Get(Config* firebirdConf, const char* plugName)
- : GetPlugins<Firebird::IManagement>(IPluginManager::AuthUserManagement, firebirdConf, plugName)
+ : GetPlugins<Firebird::IManagement>(IPluginManager::TYPE_AUTH_USER_MANAGEMENT, firebirdConf, plugName)
{
if (!hasData())
{
Modified: firebird/trunk/src/common/unicode_util.cpp
===================================================================
--- firebird/trunk/src/common/unicode_util.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/common/unicode_util.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -1144,7 +1144,7 @@
}
}
- if (lastError.getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (lastError.getState() & Firebird::IStatus::STATE_ERRORS)
{
(Arg::Gds(isc_random) << "Could not find acceptable ICU library"
<< Arg::StatusVector(lastError.getErrors())).raise();
Modified: firebird/trunk/src/common/utils.cpp
===================================================================
--- firebird/trunk/src/common/utils.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/common/utils.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -1012,13 +1012,13 @@
FB_GUARDDIR, FB_PLUGDIR
};
- fb_assert(FB_NELEM(configDir) == Firebird::IConfigManager::FB_DIRCOUNT);
- fb_assert(prefType < Firebird::IConfigManager::FB_DIRCOUNT);
+ fb_assert(FB_NELEM(configDir) == Firebird::IConfigManager::DIR_COUNT);
+ fb_assert(prefType < Firebird::IConfigManager::DIR_COUNT);
if (! bootBuild())
{
- if (prefType != Firebird::IConfigManager::FB_DIR_CONF &&
- prefType != Firebird::IConfigManager::FB_DIR_MSG &&
+ if (prefType != Firebird::IConfigManager::DIR_CONF &&
+ prefType != Firebird::IConfigManager::DIR_MSG &&
configDir[prefType][0])
{
// Value is set explicitly and is not environment overridable
@@ -1029,8 +1029,8 @@
switch(prefType)
{
- case Firebird::IConfigManager::FB_DIR_BIN:
- case Firebird::IConfigManager::FB_DIR_SBIN:
+ case Firebird::IConfigManager::DIR_BIN:
+ case Firebird::IConfigManager::DIR_SBIN:
#ifdef WIN_NT
s = "";
#else
@@ -1038,14 +1038,14 @@
#endif
break;
- case Firebird::IConfigManager::FB_DIR_CONF:
- case Firebird::IConfigManager::FB_DIR_LOG:
- case Firebird::IConfigManager::FB_DIR_GUARD:
- case Firebird::IConfigManager::FB_DIR_SECDB:
+ case Firebird::IConfigManager::DIR_CONF:
+ case Firebird::IConfigManager::DIR_LOG:
+ case Firebird::IConfigManager::DIR_GUARD:
+ case Firebird::IConfigManager::DIR_SECDB:
s = "";
break;
- case Firebird::IConfigManager::FB_DIR_LIB:
+ case Firebird::IConfigManager::DIR_LIB:
#ifdef WIN_NT
s = "";
#else
@@ -1053,43 +1053,43 @@
#endif
break;
- case Firebird::IConfigManager::FB_DIR_PLUGINS:
+ case Firebird::IConfigManager::DIR_PLUGINS:
s = "plugins";
break;
- case Firebird::IConfigManager::FB_DIR_INC:
+ case Firebird::IConfigManager::DIR_INC:
s = "include";
break;
- case Firebird::IConfigManager::FB_DIR_DOC:
+ case Firebird::IConfigManager::DIR_DOC:
s = "doc";
break;
- case Firebird::IConfigManager::FB_DIR_UDF:
+ case Firebird::IConfigManager::DIR_UDF:
s = "UDF";
break;
- case Firebird::IConfigManager::FB_DIR_SAMPLE:
+ case Firebird::IConfigManager::DIR_SAMPLE:
s = "examples";
break;
- case Firebird::IConfigManager::FB_DIR_SAMPLEDB:
+ case Firebird::IConfigManager::DIR_SAMPLEDB:
s = "examples/empbuild";
break;
- case Firebird::IConfigManager::FB_DIR_HELP:
+ case Firebird::IConfigManager::DIR_HELP:
s = "help";
break;
- case Firebird::IConfigManager::FB_DIR_INTL:
+ case Firebird::IConfigManager::DIR_INTL:
s = "intl";
break;
- case Firebird::IConfigManager::FB_DIR_MISC:
+ case Firebird::IConfigManager::DIR_MISC:
s = "misc";
break;
- case Firebird::IConfigManager::FB_DIR_MSG:
+ case Firebird::IConfigManager::DIR_MSG:
gds__prefix_msg(tmp, name);
return tmp;
@@ -1137,9 +1137,9 @@
{
const ISC_STATUS* s;
unsigned int copied = 0;
- int state = from->getStatus();
+ int state = from->getState();
- if (state & Firebird::IStatus::FB_HAS_ERRORS)
+ if (state & Firebird::IStatus::STATE_ERRORS)
{
s = from->getErrors();
copied = copyStatus(to, space, s, statusLength(s));
@@ -1148,7 +1148,7 @@
space -= copied;
}
- if (state & Firebird::IStatus::FB_HAS_WARNINGS)
+ if (state & Firebird::IStatus::STATE_WARNINGS)
{
if (!copied)
{
Modified: firebird/trunk/src/dsql/DdlNodes.epp
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.epp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/dsql/DdlNodes.epp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -9841,7 +9841,7 @@
secDbContext->att->execute(&statusWrapper, secDbContext->tra, 0, ddl.c_str(), SQL_DIALECT_V6,
NULL, NULL, NULL, NULL);
- if (statusWrapper.getStatus() & IStatus::FB_HAS_ERRORS)
+ if (statusWrapper.getState() & IStatus::STATE_ERRORS)
{
try
{
@@ -9941,7 +9941,7 @@
}
catch (const Exception&)
{
- if (st.getStatus() & IStatus::FB_HAS_ERRORS)
+ if (st.getState() & IStatus::STATE_ERRORS)
{
const ISC_STATUS* stat2 = st.getErrors();
if (stat2[1] != isc_dsql_token_unk_err)
Modified: firebird/trunk/src/dsql/DsqlCursor.cpp
===================================================================
--- firebird/trunk/src/dsql/DsqlCursor.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/dsql/DsqlCursor.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -81,7 +81,7 @@
if (request->req_fetch_baseline)
{
TraceDSQLFetch trace(attachment, request);
- trace.fetch(true, ITracePlugin::TRACE_RESULT_SUCCESS);
+ trace.fetch(true, ITracePlugin::RESULT_SUCCESS);
}
if (request->req_traced && TraceManager::need_dsql_free(attachment))
Modified: firebird/trunk/src/dsql/ExprNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/ExprNodes.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/dsql/ExprNodes.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -10849,7 +10849,7 @@
catch (const Exception& ex)
{
const bool noPriv = (ex.stuff_exception(tdbb->tdbb_status_vector) == isc_no_priv);
- trace.finish(noPriv ? ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED);
+ trace.finish(noPriv ? ITracePlugin::RESULT_UNAUTHORIZED : ITracePlugin::RESULT_FAILED);
tdbb->setRequest(request);
EXE_unwind(tdbb, funcRequest);
@@ -10866,7 +10866,7 @@
if (*nullPtr)
{
request->req_flags |= req_null;
- trace.finish(ITracePlugin::TRACE_RESULT_SUCCESS);
+ trace.finish(ITracePlugin::RESULT_SUCCESS);
}
else
{
@@ -10876,7 +10876,7 @@
value->vlu_desc = *fmtDesc;
value->vlu_desc.dsc_address = outMsg + argOffset;
- trace.finish(ITracePlugin::TRACE_RESULT_SUCCESS, &value->vlu_desc);
+ trace.finish(ITracePlugin::RESULT_SUCCESS, &value->vlu_desc);
}
EXE_unwind(tdbb, funcRequest);
Modified: firebird/trunk/src/dsql/StmtNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/StmtNodes.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/dsql/StmtNodes.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -2862,7 +2862,7 @@
{
const bool noPriv = (ex.stuff_exception(tdbb->tdbb_status_vector) == isc_no_priv);
trace.finish(false,
- noPriv ? Firebird::ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED);
+ noPriv ? Firebird::ITracePlugin::RESULT_UNAUTHORIZED : ITracePlugin::RESULT_FAILED);
EXE_unwind(tdbb, procRequest);
procRequest->req_attachment = NULL;
@@ -2871,7 +2871,7 @@
}
// trace procedure execution finish
- trace.finish(false, ITracePlugin::TRACE_RESULT_SUCCESS);
+ trace.finish(false, ITracePlugin::RESULT_SUCCESS);
EXE_unwind(tdbb, procRequest);
procRequest->req_attachment = NULL;
Modified: firebird/trunk/src/dsql/dsql.cpp
===================================================================
--- firebird/trunk/src/dsql/dsql.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/dsql/dsql.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -278,14 +278,14 @@
if (eofReached)
{
- trace.fetch(true, ITracePlugin::TRACE_RESULT_SUCCESS);
+ trace.fetch(true, ITracePlugin::RESULT_SUCCESS);
return false;
}
map_in_out(this, true, message, delayedFormat, msgBuffer);
delayedFormat = NULL;
- trace.fetch(false, ITracePlugin::TRACE_RESULT_SUCCESS);
+ trace.fetch(false, ITracePlugin::RESULT_SUCCESS);
return true;
}
@@ -624,7 +624,7 @@
{
status = tdbb->tdbb_status_vector[1];
*traceResult = status == isc_no_priv ?
- ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED;
+ ITracePlugin::RESULT_UNAUTHORIZED : ITracePlugin::RESULT_FAILED;
}
// restore warnings (if there are any)
@@ -794,7 +794,7 @@
}
const bool have_cursor = reqTypeWithCursor(statement->getType()) && !singleton;
- trace.finish(have_cursor, ITracePlugin::TRACE_RESULT_SUCCESS);
+ trace.finish(have_cursor, ITracePlugin::RESULT_SUCCESS);
}
void DsqlDdlRequest::dsqlPass(thread_db* tdbb, DsqlCompilerScratch* scratch,
@@ -858,7 +858,7 @@
JRD_autocommit_ddl(tdbb, req_transaction);
- trace.finish(false, ITracePlugin::TRACE_RESULT_SUCCESS);
+ trace.finish(false, ITracePlugin::RESULT_SUCCESS);
}
// Rethrow an exception with isc_no_meta_update and prefix codes.
@@ -1270,7 +1270,7 @@
// raise error if one present
static void checkD(IStatus* st)
{
- if (st->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (st->getState() & IStatus::STATE_ERRORS)
{
ERRD_post(Arg::StatusVector(st));
}
@@ -1405,7 +1405,7 @@
request->req_traced = true;
trace.setStatement(request);
- ntrace_result_t traceResult = ITracePlugin::TRACE_RESULT_SUCCESS;
+ ntrace_result_t traceResult = ITracePlugin::RESULT_SUCCESS;
try
{
request->dsqlPass(tdbb, scratch, &traceResult);
@@ -1421,7 +1421,7 @@
}
catch (const Firebird::Exception&)
{
- trace.prepare(ITracePlugin::TRACE_RESULT_FAILED);
+ trace.prepare(ITracePlugin::RESULT_FAILED);
if (request)
{
Modified: firebird/trunk/src/gpre/languages/ftn.cpp
===================================================================
--- firebird/trunk/src/gpre/languages/ftn.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/gpre/languages/ftn.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -1364,7 +1364,7 @@
{
Firebird::PathName include_buffer;
- include_buffer = fb_utils::getPrefix(Firebird::IConfigManager::FB_DIR_INC, INCLUDE_FTN_FILE);
+ include_buffer = fb_utils::getPrefix(Firebird::IConfigManager::DIR_INC, INCLUDE_FTN_FILE);
sprintf(output_buffer, INCLUDE_ISC_FTN, include_buffer.c_str());
FTN_print_buffer(output_buffer);
Modified: firebird/trunk/src/gpre/obj_cxx.cpp
===================================================================
--- firebird/trunk/src/gpre/obj_cxx.cpp 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/gpre/obj_cxx.cpp 2015-02-17 14:56:59 UTC (rev 60707)
@@ -159,7 +159,7 @@
static inline void success(const int column, bool ok, const char* status_name, const char* post = "")
{
- printa(column, "if (%s%s->getStatus() & Firebird::IStatus::FB_HAS_ERRORS%s)%s",
+ printa(column, "if (%s%s->getState() & Firebird::IStatus::STATE_ERRORS%s)%s",
ok ? "!(" : "", global_status_name, ok ? ")" : "", post);
}
@@ -991,7 +991,7 @@
static void gen_blob_for( const act* action, USHORT column)
{
PAT args;
- const TEXT* pattern1 = "%IFif (!(%S1->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)) {\n\
+ const TEXT* pattern1 = "%IFif (!(%S1->getState() & Firebird::IStatus::STATE_ERRORS)) {\n\
%ENwhile (1)\n\
{";
@@ -1001,8 +1001,8 @@
PATTERN_expand(column, pattern1, &args);
column += INDENT;
gen_get_segment(action, column);
- printa(column, "if (fbIStatus == Firebird::IStatus::FB_ERROR || "
- "fbIStatus == Firebird::IStatus::FB_NO_DATA) break;");
+ printa(column, "if (fbIStatus == Firebird::IStatus::ERROR || "
+ "fbIStatus == Firebird::IStatus::NO_DATA) break;");
}
@@ -2244,7 +2244,7 @@
{
if ((action->act_error || (action->act_flags & ACT_sql)) && db != gpreGlob.isc_databases)
{
- printa(column, "if (%s && !(%s->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)) ", db->dbb_name->sym_string, global_status_name);
+ printa(column, "if (%s && !(%s->getState() & Firebird::IStatus::STATE_ERRORS)) ", db->dbb_name->sym_string, global_status_name);
}
else
printa(column, "if (%s)", db->dbb_name->sym_string);
@@ -2277,7 +2277,7 @@
TEXT s[MAX_REF_SIZE];
if (action->act_error || (action->act_flags & ACT_sql))
- printa(column, "if (!%s || (%s->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)) break;",
+ printa(column, "if (!%s || (%s->getState() & Firebird::IStatus::STATE_ERRORS)) break;",
gen_name(s, request->req_eof, true), global_status_name);
else
printa(column, "if (!%s) break;", gen_name(s, request->req_eof, true));
@@ -2491,7 +2491,7 @@
{
const ref* into = action->act_object;
set_sqlcode(action, column);
- printa(column, "if (fbIStatus == Firebird::IStatus::FB_OK || fbIStatus == Firebird::IStatus::FB_SEGMENT)");
+ printa(column, "if (fbIStatus == Firebird::IStatus::OK || fbIStatus == Firebird::IStatus::SEGMENT)");
column += INDENT;
begin(column);
align(column);
@@ -3944,7 +3944,7 @@
align(column);
fprintf(gpreGlob.out_file, "if (!%s", db->dbb_name->sym_string);
if (stat && buffer[0])
- fprintf(gpreGlob.out_file, " && !(%s->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)", vector);
+ fprintf(gpreGlob.out_file, " && !(%s->getState() & Firebird::IStatus::STATE_ERRORS)", vector);
fprintf(gpreGlob.out_file, ")");
make_ready(db, filename, vector, (USHORT) (column + INDENT), 0);
if (buffer[0])
Modified: firebird/trunk/src/include/firebird/FirebirdInterface.idl
===================================================================
--- firebird/trunk/src/include/firebird/FirebirdInterface.idl 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/include/firebird/FirebirdInterface.idl 2015-02-17 14:56:59 UTC (rev 60707)
@@ -52,18 +52,18 @@
[exception]
interface Status : Disposable
{
- // flags in value returned by status()
- const uint FB_HAS_WARNINGS = 0x01;
- const uint FB_HAS_ERRORS = 0x02;
+ // flags in value returned by getState()
+ const uint STATE_WARNINGS = 0x01;
+ const uint STATE_ERRORS = 0x02;
// completion codes - not used in Status, but I must have them somewhere
- const int FB_ERROR = -1;
- const int FB_OK = 0;
- const int FB_NO_DATA = 1;
- const int FB_SEGMENT = 2;
+ const int ERROR = -1;
+ const int OK = 0;
+ const int NO_DATA = 1;
+ const int SEGMENT = 2;
void init();
- uint getStatus() const;
+ uint getState() const;
void setErrors2(uint length, const intptr* value);
void setWarnings2(uint length, const intptr* value);
@@ -217,17 +217,17 @@
interface PluginManager : Versioned
{
// Plugin types
- const uint Provider = 1;
- const uint FirstNonLibPlugin = 2;
- const uint AuthServer = 3;
- const uint AuthClient = 4;
- const uint AuthUserManagement = 5;
- const uint ExternalEngine = 6;
- const uint Trace = 7;
- const uint WireCrypt = 8;
- const uint DbCrypt = 9;
- const uint KeyHolder = 10;
- const uint MaxType = 11; // keep in sync please
+ const uint TYPE_PROVIDER = 1;
+ const uint TYPE_FIRST_NON_LIB = 2;
+ const uint TYPE_AUTH_SERVER = 3;
+ const uint TYPE_AUTH_CLIENT = 4;
+ const uint TYPE_AUTH_USER_MANAGEMENT = 5;
+ const uint TYPE_EXTERNAL_ENGINE = 6;
+ const uint TYPE_TRACE = 7;
+ const uint TYPE_WIRE_CRYPT = 8;
+ const uint TYPE_DB_CRYPT = 9;
+ const uint TYPE_KEY_HOLDER = 10;
+ const uint TYPE_COUNT = 11; // keep in sync
// Main function called by plugin modules in firebird_plugin()
void registerPluginFactory(uint pluginType, const string defaultName, PluginFactory factory);
@@ -272,24 +272,24 @@
interface ConfigManager : Versioned
{
// Codes for ConfigManager::getDirectory()
- const uint FB_DIR_BIN = 0;
- const uint FB_DIR_SBIN = 1;
- const uint FB_DIR_CONF = 2;
- const uint FB_DIR_LIB = 3;
- const uint FB_DIR_INC = 4;
- const uint FB_DIR_DOC = 5;
- const uint FB_DIR_UDF = 6;
- const uint FB_DIR_SAMPLE = 7;
- const uint FB_DIR_SAMPLEDB = 8;
- const uint FB_DIR_HELP = 9;
- const uint FB_DIR_INTL = 10;
- const uint FB_DIR_MISC = 11;
- const uint FB_DIR_SECDB = 12;
- const uint FB_DIR_MSG = 13;
- const uint FB_DIR_LOG = 14;
- const uint FB_DIR_GUARD = 15;
- const uint FB_DIR_PLUGINS = 16;
- const uint FB_DIRCOUNT = 17;
+ const uint DIR_BIN = 0;
+ const uint DIR_SBIN = 1;
+ const uint DIR_CONF = 2;
+ const uint DIR_LIB = 3;
+ const uint DIR_INC = 4;
+ const uint DIR_DOC = 5;
+ const uint DIR_UDF = 6;
+ const uint DIR_SAMPLE = 7;
+ const uint DIR_SAMPLEDB = 8;
+ const uint DIR_HELP = 9;
+ const uint DIR_INTL = 10;
+ const uint DIR_MISC = 11;
+ const uint DIR_SECDB = 12;
+ const uint DIR_MSG = 13;
+ const uint DIR_LOG = 14;
+ const uint DIR_GUARD = 15;
+ const uint DIR_PLUGINS = 16;
+ const uint DIR_COUNT = 17; // keep in sync
const string getDirectory(uint code);
FirebirdConf getFirebirdConf();
@@ -316,7 +316,7 @@
uint itemsLength, const uchar* items,
uint bufferLength, uchar* buffer);
- [notImplemented(Status::FB_ERROR)]
+ [notImplemented(Status::ERROR)]
int getSegment(Status status, uint bufferLength, void* buffer, uint* segmentLength);
void putSegment(Status status, uint length,
@@ -381,12 +381,12 @@
interface ResultSet : ReferenceCounted
{
- [notImplemented(Status::FB_ERROR)] int fetchNext(Status status, void* message);
- [notImplemented(Status::FB_ERROR)] int fetchPrior(Status status, void* message);
- [notImplemented(Status::FB_ERROR)] int fetchFirst(Status status, void* message);
- [notImplemented(Status::FB_ERROR)] int fetchLast(Status status, void* message);
- [notImplemented(Status::FB_ERROR)] int fetchAbsolute(Status status, int position, void* message);
- [notImplemented(Status::FB_ERROR)] int fetchRelative(Status status, int offset, void* message);
+ [notImplemented(Status::ERROR)] int fetchNext(Status status, void* message);
+ [notImplemented(Status::ERROR)] int fetchPrior(Status status, void* message);
+ [notImplemented(Status::ERROR)] int fetchFirst(Status status, void* message);
+ [notImplemented(Status::ERROR)] int fetchLast(Status status, void* message);
+ [notImplemented(Status::ERROR)] int fetchAbsolute(Status status, int position, void* message);
+ [notImplemented(Status::ERROR)] int fetchRelative(Status status, int offset, void* message);
boolean isEof(Status status);
boolean isBof(Status status);
MessageMetadata getMetadata(Status status);
@@ -924,8 +924,8 @@
interface TraceConnection : Versioned
{
- const uint TRACE_CONNECTION_DATABASE = 1;
- const uint TRACE_CONNECTION_SERVICE = 2;
+ const uint KIND_DATABASE = 1;
+ const uint KIND_SERVICE = 2;
uint getKind();
@@ -947,10 +947,10 @@
interface TraceTransaction : Versioned
{
- const uint TRA_ISO_CONSISTENCY = 1;
- const uint TRA_ISO_CONCURRENCY = 2;
- const uint TRA_ISO_READ_COMMITTED_RECVER = 3;
- const uint TRA_ISO_READ_COMMITTED_NORECVER = 4;
+ const uint ISOLATION_CONSISTENCY = 1;
+ const uint ISOLATION_CONCURRENCY = 2;
+ const uint ISOLATION_READ_COMMITTED_RECVER = 3;
+ const uint ISOLATION_READ_COMMITTED_NORECVER = 4;
uint getTransactionID();
boolean getReadOnly();
@@ -1018,10 +1018,14 @@
interface TraceTrigger : Versioned
{
- const uint TRACE_ALL = 0;
- const uint TRACE_BEFORE = 1;
- const uint TRACE_AFTER = 2;
+ //// TODO: TYPE or WHICH? ExternalTrigger has similar constants.
+ const uint TYPE_ALL = 0;
+ const uint TYPE_BEFORE = 1;
+ const uint TYPE_AFTER = 2;
+ //// TODO: What about database triggers?
+ //// TODO: Action constants?
+
const string getTriggerName();
const string getRelationName();
int getAction();
@@ -1072,9 +1076,9 @@
// API of trace plugin. Used to deliver notifications for each database
interface TracePlugin : ReferenceCounted
{
- const uint TRACE_RESULT_SUCCESS = 0;
- const uint TRACE_RESULT_FAILED = 1;
- const uint TRACE_RESULT_UNAUTHORIZED = 2;
+ const uint RESULT_SUCCESS = 0;
+ const uint RESULT_FAILED = 1;
+ const uint RESULT_UNAUTHORIZED = 2;
// Function to return error string for hook failure
const string trace_get_error();
@@ -1187,27 +1191,27 @@
interface TraceFactory : PluginBase
{
// Known notifications
- const uint TRACE_EVENT_ATTACH = 0;
- const uint TRACE_EVENT_DETACH = 1;
- const uint TRACE_EVENT_TRANSACTION_START = 2;
- const uint TRACE_EVENT_TRANSACTION_END = 3;
- const uint TRACE_EVENT_SET_CONTEXT = 4;
- const uint TRACE_EVENT_PROC_EXECUTE = 5;
- const uint TRACE_EVENT_TRIGGER_EXECUTE = 6;
- const uint TRACE_EVENT_DSQL_PREPARE = 7;
- const uint TRACE_EVENT_DSQL_FREE = 8;
- const uint TRACE_EVENT_DSQL_EXECUTE = 9;
- const uint TRACE_EVENT_BLR_COMPILE = 10;
- const uint TRACE_EVENT_BLR_EXECUTE = 11;
- const uint TRACE_EVENT_DYN_EXECUTE = 12;
- const uint TRACE_EVENT_SERVICE_ATTACH = 13;
- const uint TRACE_EVENT_SERVICE_START = 14;
- const uint TRACE_EVENT_SERVICE_QUERY = 15;
- const uint TRACE_EVENT_SERVICE_DETACH = 16;
- const uint TRACE_EVENT_ERROR = 17;
- const uint TRACE_EVENT_SWEEP = 18;
- const uint TRACE_EVENT_FUNC_EXECUTE = 19;
- const uint TRACE_EVENT_MAX = 20; // keep it last
+ const uint EVENT_ATTACH = 0;
+ const uint EVENT_DETACH = 1;
+ const uint EVENT_TRANSACTION_START = 2;
+ const uint EVENT_TRANSACTION_END = 3;
+ const uint EVENT_SET_CONTEXT = 4;
+ const uint EVENT_PROC_EXECUTE = 5;
+ const uint EVENT_TRIGGER_EXECUTE = 6;
+ const uint EVENT_DSQL_PREPARE = 7;
+ const uint EVENT_DSQL_FREE = 8;
+ const uint EVENT_DSQL_EXECUTE = 9;
+ const uint EVENT_BLR_COMPILE = 10;
+ const uint EVENT_BLR_EXECUTE = 11;
+ const uint EVENT_DYN_EXECUTE = 12;
+ const uint EVENT_SERVICE_ATTACH = 13;
+ const uint EVENT_SERVICE_START = 14;
+ const uint EVENT_SERVICE_QUERY = 15;
+ const uint EVENT_SERVICE_DETACH = 16;
+ const uint EVENT_ERROR = 17;
+ const uint EVENT_SWEEP = 18;
+ const uint EVENT_FUNC_EXECUTE = 19;
+ const uint EVENT_MAX = 20; // keep it last
// What notifications does plugin need
uint64 trace_needs();
Modified: firebird/trunk/src/include/firebird/IdlFbInterfaces.h
===================================================================
--- firebird/trunk/src/include/firebird/IdlFbInterfaces.h 2015-02-17 14:13:16 UTC (rev 60706)
+++ firebird/trunk/src/include/firebird/IdlFbInterfaces.h 2015-02-17 14:56:59 UTC (rev 60707)
@@ -202,7 +202,7 @@
struct VTable : public IDisposable::VTable
{
void (CLOOP_CARG *init)(IStatus* self) throw();
- unsigned (CLOOP_CARG *getStatus)(const IStatus* self) throw();
+ unsigned (CLOOP_CARG *getState)(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();
@@ -225,21 +225,21 @@
public:
static const unsigned VERSION = 3;
- static const unsigned FB_HAS_WARNINGS = 1;
- static const unsigned FB_HAS_ERRORS = 2;
- static const int FB_ERROR = -1;
- static const int FB_OK = 0;
- static const int FB_NO_DATA = 1;
- static const int FB_SEGMENT = 2;
+ static const unsigned STATE_WARNINGS = 1;
+ static const unsigned STATE_ERRORS = 2;
+ static const int ERROR = -1;
+ static const int OK = 0;
+ static const int NO_DATA = 1;
+ static const int SEGMENT = 2;
void init()
{
static_cast<VTable*>(this->cloopVTable)->init(this);
}
- unsigned getStatus() const
+ unsigned getState() const
{
- unsigned ret = static_cast<VTable*>(this->cloopVTable)->getStatus(this);
+ unsigned ret = static_cast<VTable*>(this->cloopVTable)->getState(this);
return ret;
}
@@ -763,17 +763,17 @@
public:
static const unsigned VERSION = 2;
- static const unsigned Provider = 1;
- static const unsigned FirstNonLibPlugin = 2;
- static const unsigned AuthServer = 3;
- static const unsigned AuthClient = 4;
- static const unsigned AuthUserManagement = 5;
- static const unsigned ExternalEngine = 6;
- static const unsigned Trace = 7;
- static const unsigned WireCrypt = 8;
- static const unsigned DbCrypt = 9;
- static const unsigned KeyHolder = 10;
- static const unsigned MaxType = 11;
+ static const unsigned TYPE_PROVIDER = 1;
+ static const unsigned TYPE_FIRST_NON_LIB = 2;
+ static const unsigned TYPE_AUTH_SERVER = 3;
+ static const unsigned TYPE_AUTH_CLIENT = 4;
+ static const unsigned TYPE_AUTH_USER_MANAGEMENT = 5;
+ static const unsigned TYPE_EXTERNAL_ENGINE = 6;
+ static const unsigned TYPE_TRACE = 7;
+ static const unsigned TYPE_WIRE_CRYPT = 8;
+ static const unsigned TYPE_DB_CRYPT = 9;
+ static const unsigned TYPE_KEY_HOLDER = 10;
+ static const unsigned TYPE_COUNT = 11;
void registerPluginFactory(unsigned pluginType, const char* defaultName, IPluginFactory* factory)
{
@@ -885,24 +885,24 @@
public:
static const unsigned VERSION = 2;
- static const unsigned FB_DIR_BIN = 0;
- static const unsigned FB_DIR_SBIN = 1;
- static const unsigned FB_DIR_CONF = 2;
- static const unsigned FB_DIR_LIB = 3;
- static const unsigned FB_DIR_INC = 4;
- static const unsigned FB_DIR_DOC = 5;
- static const unsigned FB_DIR_UDF = 6;
- static const unsigned FB_DIR_SAMPLE = 7;
- static const unsigned FB_DIR_SAMPLEDB = 8;
- static const unsigned FB_DIR_HELP = 9;
- static const unsigned FB_DIR_INTL = 10;
- static const unsigned FB_DIR_MISC = 11;
- static const unsigned FB_DIR_SECDB = 12;
- static const unsigned FB_DIR_MSG = 13;
- static const unsigned FB_DIR_LOG = 14;
- static const unsigned FB_DIR_GUARD = 15;
- static const unsigned FB_DIR_PLUGINS = 16;
- static const unsigned FB_DIRCOUNT = 17;
+ static const unsigned DIR_BIN = 0;
+ static const unsigned DIR_SBIN = 1;
+ static const unsigned DIR_CONF = 2;
+ static const unsigned DIR_LIB = 3;
+ static const unsigned DIR_INC = 4;
+ static const unsigned DIR_DOC = 5;
+ static const unsigned DIR_UDF = 6;
+ static const unsigned DIR_SAMPLE = 7;
+ static const unsigned DIR_SAMPLEDB = 8;
+ static const unsigned DIR_HELP = 9;
+ static const unsigned DIR_INTL = 10;
+ static const unsigned DIR_MISC = 11;
+ static const unsigned DIR_SECDB = 12;
+ static const unsigned DIR_MSG = 13;
+ static const unsigned DIR_LOG = 14;
+ static const unsigned DIR_GUARD = 15;
+ static const unsigned DIR_PLUGINS = 16;
+ static const unsigned DIR_COUNT = 17;
const char* getDirectory(unsigned code)
{
@@ -1513,7 +1513,6 @@
static const unsigned FLAG_REPEAT_EXECUTE = 2;
static const unsigned CURSOR_TYPE_SCROLLABLE = 1;
-
template <typename StatusType> void getInfo(StatusType* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer)
{
static_cast<VTable*>(this->cloopVTable)->getInfo(this, status, itemsLength, items, bufferLength, buffer);
@@ -3368,8 +3367,8 @@
public:
static const unsigned VERSION = 2;
- static const unsigned TRACE_CONNECTION_DATABASE = 1;
- static const unsigned TRACE_CONNECTION_SERVICE = 2;
+ static const unsigned KIND_DATABASE = 1;
+ static const unsigned KIND_SERVICE = 2;
unsigned getKind()
{
@@ -3486,10 +3485,10 @@
public:
static const unsigned VERSION = 2;
- static const unsigned TRA_ISO_CONSISTENCY = 1;
- static const unsigned TRA_ISO_CONCURRENCY = 2;
- static const unsigned TRA_ISO_READ_COMMITTED_RECVER = 3;
- static const unsigned TRA_ISO_READ_COMMITTED_NORECVER = 4;
+ static const unsigned ISOLATION_CONSISTENCY = 1;
+ static const unsigned ISOLATION_CONCURRENCY = 2;
+ static const unsigned ISOLATION_READ_COMMITTED_RECVER = 3;
+ static const unsigned ISOLATION_READ_COMMITTED_NORECVER = 4;
unsigned getTransactionID()
{
@@ -3890,9 +3889,9 @@
public:
static const unsigned VERSION = 2;
- static const unsigned TRACE_ALL = 0;
- static const unsigned TRACE_BEFORE = 1;
- static const unsigned TRACE_AFTER = 2;
+ static const unsigned TYPE_ALL = 0;
+ static const unsigned TYPE_BEFORE = 1;
+ static const unsigned TYPE_AFTER = 2;
const char* getTriggerName()
{
@@ -4211,9 +4210,9 @@
public:
static const unsigned VERSION = 3;
- static const unsigned TRACE_RESULT_SUCCESS = 0;
- static const unsigned TRACE_RESULT_FAILED = 1;
- static const unsigned TRACE_RESULT_UNAUTHORIZED = 2;
+ static const unsigned RESULT_SUCCESS = 0;
+ static const unsigned RESULT_FAILED = 1;
+ static const unsigned RESULT_UNAUTHORIZED = 2;
static const unsigned SWEEP_STATE_STARTED = 1;
static const unsigned SWEEP_STATE_FINISHED = 2;
static const unsigned SWEEP_STATE_FAILED = 3;
@@ -4368,27 +4367,27 @@
public:
static const unsigned VERSION = 4;
- static const unsigned TRACE_EVENT_ATTACH = 0;
- static const unsigned TRACE_EVENT_DETACH = 1;
- static const unsigned TRACE_EVENT_TRANSACTION_START = 2;
- static const unsigned TRACE_EVENT_TRANSACTION_END = 3;
- static const unsigned TRACE_EVENT_SET_CONTEXT = 4;
- static const unsigned TRACE_EVENT_PROC_EXECUTE = 5;
- static const unsigned TRACE_EVENT_TRIGGER_EXECUTE = 6;
- static const unsigned TRACE_EVENT_DSQL_PREPARE = 7;
- static const unsigned TRACE_EVENT_DSQL_FREE = 8;
- static const unsigned TRACE_EVENT_DSQL_EXECUTE = 9;
- static const unsigned TRACE_EVENT_BLR_COMPILE = 10;
- static const unsigned TRACE_EVENT_BLR_EXECUTE = 11;
- static const unsigned TRACE_EVENT_DYN_EXECUTE = 12;
- static const unsigned TRACE_EVENT_SERVICE_ATTACH = 13;
- static const unsigned TRACE_EVENT_SERVICE_START = 14;
- static const unsigned TRACE_EVENT_SERVICE_QUERY = 15;
- static const unsigned TRACE_EVENT_SERVICE_DETACH = 16;
- static const unsigned TRACE_EVENT_ERROR = 17;
- static const unsigned TRACE_EVENT_SWEEP = 18;
- static const unsigned TRACE_EVENT_FUNC_EXECUTE = 19;
- static const unsigned TRACE_EVENT_MAX = 20;
+ static const unsigned EVENT_ATTACH = 0;
+ static const unsigned EVENT_DETACH = 1;
+ static const unsigned EVENT_TRANSACTION_START = 2;
+ static const unsigned EVENT_TRANSACTION_END = 3;
+ static const unsigned EVENT_SET_CONTEXT = 4;
+ static const unsigned EVENT_PROC_EXECUTE = 5;
+ static const unsigned EVENT_TRIGGER_EXECUTE = 6;
+ static const unsigned EVENT_DSQL_PREPARE = 7;
+ static const unsigned EVENT_DS...
[truncated message content] |
|
From: <asf...@us...> - 2015-02-17 23:21:38
|
Revision: 60711
http://sourceforge.net/p/firebird/code/60711
Author: asfernandes
Date: 2015-02-17 23:21:25 +0000 (Tue, 17 Feb 2015)
Log Message:
-----------
Revert my last change after it broke the Windows build.
Modified Paths:
--------------
firebird/trunk/examples/dbcrypt/CryptApplication.cpp
firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
firebird/trunk/examples/dbcrypt/DbCrypt.cpp
firebird/trunk/src/auth/AuthDbg.cpp
firebird/trunk/src/auth/SecureRemotePassword/Message.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.cpp
firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp
firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
firebird/trunk/src/auth/trusted/AuthSspi.cpp
firebird/trunk/src/common/IntlParametersBlock.cpp
firebird/trunk/src/common/StatusArg.cpp
firebird/trunk/src/common/StatusHolder.h
firebird/trunk/src/common/call_service.cpp
firebird/trunk/src/common/classes/ImplementHelper.h
firebird/trunk/src/common/classes/MsgPrint.cpp
firebird/trunk/src/common/config/config.cpp
firebird/trunk/src/common/config/config_file.cpp
firebird/trunk/src/common/db_alias.cpp
firebird/trunk/src/common/os/win32/mod_loader.cpp
firebird/trunk/src/common/security.cpp
firebird/trunk/src/common/unicode_util.cpp
firebird/trunk/src/common/utils.cpp
firebird/trunk/src/dsql/DdlNodes.epp
firebird/trunk/src/dsql/DsqlCursor.cpp
firebird/trunk/src/dsql/ExprNodes.cpp
firebird/trunk/src/dsql/StmtNodes.cpp
firebird/trunk/src/dsql/dsql.cpp
firebird/trunk/src/gpre/languages/ftn.cpp
firebird/trunk/src/gpre/obj_cxx.cpp
firebird/trunk/src/include/firebird/FirebirdInterface.idl
firebird/trunk/src/include/firebird/IdlFbInterfaces.h
firebird/trunk/src/include/firebird/Interface.h
firebird/trunk/src/include/firebird/UdrCppEngine.h
firebird/trunk/src/isql/isql.epp
firebird/trunk/src/isql/show.epp
firebird/trunk/src/jrd/CryptoManager.cpp
firebird/trunk/src/jrd/Database.cpp
firebird/trunk/src/jrd/DbCreators.cpp
firebird/trunk/src/jrd/ExtEngineManager.cpp
firebird/trunk/src/jrd/IntlManager.cpp
firebird/trunk/src/jrd/Mapping.cpp
firebird/trunk/src/jrd/SysFunction.cpp
firebird/trunk/src/jrd/UserManagement.cpp
firebird/trunk/src/jrd/exe.cpp
firebird/trunk/src/jrd/extds/InternalDS.cpp
firebird/trunk/src/jrd/fun.epp
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/jrd.h
firebird/trunk/src/jrd/recsrc/ProcedureScan.cpp
firebird/trunk/src/jrd/svc.cpp
firebird/trunk/src/jrd/tra.cpp
firebird/trunk/src/jrd/trace/TraceDSQLHelpers.h
firebird/trunk/src/jrd/trace/TraceJrdHelpers.h
firebird/trunk/src/jrd/trace/TraceManager.cpp
firebird/trunk/src/jrd/trace/TraceObjects.cpp
firebird/trunk/src/plugins/crypt/arc4/Arc4.cpp
firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
firebird/trunk/src/qli/help.epp
firebird/trunk/src/remote/client/interface.cpp
firebird/trunk/src/remote/inet.cpp
firebird/trunk/src/remote/os/win32/wnet.cpp
firebird/trunk/src/remote/remote.cpp
firebird/trunk/src/remote/server/os/posix/inet_server.cpp
firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp
firebird/trunk/src/remote/server/server.cpp
firebird/trunk/src/utilities/gsec/gsec.cpp
firebird/trunk/src/utilities/guard/util.cpp
firebird/trunk/src/utilities/ibmgr/srvrmgr.cpp
firebird/trunk/src/utilities/ntrace/TracePluginImpl.cpp
firebird/trunk/src/utilities/ntrace/traceplugin.cpp
firebird/trunk/src/yvalve/DistributedTransaction.cpp
firebird/trunk/src/yvalve/PluginManager.cpp
firebird/trunk/src/yvalve/gds.cpp
firebird/trunk/src/yvalve/perf.cpp
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 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/examples/dbcrypt/CryptApplication.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -67,7 +67,7 @@
if (tra)
{
tra->rollback(status);
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
{
print("rollback");
tra->release();
@@ -76,7 +76,7 @@
if (att)
{
att->detach(status);
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
{
print("detach");
att->release();
@@ -98,19 +98,19 @@
p = master->getDispatcher();
p->setDbCryptCallback(status, &key);
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
throw "setDbCryptCallback";
char s[256];
sprintf(s, "localhost:%s", dbName);
att = p->attachDatabase(status, s, 0, NULL);
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
throw "attachDatabase";
if (a != NONE)
{
tra = att->startTransaction(status, 0, NULL);
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
throw "startTransaction";
}
@@ -118,20 +118,20 @@
{
att->execute(status, tra, 0,
"ALTER DATABASE ENCRYPT WITH \"DbCrypt_example\"", 3, NULL, NULL, NULL, NULL);
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
throw "execute";
}
if (a == DEC)
{
att->execute(status, tra, 0, "ALTER DATABASE DECRYPT", 3, NULL, NULL, NULL, NULL);
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
throw "execute";
}
if (tra)
{
tra->commit(status);
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
throw "commit";
tra = NULL;
}
@@ -140,7 +140,7 @@
getchar();
att->detach(status);
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
throw "detach";
att = NULL;
Modified: firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -196,12 +196,12 @@
return 1;
IConfig* def = config->getDefaultConfig(status);
- if (status->getState() & Firebird::IStatus::STATE_ERRORS)
+ if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
return 1;
IConfigEntry* confEntry = def->find(status, "Auto");
def->release();
- if (status->getState() & Firebird::IStatus::STATE_ERRORS)
+ if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
return 1;
if (confEntry)
@@ -269,6 +269,6 @@
pluginManager = master->getPluginManager();
module.registerMe();
- pluginManager->registerPluginFactory(IPluginManager::TYPE_KEY_HOLDER, "CryptKeyHolder_example",
+ pluginManager->registerPluginFactory(IPluginManager::KeyHolder, "CryptKeyHolder_example",
&factory);
}
Modified: firebird/trunk/examples/dbcrypt/DbCrypt.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -194,11 +194,11 @@
return;
IConfig* def = config->getDefaultConfig(status);
- if (status->getState() & Firebird::IStatus::STATE_ERRORS)
+ if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
return;
IConfigEntry* confEntry = def->find(status, "Auto");
- if (status->getState() & Firebird::IStatus::STATE_ERRORS)
+ if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
{
def->release();
return;
@@ -231,7 +231,7 @@
for (unsigned n = 0; n < length; ++n)
{
ICryptKeyCallback* callback = sources[n]->keyHandle(status, "sample");
- if (status->getState() & Firebird::IStatus::STATE_ERRORS)
+ if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
return;
if (callback && callback->callback(0, NULL, 1, &key) == 1)
@@ -277,5 +277,5 @@
pluginManager = master->getPluginManager();
module.registerMe();
- pluginManager->registerPluginFactory(IPluginManager::TYPE_DB_CRYPT, "DbCrypt_example", &factory);
+ pluginManager->registerPluginFactory(IPluginManager::DbCrypt, "DbCrypt_example", &factory);
}
Modified: firebird/trunk/src/auth/AuthDbg.cpp
===================================================================
--- firebird/trunk/src/auth/AuthDbg.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/auth/AuthDbg.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -46,8 +46,8 @@
Firebird::PluginManagerInterfacePtr iPlugin;
- iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_CLIENT, name, &clientFactory);
- iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_SERVER, name, &serverFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthClient, name, &clientFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthServer, name, &serverFactory);
}
@@ -84,7 +84,7 @@
fprintf(stderr, "DebugServer::authenticate1: %s\n", str.c_str());
#endif
sb->putData(status, str.length(), str.c_str());
- if (status->getState() & Firebird::IStatus::STATE_ERRORS)
+ if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
{
return AUTH_FAILED;
}
@@ -165,7 +165,7 @@
fprintf(stderr, "DebugClient::authenticate: sending %s\n", str.c_str());
#endif
cb->putData(status, str.length(), str.c_str());
- if (status->getState() & Firebird::IStatus::STATE_ERRORS)
+ if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
{
return AUTH_FAILED;
}
Modified: firebird/trunk/src/auth/SecureRemotePassword/Message.h
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/Message.h 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/auth/SecureRemotePassword/Message.h 2015-02-17 23:21:25 UTC (rev 60711)
@@ -28,7 +28,7 @@
{
Firebird::LocalStatus st;
Firebird::IMessageMetadata* m = out ? stmt->getOutputMetadata(&st) : stmt->getInputMetadata(&st);
- if (st.getState() & Firebird::IStatus::STATE_ERRORS)
+ if (st.getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
{
Firebird::status_exception::raise(&st);
}
@@ -175,7 +175,7 @@
static void check(Firebird::IStatus* status)
{
- if (status->getState() & Firebird::IStatus::STATE_ERRORS)
+ if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
{
#ifdef INTERNAL_FIREBIRD
Firebird::status_exception::raise(status);
Modified: firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -80,7 +80,7 @@
client->genClientKey(data);
dumpIt("Clnt: clientPubKey", data);
cb->putData(status, data.length(), data.begin());
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
return AUTH_FAILED;
return AUTH_MORE_DATA;
}
@@ -132,19 +132,19 @@
cProof.getText(data);
cb->putData(status, data.length(), data.c_str());
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
{
return AUTH_FAILED;
}
// output the key
ICryptKey* cKey = cb->newKey(status);
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
{
return AUTH_FAILED;
}
cKey->setSymmetric(status, "Symmetric", sessionKey.getCount(), sessionKey.begin());
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
{
return AUTH_FAILED;
}
@@ -175,7 +175,7 @@
void registerSrpClient(IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(IPluginManager::TYPE_AUTH_CLIENT, RemotePassword::plugName, &factory);
+ iPlugin->registerPluginFactory(IPluginManager::AuthClient, RemotePassword::plugName, &factory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -164,7 +164,7 @@
selGrantor.c_str(), SQL_DIALECT_V6, NULL, NULL, out.getMetadata(), NULL, 0);
check(&statusWrapper);
- bool hasGrant = curs->fetchNext(&statusWrapper, out.getBuffer()) == Firebird::IStatus::OK;
+ bool hasGrant = curs->fetchNext(&statusWrapper, out.getBuffer()) == Firebird::IStatus::FB_OK;
curs->close(&statusWrapper);
check(&statusWrapper);
@@ -301,7 +301,7 @@
for (unsigned repeat = 0; ; ++repeat)
{
stmt = att->prepare(status, tra, 0, insert, SQL_DIALECT_V6, Firebird::IStatement::PREPARE_PREFETCH_METADATA);
- if (!(status->getState() & Firebird::IStatus::STATE_ERRORS))
+ if (!(status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS))
{
break;
}
@@ -566,7 +566,7 @@
(par ? par->getBuffer() : NULL), om, 0);
check(status);
- while (rs->fetchNext(status, di.getBuffer()) == Firebird::IStatus::OK)
+ while (rs->fetchNext(status, di.getBuffer()) == Firebird::IStatus::FB_OK)
{
listField(user->userName(), login);
listField(user->firstName(), first);
@@ -617,7 +617,7 @@
if (tra)
{
tra->commit(status);
- if (!(status->getState() & Firebird::IStatus::STATE_ERRORS))
+ if (!(status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS))
{
tra = NULL;
}
@@ -629,7 +629,7 @@
if (tra)
{
tra->rollback(status);
- if (!(status->getState() & Firebird::IStatus::STATE_ERRORS))
+ if (!(status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS))
{
tra = NULL;
}
@@ -646,7 +646,7 @@
if (att)
{
att->detach(&statusWrapper);
- if (!(status.getState() & Firebird::IStatus::STATE_ERRORS))
+ if (!(status.getStatus() & Firebird::IStatus::FB_HAS_ERRORS))
{
att = NULL;
}
@@ -695,7 +695,7 @@
static void check(Firebird::CheckStatusWrapper* status)
{
- if (status->getState() & Firebird::IStatus::STATE_ERRORS)
+ if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
{
checkStatusVectorForMissingTable(status->getErrors());
Firebird::status_exception::raise(status);
@@ -853,7 +853,7 @@
{
int cc = blob->getSegment(&statusWrapper, sizeof(segbuf), segbuf, &len);
check(&statusWrapper);
- if (cc == Firebird::IStatus::NO_DATA)
+ if (cc == Firebird::IStatus::FB_NO_DATA)
break;
s.append(segbuf, len);
}
@@ -908,6 +908,6 @@
extern "C" void FB_EXPORTED FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
{
Firebird::CachedMasterInterface::set(master);
- Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_USER_MANAGEMENT, Auth::RemotePassword::plugName, &Auth::factory);
+ Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::IPluginManager::AuthUserManagement, Auth::RemotePassword::plugName, &Auth::factory);
Firebird::getUnloadDetector()->registerMe();
}
Modified: firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -154,7 +154,7 @@
const char* sql =
"SELECT PLG$VERIFIER, PLG$SALT FROM PLG$SRP WHERE PLG$USER_NAME = ? AND PLG$ACTIVE";
stmt = att->prepare(status, tra, 0, sql, 3, IStatement::PREPARE_PREFETCH_METADATA);
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
{
checkStatusVectorForMissingTable(status->getErrors());
status_exception::raise(status);
@@ -223,7 +223,7 @@
dumpIt("Srv: serverPubKey", serverPubKey);
dumpBin("Srv: data", data);
sb->putData(status, data.length(), data.c_str());
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
{
return AUTH_FAILED;
}
@@ -233,12 +233,12 @@
// output the key
ICryptKey* cKey = sb->newKey(status);
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
{
return AUTH_FAILED;
}
cKey->setSymmetric(status, "Symmetric", sessionKey.getCount(), sessionKey.begin());
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
{
return AUTH_FAILED;
}
@@ -256,12 +256,12 @@
if (clientProof == serverProof)
{
writerInterface->add(status, account.c_str());
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
{
return AUTH_FAILED;
}
writerInterface->setDb(status, secDbName);
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
{
return AUTH_FAILED;
}
@@ -294,7 +294,7 @@
void registerSrpServer(IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(IPluginManager::TYPE_AUTH_SERVER, RemotePassword::plugName, &factory);
+ iPlugin->registerPluginFactory(IPluginManager::AuthServer, RemotePassword::plugName, &factory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -46,7 +46,7 @@
TEXT pwt[MAX_LEGACY_PASSWORD_LENGTH + 2];
ENC_crypt(pwt, sizeof pwt, cb->getPassword(), LEGACY_PASSWORD_SALT);
cb->putData(status, static_cast<unsigned>(strlen(&pwt[2])), &pwt[2]);
- if (status->getState() & Firebird::IStatus::STATE_ERRORS)
+ if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
{
return AUTH_FAILED;
}
@@ -70,7 +70,7 @@
void registerLegacyClient(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_CLIENT, "Legacy_Auth", &factory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthClient, "Legacy_Auth", &factory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -765,6 +765,6 @@
extern "C" void FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
{
Firebird::CachedMasterInterface::set(master);
- Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_USER_MANAGEMENT, "Legacy_UserManager", &factory);
+ Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::IPluginManager::AuthUserManagement, "Legacy_UserManager", &factory);
Firebird::getUnloadDetector()->registerMe();
}
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -528,7 +528,7 @@
#ifdef USE_ATT_RQ_CACHE
LocalStatus s;
TimerInterfacePtr()->start(&s, instance, 10 * 1000 * 1000);
- if (s.getState() & IStatus::STATE_ERRORS)
+ if (s.getStatus() & IStatus::FB_HAS_ERRORS)
instance->handler();
#else
instance->handler();
@@ -563,7 +563,7 @@
void registerLegacyServer(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_SERVER, "Legacy_Auth", &factory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthServer, "Legacy_Auth", &factory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/trusted/AuthSspi.cpp
===================================================================
--- firebird/trunk/src/auth/trusted/AuthSspi.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/auth/trusted/AuthSspi.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -440,12 +440,12 @@
void registerTrustedClient(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_CLIENT, plugName, &clientFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthClient, plugName, &clientFactory);
}
void registerTrustedServer(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_SERVER, plugName, &serverFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthServer, plugName, &serverFactory);
}
} // namespace Auth
Modified: firebird/trunk/src/common/IntlParametersBlock.cpp
===================================================================
--- firebird/trunk/src/common/IntlParametersBlock.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/common/IntlParametersBlock.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -163,7 +163,7 @@
{
LocalStatus l;
st.stuffException(&l);
- if ((l.getState() & IStatus::STATE_ERRORS) && (l.getErrors()[1] == isc_bad_conn_str) && tagName)
+ if ((l.getStatus() & IStatus::FB_HAS_ERRORS) && (l.getErrors()[1] == isc_bad_conn_str) && tagName)
{
Arg::Gds newErrors(isc_random);
string message("Bad international character in tag ");
Modified: firebird/trunk/src/common/StatusArg.cpp
===================================================================
--- firebird/trunk/src/common/StatusArg.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/common/StatusArg.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -77,10 +77,10 @@
clear();
- if (s->getState() & IStatus::STATE_ERRORS)
+ if (s->getStatus() & IStatus::FB_HAS_ERRORS)
append(s->getErrors(), FB_NELEM(m_status_vector) - 1);
- if (s->getState() & IStatus::STATE_WARNINGS)
+ if (s->getStatus() & IStatus::FB_HAS_WARNINGS)
append(s->getWarnings(), FB_NELEM(m_status_vector) - 1);
}
Modified: firebird/trunk/src/common/StatusHolder.h
===================================================================
--- firebird/trunk/src/common/StatusHolder.h 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/common/StatusHolder.h 2015-02-17 23:21:25 UTC (rev 60711)
@@ -77,10 +77,10 @@
return warnings.get();
}
- unsigned getState() const
+ unsigned getStatus() const
{
- return (errors.vector[1] ? IStatus::STATE_ERRORS : 0) |
- (warnings.vector[1] ? IStatus::STATE_WARNINGS : 0);
+ return (errors.vector[1] ? IStatus::FB_HAS_ERRORS : 0) |
+ (warnings.vector[1] ? IStatus::FB_HAS_WARNINGS : 0);
}
IStatus* clone() const
Modified: firebird/trunk/src/common/call_service.cpp
===================================================================
--- firebird/trunk/src/common/call_service.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/common/call_service.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -335,7 +335,7 @@
setAttr(attr, "Uid", &u->u);
setAttr(attr, "Gid", &u->g);
u->attributes()->set(status, attr.c_str());
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
return;
u->attributes()->setEntered(status, attr.hasData());
}
Modified: firebird/trunk/src/common/classes/ImplementHelper.h
===================================================================
--- firebird/trunk/src/common/classes/ImplementHelper.h 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/common/classes/ImplementHelper.h 2015-02-17 23:21:25 UTC (rev 60711)
@@ -322,7 +322,7 @@
// Generic status checker
inline void check(IStatus* status)
{
- if (status->getState() & IStatus::STATE_ERRORS)
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
{
status_exception::raise(status);
}
Modified: firebird/trunk/src/common/classes/MsgPrint.cpp
===================================================================
--- firebird/trunk/src/common/classes/MsgPrint.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/common/classes/MsgPrint.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -385,7 +385,7 @@
else if (n == -2)
{
s += "message file ";
- s += fb_utils::getPrefix(Firebird::IConfigManager::DIR_MSG, MSG_FILE).ToString();
+ s += fb_utils::getPrefix(Firebird::IConfigManager::FB_DIR_MSG, MSG_FILE).ToString();
s += " not found";
}
else
Modified: firebird/trunk/src/common/config/config.cpp
===================================================================
--- firebird/trunk/src/common/config/config.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/common/config/config.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -51,7 +51,7 @@
{
try
{
- ConfigFile file(fb_utils::getPrefix(Firebird::IConfigManager::DIR_CONF, CONFIG_FILE),
+ ConfigFile file(fb_utils::getPrefix(Firebird::IConfigManager::FB_DIR_CONF, CONFIG_FILE),
ConfigFile::ERROR_WHEN_MISS);
defaultConfig = new Config(file);
}
@@ -692,19 +692,19 @@
{
switch (type)
{
- case Firebird::IPluginManager::TYPE_PROVIDER:
+ case Firebird::IPluginManager::Provider:
return (const char*) values[KEY_PLUG_PROVIDERS];
- case Firebird::IPluginManager::TYPE_AUTH_SERVER:
+ case Firebird::IPluginManager::AuthServer:
return (const char*) values[KEY_PLUG_AUTH_SERVER];
- case Firebird::IPluginManager::TYPE_AUTH_CLIENT:
+ case Firebird::IPluginManager::AuthClient:
return (const char*) values[KEY_PLUG_AUTH_CLIENT];
- case Firebird::IPluginManager::TYPE_AUTH_USER_MANAGEMENT:
+ case Firebird::IPluginManager::AuthUserManagement:
return (const char*) values[KEY_PLUG_AUTH_MANAGE];
- case Firebird::IPluginManager::TYPE_TRACE:
+ case Firebird::IPluginManager::Trace:
return (const char*) values[KEY_PLUG_TRACE];
- case Firebird::IPluginManager::TYPE_WIRE_CRYPT:
+ case Firebird::IPluginManager::WireCrypt:
return (const char*) values[KEY_PLUG_WIRE_CRYPT];
- case Firebird::IPluginManager::TYPE_KEY_HOLDER:
+ case Firebird::IPluginManager::KeyHolder:
return (const char*) values[KEY_PLUG_KEY_HOLDER];
}
Modified: firebird/trunk/src/common/config/config_file.cpp
===================================================================
--- firebird/trunk/src/common/config/config_file.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/common/config/config_file.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -503,17 +503,17 @@
unsigned code;
const char* name;
} dirs[] = {
-#define NMDIR(a) {Firebird::IConfigManager::a, "FB_"#a},
- NMDIR(DIR_CONF)
- NMDIR(DIR_SECDB)
- NMDIR(DIR_PLUGINS)
- NMDIR(DIR_UDF)
- NMDIR(DIR_SAMPLE)
- NMDIR(DIR_SAMPLEDB)
- NMDIR(DIR_INTL)
- NMDIR(DIR_MSG)
+#define NMDIR(a) {Firebird::IConfigManager::a, #a},
+ NMDIR(FB_DIR_CONF)
+ NMDIR(FB_DIR_SECDB)
+ NMDIR(FB_DIR_PLUGINS)
+ NMDIR(FB_DIR_UDF)
+ NMDIR(FB_DIR_SAMPLE)
+ NMDIR(FB_DIR_SAMPLEDB)
+ NMDIR(FB_DIR_INTL)
+ NMDIR(FB_DIR_MSG)
#undef NMDIR
- {Firebird::IConfigManager::DIR_COUNT, NULL}
+ {Firebird::IConfigManager::FB_DIRCOUNT, NULL}
};
for (const Dir* d = dirs; d->name; ++d)
Modified: firebird/trunk/src/common/db_alias.cpp
===================================================================
--- firebird/trunk/src/common/db_alias.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/common/db_alias.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -260,7 +260,7 @@
{
public:
explicit AliasesConf(MemoryPool& p)
- : ConfigCache(p, fb_utils::getPrefix(Firebird::IConfigManager::DIR_CONF, ALIAS_FILE)),
+ : ConfigCache(p, fb_utils::getPrefix(Firebird::IConfigManager::FB_DIR_CONF, ALIAS_FILE)),
databases(getPool()), aliases(getPool())
#ifdef HAVE_ID_BY_NAME
, ids(getPool())
Modified: firebird/trunk/src/common/os/win32/mod_loader.cpp
===================================================================
--- firebird/trunk/src/common/os/win32/mod_loader.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/common/os/win32/mod_loader.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -201,7 +201,7 @@
if (PathUtils::isRelative(modPath))
{
MasterInterfacePtr master;
- const char* baseDir = master->getConfigManager()->getDirectory(IConfigManager::DIR_BIN);
+ const char* baseDir = master->getConfigManager()->getDirectory(IConfigManager::FB_DIR_BIN);
PathName fullName;
PathUtils::concatPath(fullName, baseDir, modPath);
Modified: firebird/trunk/src/common/security.cpp
===================================================================
--- firebird/trunk/src/common/security.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/common/security.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -42,7 +42,7 @@
namespace Auth {
Get::Get(Config* firebirdConf)
- : GetPlugins<Firebird::IManagement>(IPluginManager::TYPE_AUTH_USER_MANAGEMENT, firebirdConf)
+ : GetPlugins<Firebird::IManagement>(IPluginManager::AuthUserManagement, firebirdConf)
{
if (!hasData())
{
@@ -51,7 +51,7 @@
}
Get::Get(Config* firebirdConf, const char* plugName)
- : GetPlugins<Firebird::IManagement>(IPluginManager::TYPE_AUTH_USER_MANAGEMENT, firebirdConf, plugName)
+ : GetPlugins<Firebird::IManagement>(IPluginManager::AuthUserManagement, firebirdConf, plugName)
{
if (!hasData())
{
Modified: firebird/trunk/src/common/unicode_util.cpp
===================================================================
--- firebird/trunk/src/common/unicode_util.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/common/unicode_util.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -1144,7 +1144,7 @@
}
}
- if (lastError.getState() & Firebird::IStatus::STATE_ERRORS)
+ if (lastError.getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
{
(Arg::Gds(isc_random) << "Could not find acceptable ICU library"
<< Arg::StatusVector(lastError.getErrors())).raise();
Modified: firebird/trunk/src/common/utils.cpp
===================================================================
--- firebird/trunk/src/common/utils.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/common/utils.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -1012,13 +1012,13 @@
FB_GUARDDIR, FB_PLUGDIR
};
- fb_assert(FB_NELEM(configDir) == Firebird::IConfigManager::DIR_COUNT);
- fb_assert(prefType < Firebird::IConfigManager::DIR_COUNT);
+ fb_assert(FB_NELEM(configDir) == Firebird::IConfigManager::FB_DIRCOUNT);
+ fb_assert(prefType < Firebird::IConfigManager::FB_DIRCOUNT);
if (! bootBuild())
{
- if (prefType != Firebird::IConfigManager::DIR_CONF &&
- prefType != Firebird::IConfigManager::DIR_MSG &&
+ if (prefType != Firebird::IConfigManager::FB_DIR_CONF &&
+ prefType != Firebird::IConfigManager::FB_DIR_MSG &&
configDir[prefType][0])
{
// Value is set explicitly and is not environment overridable
@@ -1029,8 +1029,8 @@
switch(prefType)
{
- case Firebird::IConfigManager::DIR_BIN:
- case Firebird::IConfigManager::DIR_SBIN:
+ case Firebird::IConfigManager::FB_DIR_BIN:
+ case Firebird::IConfigManager::FB_DIR_SBIN:
#ifdef WIN_NT
s = "";
#else
@@ -1038,14 +1038,14 @@
#endif
break;
- case Firebird::IConfigManager::DIR_CONF:
- case Firebird::IConfigManager::DIR_LOG:
- case Firebird::IConfigManager::DIR_GUARD:
- case Firebird::IConfigManager::DIR_SECDB:
+ case Firebird::IConfigManager::FB_DIR_CONF:
+ case Firebird::IConfigManager::FB_DIR_LOG:
+ case Firebird::IConfigManager::FB_DIR_GUARD:
+ case Firebird::IConfigManager::FB_DIR_SECDB:
s = "";
break;
- case Firebird::IConfigManager::DIR_LIB:
+ case Firebird::IConfigManager::FB_DIR_LIB:
#ifdef WIN_NT
s = "";
#else
@@ -1053,43 +1053,43 @@
#endif
break;
- case Firebird::IConfigManager::DIR_PLUGINS:
+ case Firebird::IConfigManager::FB_DIR_PLUGINS:
s = "plugins";
break;
- case Firebird::IConfigManager::DIR_INC:
+ case Firebird::IConfigManager::FB_DIR_INC:
s = "include";
break;
- case Firebird::IConfigManager::DIR_DOC:
+ case Firebird::IConfigManager::FB_DIR_DOC:
s = "doc";
break;
- case Firebird::IConfigManager::DIR_UDF:
+ case Firebird::IConfigManager::FB_DIR_UDF:
s = "UDF";
break;
- case Firebird::IConfigManager::DIR_SAMPLE:
+ case Firebird::IConfigManager::FB_DIR_SAMPLE:
s = "examples";
break;
- case Firebird::IConfigManager::DIR_SAMPLEDB:
+ case Firebird::IConfigManager::FB_DIR_SAMPLEDB:
s = "examples/empbuild";
break;
- case Firebird::IConfigManager::DIR_HELP:
+ case Firebird::IConfigManager::FB_DIR_HELP:
s = "help";
break;
- case Firebird::IConfigManager::DIR_INTL:
+ case Firebird::IConfigManager::FB_DIR_INTL:
s = "intl";
break;
- case Firebird::IConfigManager::DIR_MISC:
+ case Firebird::IConfigManager::FB_DIR_MISC:
s = "misc";
break;
- case Firebird::IConfigManager::DIR_MSG:
+ case Firebird::IConfigManager::FB_DIR_MSG:
gds__prefix_msg(tmp, name);
return tmp;
@@ -1137,9 +1137,9 @@
{
const ISC_STATUS* s;
unsigned int copied = 0;
- int state = from->getState();
+ int state = from->getStatus();
- if (state & Firebird::IStatus::STATE_ERRORS)
+ if (state & Firebird::IStatus::FB_HAS_ERRORS)
{
s = from->getErrors();
copied = copyStatus(to, space, s, statusLength(s));
@@ -1148,7 +1148,7 @@
space -= copied;
}
- if (state & Firebird::IStatus::STATE_WARNINGS)
+ if (state & Firebird::IStatus::FB_HAS_WARNINGS)
{
if (!copied)
{
Modified: firebird/trunk/src/dsql/DdlNodes.epp
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.epp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/dsql/DdlNodes.epp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -9841,7 +9841,7 @@
secDbContext->att->execute(&statusWrapper, secDbContext->tra, 0, ddl.c_str(), SQL_DIALECT_V6,
NULL, NULL, NULL, NULL);
- if (statusWrapper.getState() & IStatus::STATE_ERRORS)
+ if (statusWrapper.getStatus() & IStatus::FB_HAS_ERRORS)
{
try
{
@@ -9941,7 +9941,7 @@
}
catch (const Exception&)
{
- if (st.getState() & IStatus::STATE_ERRORS)
+ if (st.getStatus() & IStatus::FB_HAS_ERRORS)
{
const ISC_STATUS* stat2 = st.getErrors();
if (stat2[1] != isc_dsql_token_unk_err)
Modified: firebird/trunk/src/dsql/DsqlCursor.cpp
===================================================================
--- firebird/trunk/src/dsql/DsqlCursor.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/dsql/DsqlCursor.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -81,7 +81,7 @@
if (request->req_fetch_baseline)
{
TraceDSQLFetch trace(attachment, request);
- trace.fetch(true, ITracePlugin::RESULT_SUCCESS);
+ trace.fetch(true, ITracePlugin::TRACE_RESULT_SUCCESS);
}
if (request->req_traced && TraceManager::need_dsql_free(attachment))
Modified: firebird/trunk/src/dsql/ExprNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/ExprNodes.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/dsql/ExprNodes.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -10849,7 +10849,7 @@
catch (const Exception& ex)
{
const bool noPriv = (ex.stuff_exception(tdbb->tdbb_status_vector) == isc_no_priv);
- trace.finish(noPriv ? ITracePlugin::RESULT_UNAUTHORIZED : ITracePlugin::RESULT_FAILED);
+ trace.finish(noPriv ? ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED);
tdbb->setRequest(request);
EXE_unwind(tdbb, funcRequest);
@@ -10866,7 +10866,7 @@
if (*nullPtr)
{
request->req_flags |= req_null;
- trace.finish(ITracePlugin::RESULT_SUCCESS);
+ trace.finish(ITracePlugin::TRACE_RESULT_SUCCESS);
}
else
{
@@ -10876,7 +10876,7 @@
value->vlu_desc = *fmtDesc;
value->vlu_desc.dsc_address = outMsg + argOffset;
- trace.finish(ITracePlugin::RESULT_SUCCESS, &value->vlu_desc);
+ trace.finish(ITracePlugin::TRACE_RESULT_SUCCESS, &value->vlu_desc);
}
EXE_unwind(tdbb, funcRequest);
Modified: firebird/trunk/src/dsql/StmtNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/StmtNodes.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/dsql/StmtNodes.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -2862,7 +2862,7 @@
{
const bool noPriv = (ex.stuff_exception(tdbb->tdbb_status_vector) == isc_no_priv);
trace.finish(false,
- noPriv ? Firebird::ITracePlugin::RESULT_UNAUTHORIZED : ITracePlugin::RESULT_FAILED);
+ noPriv ? Firebird::ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED);
EXE_unwind(tdbb, procRequest);
procRequest->req_attachment = NULL;
@@ -2871,7 +2871,7 @@
}
// trace procedure execution finish
- trace.finish(false, ITracePlugin::RESULT_SUCCESS);
+ trace.finish(false, ITracePlugin::TRACE_RESULT_SUCCESS);
EXE_unwind(tdbb, procRequest);
procRequest->req_attachment = NULL;
Modified: firebird/trunk/src/dsql/dsql.cpp
===================================================================
--- firebird/trunk/src/dsql/dsql.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/dsql/dsql.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -278,14 +278,14 @@
if (eofReached)
{
- trace.fetch(true, ITracePlugin::RESULT_SUCCESS);
+ trace.fetch(true, ITracePlugin::TRACE_RESULT_SUCCESS);
return false;
}
map_in_out(this, true, message, delayedFormat, msgBuffer);
delayedFormat = NULL;
- trace.fetch(false, ITracePlugin::RESULT_SUCCESS);
+ trace.fetch(false, ITracePlugin::TRACE_RESULT_SUCCESS);
return true;
}
@@ -624,7 +624,7 @@
{
status = tdbb->tdbb_status_vector[1];
*traceResult = status == isc_no_priv ?
- ITracePlugin::RESULT_UNAUTHORIZED : ITracePlugin::RESULT_FAILED;
+ ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED;
}
// restore warnings (if there are any)
@@ -794,7 +794,7 @@
}
const bool have_cursor = reqTypeWithCursor(statement->getType()) && !singleton;
- trace.finish(have_cursor, ITracePlugin::RESULT_SUCCESS);
+ trace.finish(have_cursor, ITracePlugin::TRACE_RESULT_SUCCESS);
}
void DsqlDdlRequest::dsqlPass(thread_db* tdbb, DsqlCompilerScratch* scratch,
@@ -858,7 +858,7 @@
JRD_autocommit_ddl(tdbb, req_transaction);
- trace.finish(false, ITracePlugin::RESULT_SUCCESS);
+ trace.finish(false, ITracePlugin::TRACE_RESULT_SUCCESS);
}
// Rethrow an exception with isc_no_meta_update and prefix codes.
@@ -1270,7 +1270,7 @@
// raise error if one present
static void checkD(IStatus* st)
{
- if (st->getState() & IStatus::STATE_ERRORS)
+ if (st->getStatus() & IStatus::FB_HAS_ERRORS)
{
ERRD_post(Arg::StatusVector(st));
}
@@ -1405,7 +1405,7 @@
request->req_traced = true;
trace.setStatement(request);
- ntrace_result_t traceResult = ITracePlugin::RESULT_SUCCESS;
+ ntrace_result_t traceResult = ITracePlugin::TRACE_RESULT_SUCCESS;
try
{
request->dsqlPass(tdbb, scratch, &traceResult);
@@ -1421,7 +1421,7 @@
}
catch (const Firebird::Exception&)
{
- trace.prepare(ITracePlugin::RESULT_FAILED);
+ trace.prepare(ITracePlugin::TRACE_RESULT_FAILED);
if (request)
{
Modified: firebird/trunk/src/gpre/languages/ftn.cpp
===================================================================
--- firebird/trunk/src/gpre/languages/ftn.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/gpre/languages/ftn.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -1364,7 +1364,7 @@
{
Firebird::PathName include_buffer;
- include_buffer = fb_utils::getPrefix(Firebird::IConfigManager::DIR_INC, INCLUDE_FTN_FILE);
+ include_buffer = fb_utils::getPrefix(Firebird::IConfigManager::FB_DIR_INC, INCLUDE_FTN_FILE);
sprintf(output_buffer, INCLUDE_ISC_FTN, include_buffer.c_str());
FTN_print_buffer(output_buffer);
Modified: firebird/trunk/src/gpre/obj_cxx.cpp
===================================================================
--- firebird/trunk/src/gpre/obj_cxx.cpp 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/gpre/obj_cxx.cpp 2015-02-17 23:21:25 UTC (rev 60711)
@@ -159,7 +159,7 @@
static inline void success(const int column, bool ok, const char* status_name, const char* post = "")
{
- printa(column, "if (%s%s->getState() & Firebird::IStatus::STATE_ERRORS%s)%s",
+ printa(column, "if (%s%s->getStatus() & Firebird::IStatus::FB_HAS_ERRORS%s)%s",
ok ? "!(" : "", global_status_name, ok ? ")" : "", post);
}
@@ -991,7 +991,7 @@
static void gen_blob_for( const act* action, USHORT column)
{
PAT args;
- const TEXT* pattern1 = "%IFif (!(%S1->getState() & Firebird::IStatus::STATE_ERRORS)) {\n\
+ const TEXT* pattern1 = "%IFif (!(%S1->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)) {\n\
%ENwhile (1)\n\
{";
@@ -1001,8 +1001,8 @@
PATTERN_expand(column, pattern1, &args);
column += INDENT;
gen_get_segment(action, column);
- printa(column, "if (fbIStatus == Firebird::IStatus::ERROR || "
- "fbIStatus == Firebird::IStatus::NO_DATA) break;");
+ printa(column, "if (fbIStatus == Firebird::IStatus::FB_ERROR || "
+ "fbIStatus == Firebird::IStatus::FB_NO_DATA) break;");
}
@@ -2244,7 +2244,7 @@
{
if ((action->act_error || (action->act_flags & ACT_sql)) && db != gpreGlob.isc_databases)
{
- printa(column, "if (%s && !(%s->getState() & Firebird::IStatus::STATE_ERRORS)) ", db->dbb_name->sym_string, global_status_name);
+ printa(column, "if (%s && !(%s->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)) ", db->dbb_name->sym_string, global_status_name);
}
else
printa(column, "if (%s)", db->dbb_name->sym_string);
@@ -2277,7 +2277,7 @@
TEXT s[MAX_REF_SIZE];
if (action->act_error || (action->act_flags & ACT_sql))
- printa(column, "if (!%s || (%s->getState() & Firebird::IStatus::STATE_ERRORS)) break;",
+ printa(column, "if (!%s || (%s->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)) break;",
gen_name(s, request->req_eof, true), global_status_name);
else
printa(column, "if (!%s) break;", gen_name(s, request->req_eof, true));
@@ -2491,7 +2491,7 @@
{
const ref* into = action->act_object;
set_sqlcode(action, column);
- printa(column, "if (fbIStatus == Firebird::IStatus::OK || fbIStatus == Firebird::IStatus::SEGMENT)");
+ printa(column, "if (fbIStatus == Firebird::IStatus::FB_OK || fbIStatus == Firebird::IStatus::FB_SEGMENT)");
column += INDENT;
begin(column);
align(column);
@@ -3944,7 +3944,7 @@
align(column);
fprintf(gpreGlob.out_file, "if (!%s", db->dbb_name->sym_string);
if (stat && buffer[0])
- fprintf(gpreGlob.out_file, " && !(%s->getState() & Firebird::IStatus::STATE_ERRORS)", vector);
+ fprintf(gpreGlob.out_file, " && !(%s->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)", vector);
fprintf(gpreGlob.out_file, ")");
make_ready(db, filename, vector, (USHORT) (column + INDENT), 0);
if (buffer[0])
Modified: firebird/trunk/src/include/firebird/FirebirdInterface.idl
===================================================================
--- firebird/trunk/src/include/firebird/FirebirdInterface.idl 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/include/firebird/FirebirdInterface.idl 2015-02-17 23:21:25 UTC (rev 60711)
@@ -52,18 +52,18 @@
[exception]
interface Status : Disposable
{
- // flags in value returned by getState()
- const uint STATE_WARNINGS = 0x01;
- const uint STATE_ERRORS = 0x02;
+ // flags in value returned by status()
+ const uint FB_HAS_WARNINGS = 0x01;
+ const uint FB_HAS_ERRORS = 0x02;
// completion codes - not used in Status, but I must have them somewhere
- const int ERROR = -1;
- const int OK = 0;
- const int NO_DATA = 1;
- const int SEGMENT = 2;
+ const int FB_ERROR = -1;
+ const int FB_OK = 0;
+ const int FB_NO_DATA = 1;
+ const int FB_SEGMENT = 2;
void init();
- uint getState() const;
+ uint getStatus() const;
void setErrors2(uint length, const intptr* value);
void setWarnings2(uint length, const intptr* value);
@@ -217,17 +217,17 @@
interface PluginManager : Versioned
{
// Plugin types
- const uint TYPE_PROVIDER = 1;
- const uint TYPE_FIRST_NON_LIB = 2;
- const uint TYPE_AUTH_SERVER = 3;
- const uint TYPE_AUTH_CLIENT = 4;
- const uint TYPE_AUTH_USER_MANAGEMENT = 5;
- const uint TYPE_EXTERNAL_ENGINE = 6;
- const uint TYPE_TRACE = 7;
- const uint TYPE_WIRE_CRYPT = 8;
- const uint TYPE_DB_CRYPT = 9;
- const uint TYPE_KEY_HOLDER = 10;
- const uint TYPE_COUNT = 11; // keep in sync
+ const uint Provider = 1;
+ const uint FirstNonLibPlugin = 2;
+ const uint AuthServer = 3;
+ const uint AuthClient = 4;
+ const uint AuthUserManagement = 5;
+ const uint ExternalEngine = 6;
+ const uint Trace = 7;
+ const uint WireCrypt = 8;
+ const uint DbCrypt = 9;
+ const uint KeyHolder = 10;
+ const uint MaxType = 11; // keep in sync please
// Main function called by plugin modules in firebird_plugin()
void registerPluginFactory(uint pluginType, const string defaultName, PluginFactory factory);
@@ -272,24 +272,24 @@
interface ConfigManager : Versioned
{
// Codes for ConfigManager::getDirectory()
- const uint DIR_BIN = 0;
- const uint DIR_SBIN = 1;
- const uint DIR_CONF = 2;
- const uint DIR_LIB = 3;
- const uint DIR_INC = 4;
- const uint DIR_DOC = 5;
- const uint DIR_UDF = 6;
- const uint DIR_SAMPLE = 7;
- const uint DIR_SAMPLEDB = 8;
- const uint DIR_HELP = 9;
- const uint DIR_INTL = 10;
- const uint DIR_MISC = 11;
- const uint DIR_SECDB = 12;
- const uint DIR_MSG = 13;
- const uint DIR_LOG = 14;
- const uint DIR_GUARD = 15;
- const uint DIR_PLUGINS = 16;
- const uint DIR_COUNT = 17; // keep in sync
+ const uint FB_DIR_BIN = 0;
+ const uint FB_DIR_SBIN = 1;
+ const uint FB_DIR_CONF = 2;
+ const uint FB_DIR_LIB = 3;
+ const uint FB_DIR_INC = 4;
+ const uint FB_DIR_DOC = 5;
+ const uint FB_DIR_UDF = 6;
+ const uint FB_DIR_SAMPLE = 7;
+ const uint FB_DIR_SAMPLEDB = 8;
+ const uint FB_DIR_HELP = 9;
+ const uint FB_DIR_INTL = 10;
+ const uint FB_DIR_MISC = 11;
+ const uint FB_DIR_SECDB = 12;
+ const uint FB_DIR_MSG = 13;
+ const uint FB_DIR_LOG = 14;
+ const uint FB_DIR_GUARD = 15;
+ const uint FB_DIR_PLUGINS = 16;
+ const uint FB_DIRCOUNT = 17;
const string getDirectory(uint code);
FirebirdConf getFirebirdConf();
@@ -316,7 +316,7 @@
uint itemsLength, const uchar* items,
uint bufferLength, uchar* buffer);
- [notImplemented(Status::ERROR)]
+ [notImplemented(Status::FB_ERROR)]
int getSegment(Status status, uint bufferLength, void* buffer, uint* segmentLength);
void putSegment(Status status, uint length,
@@ -381,12 +381,12 @@
interface ResultSet : ReferenceCounted
{
- [notImplemented(Status::ERROR)] int fetchNext(Status status, void* message);
- [notImplemented(Status::ERROR)] int fetchPrior(Status status, void* message);
- [notImplemented(Status::ERROR)] int fetchFirst(Status status, void* message);
- [notImplemented(Status::ERROR)] int fetchLast(Status status, void* message);
- [notImplemented(Status::ERROR)] int fetchAbsolute(Status status, int position, void* message);
- [notImplemented(Status::ERROR)] int fetchRelative(Status status, int offset, void* message);
+ [notImplemented(Status::FB_ERROR)] int fetchNext(Status status, void* message);
+ [notImplemented(Status::FB_ERROR)] int fetchPrior(Status status, void* message);
+ [notImplemented(Status::FB_ERROR)] int fetchFirst(Status status, void* message);
+ [notImplemented(Status::FB_ERROR)] int fetchLast(Status status, void* message);
+ [notImplemented(Status::FB_ERROR)] int fetchAbsolute(Status status, int position, void* message);
+ [notImplemented(Status::FB_ERROR)] int fetchRelative(Status status, int offset, void* message);
boolean isEof(Status status);
boolean isBof(Status status);
MessageMetadata getMetadata(Status status);
@@ -924,8 +924,8 @@
interface TraceConnection : Versioned
{
- const uint KIND_DATABASE = 1;
- const uint KIND_SERVICE = 2;
+ const uint TRACE_CONNECTION_DATABASE = 1;
+ const uint TRACE_CONNECTION_SERVICE = 2;
uint getKind();
@@ -947,10 +947,10 @@
interface TraceTransaction : Versioned
{
- const uint ISOLATION_CONSISTENCY = 1;
- const uint ISOLATION_CONCURRENCY = 2;
- const uint ISOLATION_READ_COMMITTED_RECVER = 3;
- const uint ISOLATION_READ_COMMITTED_NORECVER = 4;
+ const uint TRA_ISO_CONSISTENCY = 1;
+ const uint TRA_ISO_CONCURRENCY = 2;
+ const uint TRA_ISO_READ_COMMITTED_RECVER = 3;
+ const uint TRA_ISO_READ_COMMITTED_NORECVER = 4;
uint getTransactionID();
boolean getReadOnly();
@@ -1018,14 +1018,10 @@
interface TraceTrigger : Versioned
{
- //// TODO: TYPE or WHICH? ExternalTrigger has similar constants.
- const uint TYPE_ALL = 0;
- const uint TYPE_BEFORE = 1;
- const uint TYPE_AFTER = 2;
- //// TODO: What about database triggers?
+ const uint TRACE_ALL = 0;
+ const uint TRACE_BEFORE = 1;
+ const uint TRACE_AFTER = 2;
- //// TODO: Action constants?
-
const string getTriggerName();
const string getRelationName();
int getAction();
@@ -1076,9 +1072,9 @@
// API of trace plugin. Used to deliver notifications for each database
interface TracePlugin : ReferenceCounted
{
- const uint RESULT_SUCCESS = 0;
- const uint RESULT_FAILED = 1;
- const uint RESULT_UNAUTHORIZED = 2;
+ const uint TRACE_RESULT_SUCCESS = 0;
+ const uint TRACE_RESULT_FAILED = 1;
+ const uint TRACE_RESULT_UNAUTHORIZED = 2;
// Function to return error string for hook failure
const string trace_get_error();
@@ -1191,27 +1187,27 @@
interface TraceFactory : PluginBase
{
// Known notifications
- const uint EVENT_ATTACH = 0;
- const uint EVENT_DETACH = 1;
- const uint EVENT_TRANSACTION_START = 2;
- const uint EVENT_TRANSACTION_END = 3;
- const uint EVENT_SET_CONTEXT = 4;
- const uint EVENT_PROC_EXECUTE = 5;
- const uint EVENT_TRIGGER_EXECUTE = 6;
- const uint EVENT_DSQL_PREPARE = 7;
- const uint EVENT_DSQL_FREE = 8;
- const uint EVENT_DSQL_EXECUTE = 9;
- const uint EVENT_BLR_COMPILE = 10;
- const uint EVENT_BLR_EXECUTE = 11;
- const uint EVENT_DYN_EXECUTE = 12;
- const uint EVENT_SERVICE_ATTACH = 13;
- const uint EVENT_SERVICE_START = 14;
- const uint EVENT_SERVICE_QUERY = 15;
- const uint EVENT_SERVICE_DETACH = 16;
- const uint EVENT_ERROR = 17;
- const uint EVENT_SWEEP = 18;
- const uint EVENT_FUNC_EXECUTE = 19;
- const uint EVENT_MAX = 20; // keep it last
+ const uint TRACE_EVENT_ATTACH = 0;
+ const uint TRACE_EVENT_DETACH = 1;
+ const uint TRACE_EVENT_TRANSACTION_START = 2;
+ const uint TRACE_EVENT_TRANSACTION_END = 3;
+ const uint TRACE_EVENT_SET_CONTEXT = 4;
+ const uint TRACE_EVENT_PROC_EXECUTE = 5;
+ const uint TRACE_EVENT_TRIGGER_EXECUTE = 6;
+ const uint TRACE_EVENT_DSQL_PREPARE = 7;
+ const uint TRACE_EVENT_DSQL_FREE = 8;
+ const uint TRACE_EVENT_DSQL_EXECUTE = 9;
+ const uint TRACE_EVENT_BLR_COMPILE = 10;
+ const uint TRACE_EVENT_BLR_EXECUTE = 11;
+ const uint TRACE_EVENT_DYN_EXECUTE = 12;
+ const uint TRACE_EVENT_SERVICE_ATTACH = 13;
+ const uint TRACE_EVENT_SERVICE_START = 14;
+ const uint TRACE_EVENT_SERVICE_QUERY = 15;
+ const uint TRACE_EVENT_SERVICE_DETACH = 16;
+ const uint TRACE_EVENT_ERROR = 17;
+ const uint TRACE_EVENT_SWEEP = 18;
+ const uint TRACE_EVENT_FUNC_EXECUTE = 19;
+ const uint TRACE_EVENT_MAX = 20; // keep it last
// What notifications does plugin need
uint64 trace_needs();
Modified: firebird/trunk/src/include/firebird/IdlFbInterfaces.h
===================================================================
--- firebird/trunk/src/include/firebird/IdlFbInterfaces.h 2015-02-17 19:16:35 UTC (rev 60710)
+++ firebird/trunk/src/include/firebird/IdlFbInterfaces.h 2015-02-17 23:21:25 UTC (rev 60711)
@@ -202,7 +202,7 @@
struct VTable : public IDisposable::VTable
{
void (CLOOP_CARG *init)(IStatus* self) throw();
- unsigned (CLOOP_CARG *getState)(const 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();
@@ -225,21 +225,21 @@
public:
static const unsigned VERSION = 3;
- static const unsigned STATE_WARNINGS = 1;
- static const unsigned STATE_ERRORS = 2;
- static const int ERROR = -1;
- static const int OK = 0;
- static const int NO_DATA = 1;
- static const int SEGMENT = 2;
+ static const unsigned FB_HAS_WARNINGS = 1;
+ static const unsigned FB_HAS_ERRORS = 2;
+ static const int FB_ERROR = -1;
+ static const int FB_OK = 0;
+ static const int FB_NO_DATA = 1;
+ static const int FB_SEGMENT = 2;
void init()
{
static_cast<VTable*>(this->cloopVTable)->init(this);
}
- unsigned getState() const
+ unsigned getStatus() const
{
- unsigned ret = static_cast<VTable*>(this->cloopVTable)->getState(this);
+ unsigned ret = static_cast<VTable*>(this->cloopVTable)->getStatus(this);
return ret;
}
@@ -763,17 +763,17 @@
public:
static const unsigned VERSION = 2;
- static const unsigned TYPE_PROVIDER = 1;
- static const unsigned TYPE_FIRST_NON_LIB = 2;
- static const unsigned TYPE_AUTH_SERVER = 3;
- static const unsigned TYPE_AUTH_CLIENT = 4;
- static const unsigned TYPE_AUTH_USER_MANAGEMENT = 5;
- static const unsigned TYPE_EXTERNAL_ENGINE = 6;
- static const unsigned TYPE_TRACE = 7;
- static const unsigned TYPE_WIRE_CRYPT = 8;
- static const unsigned TYPE_DB_CRYPT = 9;
- static const unsigned TYPE_KEY_HOLDER = 10;
- static const unsigned TYPE_COUNT = 11;
+ static const unsigned Provider = 1;
+ static const unsigned FirstNonLibPlugin = 2;
+ static const unsigned AuthServer = 3;
+ static const unsigned AuthClient = 4;
+ static const unsigned AuthUserManagement = 5;
+ static const unsigned ExternalEngine = 6;
+ static const unsigned Trace = 7;
+ static const unsigned WireCrypt = 8;
+ static const unsigned DbCrypt = 9;
+ static const unsigned KeyHolder = 10;
+ static const unsigned MaxType = 11;
void registerPluginFactory(unsigned pluginType, const char* defaultName, IPluginFactory* factory)
{
@@ -885,24 +885,24 @@
public:
static const unsigned VERSION = 2;
- static const unsigned DIR_BIN = 0;
- static const unsigned DIR_SBIN = 1;
- static const unsigned DIR_CONF = 2;
- static const unsigned DIR_LIB = 3;
- static const unsigned DIR_INC = 4;
- static const unsigned DIR_DOC = 5;
- static const unsigned DIR_UDF = 6;
- static const unsigned DIR_SAMPLE = 7;
- static const unsigned DIR_SAMPLEDB = 8;
- static const unsigned DIR_HELP = 9;
- static const unsigned DIR_INTL = 10;
- static const unsigned DIR_MISC = 11;
- static const unsigned DIR_SECDB = 12;
- static const unsigned DIR_MSG = 13;
- static const unsigned DIR_LOG = 14;
- static const unsigned DIR_GUARD = 15;
- static const unsigned DIR_PLUGINS = 16;
- static const unsigned DIR_COUNT = 17;
+ static const unsigned FB_DIR_BIN = 0;
+ static const unsigned FB_DIR_SBIN = 1;
+ static const unsigned FB_DIR_CONF = 2;
+ static const unsigned FB_DIR_LIB = 3;
+ static const unsigned FB_DIR_INC = 4;
+ static const unsigned FB_DIR_DOC = 5;
+ static const unsigned FB_DIR_UDF = 6;
+ static const unsigned FB_DIR_SAMPLE = 7;
+ static const unsigned FB_DIR_SAMPLEDB = 8;
+ static const unsigned FB_DIR_HELP = 9;
+ static const unsigned FB_DIR_INTL = 10;
+ static const unsigned FB_DIR_MISC = 11;
+ static const unsigned FB_DIR_SECDB = 12;
+ static const unsigned FB_DIR_MSG = 13;
+ static const unsigned FB_DIR_LOG = 14;
+ static const unsigned FB_DIR_GUARD = 15;
+ static const unsigned FB_DIR_PLUGINS = 16;
+ static const unsigned FB_DIRCOUNT = 17;
const char* getDirectory(unsigned code)
{
@@ -1513,6 +1513,7 @@
static const unsigned FLAG_REPEAT_EXECUTE = 2;
static const unsigned CURSOR_TYPE_SCROLLABLE = 1;
+
template <typename StatusType> void getInfo(StatusType* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer)
{
static_cast<VTable*>(this->cloopVTable)->getInfo(this, status, itemsLength, items, bufferLength, buffer);
@@ -3367,8 +3368,8 @@
public:
static const unsigned VERSION = 2;
- static const unsigned KIND_DATABASE = 1;
- static const unsigned KIND_SERVICE = 2;
+ static const unsigned TRACE_CONNECTION_DATABASE = 1;
+ static const unsigned TRACE_CONNECTION_SERVICE = 2;
unsigned getKind()
{
@@ -3485,10 +3486,10 @@
public:
static const unsigned VERSION = 2;
- static const unsigned ISOLATION_CONSISTENCY = 1;
- static const unsigned ISOLATION_CONCURRENCY = 2;
- static const unsigned ISOLATION_READ_COMMITTED_RECVER = 3;
- static const unsigned ISOLATION_READ_COMMITTED_NORECVER = 4;
+ static const unsigned TRA_ISO_CONSISTENCY = 1;
+ static const unsigned TRA_ISO_CONCURRENCY = 2;
+ static const unsigned TRA_ISO_READ_COMMITTED_RECVER = 3;
+ static const unsigned TRA_ISO_READ_COMMITTED_NORECVER = 4;
unsigned getTransactionID()
{
@@ -3889,9 +3890,9 @@
public:
static const unsigned VERSION = 2;
- static const unsigned TYPE_ALL = 0;
- static const unsigned TYPE_BEFORE = 1;
- static const unsigned TYPE_AFTER = 2;
+ static const unsigned TRACE_ALL = 0;
+ static const unsigned TRACE_BEFORE = 1;
+ static const unsigned TRACE_AFTER = 2;
const char* getTriggerName()
{
@@ -4210,9 +4211,9 @@
public:
static const unsigned VERSION = 3;
- static const unsigned RESULT_SUCCESS = 0;
- static const unsigned RESULT_FAILED = 1;
- static const unsigned RESULT_UNAUTHORIZED = 2;
+ static const unsigned TRACE_RESULT_SUCCESS = 0;
+ static const unsigned TRACE_RESULT_FAILED = 1;
+ static const unsigned TRACE_RESULT_UNAUTHORIZED = 2;
static const unsigned SWEEP_STATE_STARTED = 1;
static const unsigned SWEEP_STATE_FINISHED = 2;
static const unsigned SWEEP_STATE_FAILED = 3;
@@ -4367,27 +4368,27 @@
public:
static const unsigned VERSION = 4;
- static const unsigned EVENT_ATTACH = 0;
- static const unsigned EVENT_DETACH = 1;
- static const unsigned EVENT_TRANSACTION_START = 2;
- static const unsigned EVENT_TRANSACTION_END = 3;
- static const unsigned EVENT_SET_CONTEXT = 4;
- static const unsigned EVENT_PROC_EXECUTE = 5;
- static const unsigned EVENT_TRIGGER_EXECUTE = 6;
- static const unsigned EVENT_DSQL_PREPARE = 7;
- static const unsigned EVENT_DSQL_FREE = 8;
- static const unsigned EVENT_DSQL_EXECUTE = 9;
- static const unsigned EVENT_BLR_COMPILE = 10;
- static const unsigned EVENT_BLR_EXECUTE = 11;
- static const unsigned EVENT_DYN_EXECUTE = 12;
- static const unsigned EVENT_SERVICE_ATTACH = 13;
- static const unsigned EVENT_SERVICE_START = 14;
- static const unsigned EVENT_SERVICE_QUERY = 15;
- static const unsigned EVENT_SERVICE_DETACH = 16;
- static const unsigned EVENT_ERROR = 17;
- static const unsigned EVENT_SWEEP = 18;
- static const unsigned EVENT_FUNC_EXECUTE = 19;
- static const unsigned EVENT_MAX = 20;
+ static const unsigned TRACE_EVENT_ATTACH = 0;
+ static const unsigned TRACE_EVENT_DETACH = 1;
+ static const unsigned TRACE_EVENT_TRANSACTION_START = 2;
+ static const unsigned TRACE_EVENT_TRANSACTION_END = 3;
+ static const unsigned TRACE_EVENT_SET_CONTEXT = 4;
+ static const unsigned TRACE_EVENT_PROC_EXECUTE = 5;
+ static const unsigned TRACE_EVENT_TRIGGER_EXECUTE = 6;
+ static const unsigned TRACE_EVENT_DSQL_PREPARE = 7;
+ static const unsigned TRACE_EVENT_DSQL_FREE = 8;
+ static const unsigned TRACE_EVENT_DSQL_EXECUTE = 9;
+ static const unsigned TRACE_EVENT_BLR_COMPILE = 10;
+ static const unsigned TRACE_EVENT_BLR_EXECUTE = 11;
+ static const unsigne...
[truncated message content] |
|
From: <fir...@us...> - 2015-02-18 00:17:05
|
Revision: 60712
http://sourceforge.net/p/firebird/code/60712
Author: firebirds
Date: 2015-02-18 00:16:57 +0000 (Wed, 18 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-02-17 23:21:25 UTC (rev 60711)
+++ firebird/trunk/ChangeLog 2015-02-18 00:16:57 UTC (rev 60712)
@@ -1,3 +1,184 @@
+ 2015-02-17 23:21 asfernandes
+ M examples/dbcrypt/CryptApplication.cpp
+ M examples/dbcrypt/CryptKeyHolder.cpp
+ M examples/dbcrypt/DbCrypt.cpp
+ M src/auth/AuthDbg.cpp
+ M src/auth/SecureRemotePassword/Message.h
+ M src/auth/SecureRemotePassword/client/SrpClient.cpp
+ M src/auth/SecureRemotePassword/manage/SrpManagement.cpp
+ M src/auth/SecureRemotePassword/server/SrpServer.cpp
+ M src/auth/SecurityDatabase/LegacyClient.cpp
+ M src/auth/SecurityDatabase/LegacyManagement.epp
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+ M src/auth/trusted/AuthSspi.cpp
+ M src/common/IntlParametersBlock.cpp
+ M src/common/StatusArg.cpp
+ M src/common/StatusHolder.h
+ M src/common/call_service.cpp
+ M src/common/classes/ImplementHelper.h
+ M src/common/classes/MsgPrint.cpp
+ M src/common/config/config.cpp
+ M src/common/config/config_file.cpp
+ M src/common/db_alias.cpp
+ M src/common/os/win32/mod_loader.cpp
+ M src/common/security.cpp
+ M src/common/unicode_util.cpp
+ M src/common/utils.cpp
+ M src/dsql/DdlNodes.epp
+ M src/dsql/DsqlCursor.cpp
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/dsql.cpp
+ M src/gpre/languages/ftn.cpp
+ M src/gpre/obj_cxx.cpp
+ M src/include/firebird/FirebirdInterface.idl
+ M src/include/firebird/IdlFbInterfaces.h
+ M src/include/firebird/Interface.h
+ M src/include/firebird/UdrCppEngine.h
+ M src/isql/isql.epp
+ M src/isql/show.epp
+ M src/jrd/CryptoManager.cpp
+ M src/jrd/Database.cpp
+ M src/jrd/DbCreators.cpp
+ M src/jrd/ExtEngineManager.cpp
+ M src/jrd/IntlManager.cpp
+ M src/jrd/Mapping.cpp
+ M src/jrd/SysFunction.cpp
+ M src/jrd/UserManagement.cpp
+ M src/jrd/exe.cpp
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/fun.epp
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+ M src/jrd/recsrc/ProcedureScan.cpp
+ M src/jrd/svc.cpp
+ M src/jrd/tra.cpp
+ M src/jrd/trace/TraceDSQLHelpers.h
+ M src/jrd/trace/TraceJrdHelpers.h
+ M src/jrd/trace/TraceManager.cpp
+ M src/jrd/trace/TraceObjects.cpp
+ M src/plugins/crypt/arc4/Arc4.cpp
+ M src/plugins/udr_engine/UdrEngine.cpp
+ M src/qli/help.epp
+ M src/remote/client/interface.cpp
+ M src/remote/inet.cpp
+ M src/remote/os/win32/wnet.cpp
+ M src/remote/remote.cpp
+ M src/remote/server/os/posix/inet_server.cpp
+ M src/remote/server/os/win32/srvr_w32.cpp
+ M src/remote/server/server.cpp
+ M src/utilities/gsec/gsec.cpp
+ M src/utilities/guard/util.cpp
+ M src/utilities/ibmgr/srvrmgr.cpp
+ M src/utilities/ntrace/TracePluginImpl.cpp
+ M src/utilities/ntrace/traceplugin.cpp
+ M src/yvalve/DistributedTransaction.cpp
+ M src/yvalve/PluginManager.cpp
+ M src/yvalve/gds.cpp
+ M src/yvalve/perf.cpp
+ M src/yvalve/utl.cpp
+ M src/yvalve/why.cpp
+Revert my last change after it broke the Windows build.
+
+ 2015-02-17 14:56 asfernandes
+ M examples/dbcrypt/CryptApplication.cpp
+ M examples/dbcrypt/CryptKeyHolder.cpp
+ M examples/dbcrypt/DbCrypt.cpp
+ M src/auth/AuthDbg.cpp
+ M src/auth/SecureRemotePassword/Message.h
+ M src/auth/SecureRemotePassword/client/SrpClient.cpp
+ M src/auth/SecureRemotePassword/manage/SrpManagement.cpp
+ M src/auth/SecureRemotePassword/server/SrpServer.cpp
+ M src/auth/SecurityDatabase/LegacyClient.cpp
+ M src/auth/SecurityDatabase/LegacyManagement.epp
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+ M src/auth/trusted/AuthSspi.cpp
+ M src/common/IntlParametersBlock.cpp
+ M src/common/StatusArg.cpp
+ M src/common/StatusHolder.h
+ M src/common/call_service.cpp
+ M src/common/classes/ImplementHelper.h
+ M src/common/classes/MsgPrint.cpp
+ M src/common/config/config.cpp
+ M src/common/config/config_file.cpp
+ M src/common/db_alias.cpp
+ M src/common/os/win32/mod_loader.cpp
+ M src/common/security.cpp
+ M src/common/unicode_util.cpp
+ M src/common/utils.cpp
+ M src/dsql/DdlNodes.epp
+ M src/dsql/DsqlCursor.cpp
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/dsql.cpp
+ M src/gpre/languages/ftn.cpp
+ M src/gpre/obj_cxx.cpp
+ M src/include/firebird/FirebirdInterface.idl
+ M src/include/firebird/IdlFbInterfaces.h
+ M src/include/firebird/Interface.h
+ M src/include/firebird/UdrCppEngine.h
+ M src/isql/isql.epp
+ M src/isql/show.epp
+ M src/jrd/CryptoManager.cpp
+ M src/jrd/Database.cpp
+ M src/jrd/DbCreators.cpp
+ M src/jrd/ExtEngineManager.cpp
+ M src/jrd/IntlManager.cpp
+ M src/jrd/Mapping.cpp
+ M src/jrd/SysFunction.cpp
+ M src/jrd/UserManagement.cpp
+ M src/jrd/exe.cpp
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/fun.epp
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+ M src/jrd/recsrc/ProcedureScan.cpp
+ M src/jrd/svc.cpp
+ M src/jrd/tra.cpp
+ M src/jrd/trace/TraceDSQLHelpers.h
+ M src/jrd/trace/TraceJrdHelpers.h
+ M src/jrd/trace/TraceManager.cpp
+ M src/jrd/trace/TraceObjects.cpp
+ M src/plugins/crypt/arc4/Arc4.cpp
+ M src/plugins/udr_engine/UdrEngine.cpp
+ M src/qli/help.epp
+ M src/remote/client/interface.cpp
+ M src/remote/inet.cpp
+ M src/remote/os/win32/wnet.cpp
+ M src/remote/remote.cpp
+ M src/remote/server/os/posix/inet_server.cpp
+ M src/remote/server/os/win32/srvr_w32.cpp
+ M src/remote/server/server.cpp
+ M src/utilities/gsec/gsec.cpp
+ M src/utilities/guard/util.cpp
+ M src/utilities/ibmgr/srvrmgr.cpp
+ M src/utilities/ntrace/TracePluginImpl.cpp
+ M src/utilities/ntrace/traceplugin.cpp
+ M src/yvalve/DistributedTransaction.cpp
+ M src/yvalve/PluginManager.cpp
+ M src/yvalve/gds.cpp
+ M src/yvalve/perf.cpp
+ M src/yvalve/utl.cpp
+ M src/yvalve/why.cpp
+Better constant names: avoid FB, enclosing class (double prefix) or wrong prefixes.
+Left some TODOs in FirebirdInterface.idl and utilities/ntrace/TracePluginImpl.cpp related to trace.
+
+ 2015-02-17 14:13 alexpeshkoff
+ M src/msgs/facilities2.sql
+ M src/msgs/messages2.sql
+ M src/qli/dtr.cpp
+ M src/qli/dtr.h
+ M src/qli/lex.cpp
+ M src/qli/qliswi.h
+Minor enhancement - added switch to avoid hangs when running TCS
+
+ 2015-02-17 11:42 alexpeshkoff
+ M src/dsql/DsqlCursor.cpp
+ M src/dsql/DsqlCursor.h
+ M src/jrd/EngineInterface.h
+ M src/jrd/jrd.cpp
+Unlink JResultSet from DsqlCursor when cursor is closed due to end of transaction - this fixes AV in tcs/BLOB.0.DSQL
+
2015-02-16 13:57 hvlad
M src/jrd/Attachment.cpp
M src/jrd/Attachment.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-02-17 23:21:25 UTC (rev 60711)
+++ firebird/trunk/src/jrd/build_no.h 2015-02-18 00:16:57 UTC (rev 60712)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31651
+ FORMAL BUILD NUMBER:31655
*/
-#define PRODUCT_VER_STRING "3.0.0.31651"
-#define FILE_VER_STRING "WI-T3.0.0.31651"
-#define LICENSE_VER_STRING "WI-T3.0.0.31651"
-#define FILE_VER_NUMBER 3, 0, 0, 31651
+#define PRODUCT_VER_STRING "3.0.0.31655"
+#define FILE_VER_STRING "WI-T3.0.0.31655"
+#define LICENSE_VER_STRING "WI-T3.0.0.31655"
+#define FILE_VER_NUMBER 3, 0, 0, 31655
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31651"
+#define FB_BUILD_NO "31655"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-02-17 23:21:25 UTC (rev 60711)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-02-18 00:16:57 UTC (rev 60712)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31651
+BuildNum=31655
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <asf...@us...> - 2015-02-18 15:01:21
|
Revision: 60724
http://sourceforge.net/p/firebird/code/60724
Author: asfernandes
Date: 2015-02-18 15:01:17 +0000 (Wed, 18 Feb 2015)
Log Message:
-----------
Better constant names: avoid FB, enclosing class (double prefix) or wrong prefixes.
Left some TODOs in FirebirdInterface.idl and utilities/ntrace/TracePluginImpl.cpp related to trace.
(redo with fix for Windows build, and left another TODO comment in FirebirdInterface.idl)
Modified Paths:
--------------
firebird/trunk/examples/dbcrypt/CryptApplication.cpp
firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
firebird/trunk/examples/dbcrypt/DbCrypt.cpp
firebird/trunk/src/auth/AuthDbg.cpp
firebird/trunk/src/auth/SecureRemotePassword/Message.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.cpp
firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp
firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
firebird/trunk/src/auth/trusted/AuthSspi.cpp
firebird/trunk/src/common/IntlParametersBlock.cpp
firebird/trunk/src/common/StatusArg.cpp
firebird/trunk/src/common/StatusHolder.h
firebird/trunk/src/common/call_service.cpp
firebird/trunk/src/common/classes/ImplementHelper.h
firebird/trunk/src/common/classes/MsgPrint.cpp
firebird/trunk/src/common/config/config.cpp
firebird/trunk/src/common/config/config_file.cpp
firebird/trunk/src/common/db_alias.cpp
firebird/trunk/src/common/os/win32/mod_loader.cpp
firebird/trunk/src/common/security.cpp
firebird/trunk/src/common/unicode_util.cpp
firebird/trunk/src/common/utils.cpp
firebird/trunk/src/dsql/DdlNodes.epp
firebird/trunk/src/dsql/DsqlCursor.cpp
firebird/trunk/src/dsql/ExprNodes.cpp
firebird/trunk/src/dsql/StmtNodes.cpp
firebird/trunk/src/dsql/dsql.cpp
firebird/trunk/src/gpre/languages/ftn.cpp
firebird/trunk/src/gpre/obj_cxx.cpp
firebird/trunk/src/include/firebird/FirebirdInterface.idl
firebird/trunk/src/include/firebird/IdlFbInterfaces.h
firebird/trunk/src/include/firebird/Interface.h
firebird/trunk/src/include/firebird/UdrCppEngine.h
firebird/trunk/src/isql/isql.epp
firebird/trunk/src/isql/show.epp
firebird/trunk/src/jrd/CryptoManager.cpp
firebird/trunk/src/jrd/Database.cpp
firebird/trunk/src/jrd/DbCreators.cpp
firebird/trunk/src/jrd/ExtEngineManager.cpp
firebird/trunk/src/jrd/IntlManager.cpp
firebird/trunk/src/jrd/Mapping.cpp
firebird/trunk/src/jrd/UserManagement.cpp
firebird/trunk/src/jrd/exe.cpp
firebird/trunk/src/jrd/extds/InternalDS.cpp
firebird/trunk/src/jrd/fun.epp
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/jrd.h
firebird/trunk/src/jrd/recsrc/ProcedureScan.cpp
firebird/trunk/src/jrd/svc.cpp
firebird/trunk/src/jrd/tra.cpp
firebird/trunk/src/jrd/trace/TraceDSQLHelpers.h
firebird/trunk/src/jrd/trace/TraceJrdHelpers.h
firebird/trunk/src/jrd/trace/TraceManager.cpp
firebird/trunk/src/jrd/trace/TraceObjects.cpp
firebird/trunk/src/plugins/crypt/arc4/Arc4.cpp
firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
firebird/trunk/src/qli/help.epp
firebird/trunk/src/remote/client/interface.cpp
firebird/trunk/src/remote/inet.cpp
firebird/trunk/src/remote/os/win32/wnet.cpp
firebird/trunk/src/remote/remote.cpp
firebird/trunk/src/remote/server/os/posix/inet_server.cpp
firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp
firebird/trunk/src/remote/server/server.cpp
firebird/trunk/src/utilities/gsec/gsec.cpp
firebird/trunk/src/utilities/guard/util.cpp
firebird/trunk/src/utilities/ibmgr/srvrmgr.cpp
firebird/trunk/src/utilities/ntrace/TracePluginImpl.cpp
firebird/trunk/src/utilities/ntrace/traceplugin.cpp
firebird/trunk/src/yvalve/DistributedTransaction.cpp
firebird/trunk/src/yvalve/PluginManager.cpp
firebird/trunk/src/yvalve/gds.cpp
firebird/trunk/src/yvalve/perf.cpp
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 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/examples/dbcrypt/CryptApplication.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -67,7 +67,7 @@
if (tra)
{
tra->rollback(status);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
print("rollback");
tra->release();
@@ -76,7 +76,7 @@
if (att)
{
att->detach(status);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
print("detach");
att->release();
@@ -98,19 +98,19 @@
p = master->getDispatcher();
p->setDbCryptCallback(status, &key);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
throw "setDbCryptCallback";
char s[256];
sprintf(s, "localhost:%s", dbName);
att = p->attachDatabase(status, s, 0, NULL);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
throw "attachDatabase";
if (a != NONE)
{
tra = att->startTransaction(status, 0, NULL);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
throw "startTransaction";
}
@@ -118,20 +118,20 @@
{
att->execute(status, tra, 0,
"ALTER DATABASE ENCRYPT WITH \"DbCrypt_example\"", 3, NULL, NULL, NULL, NULL);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
throw "execute";
}
if (a == DEC)
{
att->execute(status, tra, 0, "ALTER DATABASE DECRYPT", 3, NULL, NULL, NULL, NULL);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
throw "execute";
}
if (tra)
{
tra->commit(status);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
throw "commit";
tra = NULL;
}
@@ -140,7 +140,7 @@
getchar();
att->detach(status);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
throw "detach";
att = NULL;
Modified: firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -196,12 +196,12 @@
return 1;
IConfig* def = config->getDefaultConfig(status);
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
return 1;
IConfigEntry* confEntry = def->find(status, "Auto");
def->release();
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
return 1;
if (confEntry)
@@ -269,6 +269,6 @@
pluginManager = master->getPluginManager();
module.registerMe();
- pluginManager->registerPluginFactory(IPluginManager::KeyHolder, "CryptKeyHolder_example",
+ pluginManager->registerPluginFactory(IPluginManager::TYPE_KEY_HOLDER, "CryptKeyHolder_example",
&factory);
}
Modified: firebird/trunk/examples/dbcrypt/DbCrypt.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -194,11 +194,11 @@
return;
IConfig* def = config->getDefaultConfig(status);
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
return;
IConfigEntry* confEntry = def->find(status, "Auto");
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
{
def->release();
return;
@@ -231,7 +231,7 @@
for (unsigned n = 0; n < length; ++n)
{
ICryptKeyCallback* callback = sources[n]->keyHandle(status, "sample");
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
return;
if (callback && callback->callback(0, NULL, 1, &key) == 1)
@@ -277,5 +277,5 @@
pluginManager = master->getPluginManager();
module.registerMe();
- pluginManager->registerPluginFactory(IPluginManager::DbCrypt, "DbCrypt_example", &factory);
+ pluginManager->registerPluginFactory(IPluginManager::TYPE_DB_CRYPT, "DbCrypt_example", &factory);
}
Modified: firebird/trunk/src/auth/AuthDbg.cpp
===================================================================
--- firebird/trunk/src/auth/AuthDbg.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/auth/AuthDbg.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -46,8 +46,8 @@
Firebird::PluginManagerInterfacePtr iPlugin;
- iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthClient, name, &clientFactory);
- iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthServer, name, &serverFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_CLIENT, name, &clientFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_SERVER, name, &serverFactory);
}
@@ -84,7 +84,7 @@
fprintf(stderr, "DebugServer::authenticate1: %s\n", str.c_str());
#endif
sb->putData(status, str.length(), str.c_str());
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
@@ -165,7 +165,7 @@
fprintf(stderr, "DebugClient::authenticate: sending %s\n", str.c_str());
#endif
cb->putData(status, str.length(), str.c_str());
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
Modified: firebird/trunk/src/auth/SecureRemotePassword/Message.h
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/Message.h 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/auth/SecureRemotePassword/Message.h 2015-02-18 15:01:17 UTC (rev 60724)
@@ -28,7 +28,7 @@
{
Firebird::LocalStatus st;
Firebird::IMessageMetadata* m = out ? stmt->getOutputMetadata(&st) : stmt->getInputMetadata(&st);
- if (st.getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (st.getState() & Firebird::IStatus::STATE_ERRORS)
{
Firebird::status_exception::raise(&st);
}
@@ -175,7 +175,7 @@
static void check(Firebird::IStatus* status)
{
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
{
#ifdef INTERNAL_FIREBIRD
Firebird::status_exception::raise(status);
Modified: firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -80,7 +80,7 @@
client->genClientKey(data);
dumpIt("Clnt: clientPubKey", data);
cb->putData(status, data.length(), data.begin());
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
return AUTH_FAILED;
return AUTH_MORE_DATA;
}
@@ -132,19 +132,19 @@
cProof.getText(data);
cb->putData(status, data.length(), data.c_str());
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
// output the key
ICryptKey* cKey = cb->newKey(status);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
cKey->setSymmetric(status, "Symmetric", sessionKey.getCount(), sessionKey.begin());
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
@@ -175,7 +175,7 @@
void registerSrpClient(IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(IPluginManager::AuthClient, RemotePassword::plugName, &factory);
+ iPlugin->registerPluginFactory(IPluginManager::TYPE_AUTH_CLIENT, RemotePassword::plugName, &factory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -164,7 +164,7 @@
selGrantor.c_str(), SQL_DIALECT_V6, NULL, NULL, out.getMetadata(), NULL, 0);
check(&statusWrapper);
- bool hasGrant = curs->fetchNext(&statusWrapper, out.getBuffer()) == Firebird::IStatus::FB_OK;
+ bool hasGrant = curs->fetchNext(&statusWrapper, out.getBuffer()) == Firebird::IStatus::RESULT_OK;
curs->close(&statusWrapper);
check(&statusWrapper);
@@ -301,7 +301,7 @@
for (unsigned repeat = 0; ; ++repeat)
{
stmt = att->prepare(status, tra, 0, insert, SQL_DIALECT_V6, Firebird::IStatement::PREPARE_PREFETCH_METADATA);
- if (!(status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS))
+ if (!(status->getState() & Firebird::IStatus::STATE_ERRORS))
{
break;
}
@@ -566,7 +566,7 @@
(par ? par->getBuffer() : NULL), om, 0);
check(status);
- while (rs->fetchNext(status, di.getBuffer()) == Firebird::IStatus::FB_OK)
+ while (rs->fetchNext(status, di.getBuffer()) == Firebird::IStatus::RESULT_OK)
{
listField(user->userName(), login);
listField(user->firstName(), first);
@@ -617,7 +617,7 @@
if (tra)
{
tra->commit(status);
- if (!(status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS))
+ if (!(status->getState() & Firebird::IStatus::STATE_ERRORS))
{
tra = NULL;
}
@@ -629,7 +629,7 @@
if (tra)
{
tra->rollback(status);
- if (!(status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS))
+ if (!(status->getState() & Firebird::IStatus::STATE_ERRORS))
{
tra = NULL;
}
@@ -646,7 +646,7 @@
if (att)
{
att->detach(&statusWrapper);
- if (!(status.getStatus() & Firebird::IStatus::FB_HAS_ERRORS))
+ if (!(status.getState() & Firebird::IStatus::STATE_ERRORS))
{
att = NULL;
}
@@ -695,7 +695,7 @@
static void check(Firebird::CheckStatusWrapper* status)
{
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
{
checkStatusVectorForMissingTable(status->getErrors());
Firebird::status_exception::raise(status);
@@ -853,7 +853,7 @@
{
int cc = blob->getSegment(&statusWrapper, sizeof(segbuf), segbuf, &len);
check(&statusWrapper);
- if (cc == Firebird::IStatus::FB_NO_DATA)
+ if (cc == Firebird::IStatus::RESULT_NO_DATA)
break;
s.append(segbuf, len);
}
@@ -908,6 +908,6 @@
extern "C" void FB_EXPORTED FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
{
Firebird::CachedMasterInterface::set(master);
- Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::IPluginManager::AuthUserManagement, Auth::RemotePassword::plugName, &Auth::factory);
+ Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_USER_MANAGEMENT, Auth::RemotePassword::plugName, &Auth::factory);
Firebird::getUnloadDetector()->registerMe();
}
Modified: firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -154,7 +154,7 @@
const char* sql =
"SELECT PLG$VERIFIER, PLG$SALT FROM PLG$SRP WHERE PLG$USER_NAME = ? AND PLG$ACTIVE";
stmt = att->prepare(status, tra, 0, sql, 3, IStatement::PREPARE_PREFETCH_METADATA);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
checkStatusVectorForMissingTable(status->getErrors());
status_exception::raise(status);
@@ -223,7 +223,7 @@
dumpIt("Srv: serverPubKey", serverPubKey);
dumpBin("Srv: data", data);
sb->putData(status, data.length(), data.c_str());
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
@@ -233,12 +233,12 @@
// output the key
ICryptKey* cKey = sb->newKey(status);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
cKey->setSymmetric(status, "Symmetric", sessionKey.getCount(), sessionKey.begin());
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
@@ -256,12 +256,12 @@
if (clientProof == serverProof)
{
writerInterface->add(status, account.c_str());
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
writerInterface->setDb(status, secDbName);
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
@@ -294,7 +294,7 @@
void registerSrpServer(IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(IPluginManager::AuthServer, RemotePassword::plugName, &factory);
+ iPlugin->registerPluginFactory(IPluginManager::TYPE_AUTH_SERVER, RemotePassword::plugName, &factory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -46,7 +46,7 @@
TEXT pwt[MAX_LEGACY_PASSWORD_LENGTH + 2];
ENC_crypt(pwt, sizeof pwt, cb->getPassword(), LEGACY_PASSWORD_SALT);
cb->putData(status, static_cast<unsigned>(strlen(&pwt[2])), &pwt[2]);
- if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (status->getState() & Firebird::IStatus::STATE_ERRORS)
{
return AUTH_FAILED;
}
@@ -70,7 +70,7 @@
void registerLegacyClient(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthClient, "Legacy_Auth", &factory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_CLIENT, "Legacy_Auth", &factory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -765,6 +765,6 @@
extern "C" void FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
{
Firebird::CachedMasterInterface::set(master);
- Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::IPluginManager::AuthUserManagement, "Legacy_UserManager", &factory);
+ Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_USER_MANAGEMENT, "Legacy_UserManager", &factory);
Firebird::getUnloadDetector()->registerMe();
}
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -528,7 +528,7 @@
#ifdef USE_ATT_RQ_CACHE
LocalStatus s;
TimerInterfacePtr()->start(&s, instance, 10 * 1000 * 1000);
- if (s.getStatus() & IStatus::FB_HAS_ERRORS)
+ if (s.getState() & IStatus::STATE_ERRORS)
instance->handler();
#else
instance->handler();
@@ -563,7 +563,7 @@
void registerLegacyServer(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthServer, "Legacy_Auth", &factory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_SERVER, "Legacy_Auth", &factory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/trusted/AuthSspi.cpp
===================================================================
--- firebird/trunk/src/auth/trusted/AuthSspi.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/auth/trusted/AuthSspi.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -440,12 +440,12 @@
void registerTrustedClient(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthClient, plugName, &clientFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_CLIENT, plugName, &clientFactory);
}
void registerTrustedServer(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthServer, plugName, &serverFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_SERVER, plugName, &serverFactory);
}
} // namespace Auth
Modified: firebird/trunk/src/common/IntlParametersBlock.cpp
===================================================================
--- firebird/trunk/src/common/IntlParametersBlock.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/common/IntlParametersBlock.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -163,7 +163,7 @@
{
LocalStatus l;
st.stuffException(&l);
- if ((l.getStatus() & IStatus::FB_HAS_ERRORS) && (l.getErrors()[1] == isc_bad_conn_str) && tagName)
+ if ((l.getState() & IStatus::STATE_ERRORS) && (l.getErrors()[1] == isc_bad_conn_str) && tagName)
{
Arg::Gds newErrors(isc_random);
string message("Bad international character in tag ");
Modified: firebird/trunk/src/common/StatusArg.cpp
===================================================================
--- firebird/trunk/src/common/StatusArg.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/common/StatusArg.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -77,10 +77,10 @@
clear();
- if (s->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (s->getState() & IStatus::STATE_ERRORS)
append(s->getErrors(), FB_NELEM(m_status_vector) - 1);
- if (s->getStatus() & IStatus::FB_HAS_WARNINGS)
+ if (s->getState() & IStatus::STATE_WARNINGS)
append(s->getWarnings(), FB_NELEM(m_status_vector) - 1);
}
Modified: firebird/trunk/src/common/StatusHolder.h
===================================================================
--- firebird/trunk/src/common/StatusHolder.h 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/common/StatusHolder.h 2015-02-18 15:01:17 UTC (rev 60724)
@@ -77,10 +77,10 @@
return warnings.get();
}
- unsigned getStatus() const
+ unsigned getState() const
{
- return (errors.vector[1] ? IStatus::FB_HAS_ERRORS : 0) |
- (warnings.vector[1] ? IStatus::FB_HAS_WARNINGS : 0);
+ return (errors.vector[1] ? IStatus::STATE_ERRORS : 0) |
+ (warnings.vector[1] ? IStatus::STATE_WARNINGS : 0);
}
IStatus* clone() const
Modified: firebird/trunk/src/common/call_service.cpp
===================================================================
--- firebird/trunk/src/common/call_service.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/common/call_service.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -335,7 +335,7 @@
setAttr(attr, "Uid", &u->u);
setAttr(attr, "Gid", &u->g);
u->attributes()->set(status, attr.c_str());
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
return;
u->attributes()->setEntered(status, attr.hasData());
}
Modified: firebird/trunk/src/common/classes/ImplementHelper.h
===================================================================
--- firebird/trunk/src/common/classes/ImplementHelper.h 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/common/classes/ImplementHelper.h 2015-02-18 15:01:17 UTC (rev 60724)
@@ -322,7 +322,7 @@
// Generic status checker
inline void check(IStatus* status)
{
- if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (status->getState() & IStatus::STATE_ERRORS)
{
status_exception::raise(status);
}
Modified: firebird/trunk/src/common/classes/MsgPrint.cpp
===================================================================
--- firebird/trunk/src/common/classes/MsgPrint.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/common/classes/MsgPrint.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -385,7 +385,7 @@
else if (n == -2)
{
s += "message file ";
- s += fb_utils::getPrefix(Firebird::IConfigManager::FB_DIR_MSG, MSG_FILE).ToString();
+ s += fb_utils::getPrefix(Firebird::IConfigManager::DIR_MSG, MSG_FILE).ToString();
s += " not found";
}
else
Modified: firebird/trunk/src/common/config/config.cpp
===================================================================
--- firebird/trunk/src/common/config/config.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/common/config/config.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -51,7 +51,7 @@
{
try
{
- ConfigFile file(fb_utils::getPrefix(Firebird::IConfigManager::FB_DIR_CONF, CONFIG_FILE),
+ ConfigFile file(fb_utils::getPrefix(Firebird::IConfigManager::DIR_CONF, CONFIG_FILE),
ConfigFile::ERROR_WHEN_MISS);
defaultConfig = new Config(file);
}
@@ -692,19 +692,19 @@
{
switch (type)
{
- case Firebird::IPluginManager::Provider:
+ case Firebird::IPluginManager::TYPE_PROVIDER:
return (const char*) values[KEY_PLUG_PROVIDERS];
- case Firebird::IPluginManager::AuthServer:
+ case Firebird::IPluginManager::TYPE_AUTH_SERVER:
return (const char*) values[KEY_PLUG_AUTH_SERVER];
- case Firebird::IPluginManager::AuthClient:
+ case Firebird::IPluginManager::TYPE_AUTH_CLIENT:
return (const char*) values[KEY_PLUG_AUTH_CLIENT];
- case Firebird::IPluginManager::AuthUserManagement:
+ case Firebird::IPluginManager::TYPE_AUTH_USER_MANAGEMENT:
return (const char*) values[KEY_PLUG_AUTH_MANAGE];
- case Firebird::IPluginManager::Trace:
+ case Firebird::IPluginManager::TYPE_TRACE:
return (const char*) values[KEY_PLUG_TRACE];
- case Firebird::IPluginManager::WireCrypt:
+ case Firebird::IPluginManager::TYPE_WIRE_CRYPT:
return (const char*) values[KEY_PLUG_WIRE_CRYPT];
- case Firebird::IPluginManager::KeyHolder:
+ case Firebird::IPluginManager::TYPE_KEY_HOLDER:
return (const char*) values[KEY_PLUG_KEY_HOLDER];
}
Modified: firebird/trunk/src/common/config/config_file.cpp
===================================================================
--- firebird/trunk/src/common/config/config_file.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/common/config/config_file.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -503,17 +503,17 @@
unsigned code;
const char* name;
} dirs[] = {
-#define NMDIR(a) {Firebird::IConfigManager::a, #a},
- NMDIR(FB_DIR_CONF)
- NMDIR(FB_DIR_SECDB)
- NMDIR(FB_DIR_PLUGINS)
- NMDIR(FB_DIR_UDF)
- NMDIR(FB_DIR_SAMPLE)
- NMDIR(FB_DIR_SAMPLEDB)
- NMDIR(FB_DIR_INTL)
- NMDIR(FB_DIR_MSG)
+#define NMDIR(a) {Firebird::IConfigManager::a, "FB_"#a},
+ NMDIR(DIR_CONF)
+ NMDIR(DIR_SECDB)
+ NMDIR(DIR_PLUGINS)
+ NMDIR(DIR_UDF)
+ NMDIR(DIR_SAMPLE)
+ NMDIR(DIR_SAMPLEDB)
+ NMDIR(DIR_INTL)
+ NMDIR(DIR_MSG)
#undef NMDIR
- {Firebird::IConfigManager::FB_DIRCOUNT, NULL}
+ {Firebird::IConfigManager::DIR_COUNT, NULL}
};
for (const Dir* d = dirs; d->name; ++d)
Modified: firebird/trunk/src/common/db_alias.cpp
===================================================================
--- firebird/trunk/src/common/db_alias.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/common/db_alias.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -260,7 +260,7 @@
{
public:
explicit AliasesConf(MemoryPool& p)
- : ConfigCache(p, fb_utils::getPrefix(Firebird::IConfigManager::FB_DIR_CONF, ALIAS_FILE)),
+ : ConfigCache(p, fb_utils::getPrefix(Firebird::IConfigManager::DIR_CONF, ALIAS_FILE)),
databases(getPool()), aliases(getPool())
#ifdef HAVE_ID_BY_NAME
, ids(getPool())
Modified: firebird/trunk/src/common/os/win32/mod_loader.cpp
===================================================================
--- firebird/trunk/src/common/os/win32/mod_loader.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/common/os/win32/mod_loader.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -201,7 +201,7 @@
if (PathUtils::isRelative(modPath))
{
MasterInterfacePtr master;
- const char* baseDir = master->getConfigManager()->getDirectory(IConfigManager::FB_DIR_BIN);
+ const char* baseDir = master->getConfigManager()->getDirectory(IConfigManager::DIR_BIN);
PathName fullName;
PathUtils::concatPath(fullName, baseDir, modPath);
Modified: firebird/trunk/src/common/security.cpp
===================================================================
--- firebird/trunk/src/common/security.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/common/security.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -42,7 +42,7 @@
namespace Auth {
Get::Get(Config* firebirdConf)
- : GetPlugins<Firebird::IManagement>(IPluginManager::AuthUserManagement, firebirdConf)
+ : GetPlugins<Firebird::IManagement>(IPluginManager::TYPE_AUTH_USER_MANAGEMENT, firebirdConf)
{
if (!hasData())
{
@@ -51,7 +51,7 @@
}
Get::Get(Config* firebirdConf, const char* plugName)
- : GetPlugins<Firebird::IManagement>(IPluginManager::AuthUserManagement, firebirdConf, plugName)
+ : GetPlugins<Firebird::IManagement>(IPluginManager::TYPE_AUTH_USER_MANAGEMENT, firebirdConf, plugName)
{
if (!hasData())
{
Modified: firebird/trunk/src/common/unicode_util.cpp
===================================================================
--- firebird/trunk/src/common/unicode_util.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/common/unicode_util.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -1144,7 +1144,7 @@
}
}
- if (lastError.getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
+ if (lastError.getState() & Firebird::IStatus::STATE_ERRORS)
{
(Arg::Gds(isc_random) << "Could not find acceptable ICU library"
<< Arg::StatusVector(lastError.getErrors())).raise();
Modified: firebird/trunk/src/common/utils.cpp
===================================================================
--- firebird/trunk/src/common/utils.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/common/utils.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -1012,13 +1012,13 @@
FB_GUARDDIR, FB_PLUGDIR
};
- fb_assert(FB_NELEM(configDir) == Firebird::IConfigManager::FB_DIRCOUNT);
- fb_assert(prefType < Firebird::IConfigManager::FB_DIRCOUNT);
+ fb_assert(FB_NELEM(configDir) == Firebird::IConfigManager::DIR_COUNT);
+ fb_assert(prefType < Firebird::IConfigManager::DIR_COUNT);
if (! bootBuild())
{
- if (prefType != Firebird::IConfigManager::FB_DIR_CONF &&
- prefType != Firebird::IConfigManager::FB_DIR_MSG &&
+ if (prefType != Firebird::IConfigManager::DIR_CONF &&
+ prefType != Firebird::IConfigManager::DIR_MSG &&
configDir[prefType][0])
{
// Value is set explicitly and is not environment overridable
@@ -1029,8 +1029,8 @@
switch(prefType)
{
- case Firebird::IConfigManager::FB_DIR_BIN:
- case Firebird::IConfigManager::FB_DIR_SBIN:
+ case Firebird::IConfigManager::DIR_BIN:
+ case Firebird::IConfigManager::DIR_SBIN:
#ifdef WIN_NT
s = "";
#else
@@ -1038,14 +1038,14 @@
#endif
break;
- case Firebird::IConfigManager::FB_DIR_CONF:
- case Firebird::IConfigManager::FB_DIR_LOG:
- case Firebird::IConfigManager::FB_DIR_GUARD:
- case Firebird::IConfigManager::FB_DIR_SECDB:
+ case Firebird::IConfigManager::DIR_CONF:
+ case Firebird::IConfigManager::DIR_LOG:
+ case Firebird::IConfigManager::DIR_GUARD:
+ case Firebird::IConfigManager::DIR_SECDB:
s = "";
break;
- case Firebird::IConfigManager::FB_DIR_LIB:
+ case Firebird::IConfigManager::DIR_LIB:
#ifdef WIN_NT
s = "";
#else
@@ -1053,43 +1053,43 @@
#endif
break;
- case Firebird::IConfigManager::FB_DIR_PLUGINS:
+ case Firebird::IConfigManager::DIR_PLUGINS:
s = "plugins";
break;
- case Firebird::IConfigManager::FB_DIR_INC:
+ case Firebird::IConfigManager::DIR_INC:
s = "include";
break;
- case Firebird::IConfigManager::FB_DIR_DOC:
+ case Firebird::IConfigManager::DIR_DOC:
s = "doc";
break;
- case Firebird::IConfigManager::FB_DIR_UDF:
+ case Firebird::IConfigManager::DIR_UDF:
s = "UDF";
break;
- case Firebird::IConfigManager::FB_DIR_SAMPLE:
+ case Firebird::IConfigManager::DIR_SAMPLE:
s = "examples";
break;
- case Firebird::IConfigManager::FB_DIR_SAMPLEDB:
+ case Firebird::IConfigManager::DIR_SAMPLEDB:
s = "examples/empbuild";
break;
- case Firebird::IConfigManager::FB_DIR_HELP:
+ case Firebird::IConfigManager::DIR_HELP:
s = "help";
break;
- case Firebird::IConfigManager::FB_DIR_INTL:
+ case Firebird::IConfigManager::DIR_INTL:
s = "intl";
break;
- case Firebird::IConfigManager::FB_DIR_MISC:
+ case Firebird::IConfigManager::DIR_MISC:
s = "misc";
break;
- case Firebird::IConfigManager::FB_DIR_MSG:
+ case Firebird::IConfigManager::DIR_MSG:
gds__prefix_msg(tmp, name);
return tmp;
@@ -1137,9 +1137,9 @@
{
const ISC_STATUS* s;
unsigned int copied = 0;
- int state = from->getStatus();
+ int state = from->getState();
- if (state & Firebird::IStatus::FB_HAS_ERRORS)
+ if (state & Firebird::IStatus::STATE_ERRORS)
{
s = from->getErrors();
copied = copyStatus(to, space, s, statusLength(s));
@@ -1148,7 +1148,7 @@
space -= copied;
}
- if (state & Firebird::IStatus::FB_HAS_WARNINGS)
+ if (state & Firebird::IStatus::STATE_WARNINGS)
{
if (!copied)
{
Modified: firebird/trunk/src/dsql/DdlNodes.epp
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.epp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/dsql/DdlNodes.epp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -9841,7 +9841,7 @@
secDbContext->att->execute(&statusWrapper, secDbContext->tra, 0, ddl.c_str(), SQL_DIALECT_V6,
NULL, NULL, NULL, NULL);
- if (statusWrapper.getStatus() & IStatus::FB_HAS_ERRORS)
+ if (statusWrapper.getState() & IStatus::STATE_ERRORS)
{
try
{
@@ -9941,7 +9941,7 @@
}
catch (const Exception&)
{
- if (st.getStatus() & IStatus::FB_HAS_ERRORS)
+ if (st.getState() & IStatus::STATE_ERRORS)
{
const ISC_STATUS* stat2 = st.getErrors();
if (stat2[1] != isc_dsql_token_unk_err)
Modified: firebird/trunk/src/dsql/DsqlCursor.cpp
===================================================================
--- firebird/trunk/src/dsql/DsqlCursor.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/dsql/DsqlCursor.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -81,7 +81,7 @@
if (request->req_fetch_baseline)
{
TraceDSQLFetch trace(attachment, request);
- trace.fetch(true, ITracePlugin::TRACE_RESULT_SUCCESS);
+ trace.fetch(true, ITracePlugin::RESULT_SUCCESS);
}
if (request->req_traced && TraceManager::need_dsql_free(attachment))
Modified: firebird/trunk/src/dsql/ExprNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/ExprNodes.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/dsql/ExprNodes.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -10849,7 +10849,7 @@
catch (const Exception& ex)
{
const bool noPriv = (ex.stuff_exception(tdbb->tdbb_status_vector) == isc_no_priv);
- trace.finish(noPriv ? ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED);
+ trace.finish(noPriv ? ITracePlugin::RESULT_UNAUTHORIZED : ITracePlugin::RESULT_FAILED);
tdbb->setRequest(request);
EXE_unwind(tdbb, funcRequest);
@@ -10866,7 +10866,7 @@
if (*nullPtr)
{
request->req_flags |= req_null;
- trace.finish(ITracePlugin::TRACE_RESULT_SUCCESS);
+ trace.finish(ITracePlugin::RESULT_SUCCESS);
}
else
{
@@ -10876,7 +10876,7 @@
value->vlu_desc = *fmtDesc;
value->vlu_desc.dsc_address = outMsg + argOffset;
- trace.finish(ITracePlugin::TRACE_RESULT_SUCCESS, &value->vlu_desc);
+ trace.finish(ITracePlugin::RESULT_SUCCESS, &value->vlu_desc);
}
EXE_unwind(tdbb, funcRequest);
Modified: firebird/trunk/src/dsql/StmtNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/StmtNodes.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/dsql/StmtNodes.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -2862,7 +2862,7 @@
{
const bool noPriv = (ex.stuff_exception(tdbb->tdbb_status_vector) == isc_no_priv);
trace.finish(false,
- noPriv ? Firebird::ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED);
+ noPriv ? Firebird::ITracePlugin::RESULT_UNAUTHORIZED : ITracePlugin::RESULT_FAILED);
EXE_unwind(tdbb, procRequest);
procRequest->req_attachment = NULL;
@@ -2871,7 +2871,7 @@
}
// trace procedure execution finish
- trace.finish(false, ITracePlugin::TRACE_RESULT_SUCCESS);
+ trace.finish(false, ITracePlugin::RESULT_SUCCESS);
EXE_unwind(tdbb, procRequest);
procRequest->req_attachment = NULL;
Modified: firebird/trunk/src/dsql/dsql.cpp
===================================================================
--- firebird/trunk/src/dsql/dsql.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/dsql/dsql.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -278,14 +278,14 @@
if (eofReached)
{
- trace.fetch(true, ITracePlugin::TRACE_RESULT_SUCCESS);
+ trace.fetch(true, ITracePlugin::RESULT_SUCCESS);
return false;
}
map_in_out(this, true, message, delayedFormat, msgBuffer);
delayedFormat = NULL;
- trace.fetch(false, ITracePlugin::TRACE_RESULT_SUCCESS);
+ trace.fetch(false, ITracePlugin::RESULT_SUCCESS);
return true;
}
@@ -624,7 +624,7 @@
{
status = tdbb->tdbb_status_vector[1];
*traceResult = status == isc_no_priv ?
- ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED;
+ ITracePlugin::RESULT_UNAUTHORIZED : ITracePlugin::RESULT_FAILED;
}
// restore warnings (if there are any)
@@ -794,7 +794,7 @@
}
const bool have_cursor = reqTypeWithCursor(statement->getType()) && !singleton;
- trace.finish(have_cursor, ITracePlugin::TRACE_RESULT_SUCCESS);
+ trace.finish(have_cursor, ITracePlugin::RESULT_SUCCESS);
}
void DsqlDdlRequest::dsqlPass(thread_db* tdbb, DsqlCompilerScratch* scratch,
@@ -858,7 +858,7 @@
JRD_autocommit_ddl(tdbb, req_transaction);
- trace.finish(false, ITracePlugin::TRACE_RESULT_SUCCESS);
+ trace.finish(false, ITracePlugin::RESULT_SUCCESS);
}
// Rethrow an exception with isc_no_meta_update and prefix codes.
@@ -1270,7 +1270,7 @@
// raise error if one present
static void checkD(IStatus* st)
{
- if (st->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (st->getState() & IStatus::STATE_ERRORS)
{
ERRD_post(Arg::StatusVector(st));
}
@@ -1405,7 +1405,7 @@
request->req_traced = true;
trace.setStatement(request);
- ntrace_result_t traceResult = ITracePlugin::TRACE_RESULT_SUCCESS;
+ ntrace_result_t traceResult = ITracePlugin::RESULT_SUCCESS;
try
{
request->dsqlPass(tdbb, scratch, &traceResult);
@@ -1421,7 +1421,7 @@
}
catch (const Firebird::Exception&)
{
- trace.prepare(ITracePlugin::TRACE_RESULT_FAILED);
+ trace.prepare(ITracePlugin::RESULT_FAILED);
if (request)
{
Modified: firebird/trunk/src/gpre/languages/ftn.cpp
===================================================================
--- firebird/trunk/src/gpre/languages/ftn.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/gpre/languages/ftn.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -1364,7 +1364,7 @@
{
Firebird::PathName include_buffer;
- include_buffer = fb_utils::getPrefix(Firebird::IConfigManager::FB_DIR_INC, INCLUDE_FTN_FILE);
+ include_buffer = fb_utils::getPrefix(Firebird::IConfigManager::DIR_INC, INCLUDE_FTN_FILE);
sprintf(output_buffer, INCLUDE_ISC_FTN, include_buffer.c_str());
FTN_print_buffer(output_buffer);
Modified: firebird/trunk/src/gpre/obj_cxx.cpp
===================================================================
--- firebird/trunk/src/gpre/obj_cxx.cpp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/gpre/obj_cxx.cpp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -159,7 +159,7 @@
static inline void success(const int column, bool ok, const char* status_name, const char* post = "")
{
- printa(column, "if (%s%s->getStatus() & Firebird::IStatus::FB_HAS_ERRORS%s)%s",
+ printa(column, "if (%s%s->getState() & Firebird::IStatus::STATE_ERRORS%s)%s",
ok ? "!(" : "", global_status_name, ok ? ")" : "", post);
}
@@ -991,7 +991,7 @@
static void gen_blob_for( const act* action, USHORT column)
{
PAT args;
- const TEXT* pattern1 = "%IFif (!(%S1->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)) {\n\
+ const TEXT* pattern1 = "%IFif (!(%S1->getState() & Firebird::IStatus::STATE_ERRORS)) {\n\
%ENwhile (1)\n\
{";
@@ -1001,8 +1001,8 @@
PATTERN_expand(column, pattern1, &args);
column += INDENT;
gen_get_segment(action, column);
- printa(column, "if (fbIStatus == Firebird::IStatus::FB_ERROR || "
- "fbIStatus == Firebird::IStatus::FB_NO_DATA) break;");
+ printa(column, "if (fbIStatus == Firebird::IStatus::RESULT_ERROR || "
+ "fbIStatus == Firebird::IStatus::RESULT_NO_DATA) break;");
}
@@ -2244,7 +2244,7 @@
{
if ((action->act_error || (action->act_flags & ACT_sql)) && db != gpreGlob.isc_databases)
{
- printa(column, "if (%s && !(%s->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)) ", db->dbb_name->sym_string, global_status_name);
+ printa(column, "if (%s && !(%s->getState() & Firebird::IStatus::STATE_ERRORS)) ", db->dbb_name->sym_string, global_status_name);
}
else
printa(column, "if (%s)", db->dbb_name->sym_string);
@@ -2277,7 +2277,7 @@
TEXT s[MAX_REF_SIZE];
if (action->act_error || (action->act_flags & ACT_sql))
- printa(column, "if (!%s || (%s->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)) break;",
+ printa(column, "if (!%s || (%s->getState() & Firebird::IStatus::STATE_ERRORS)) break;",
gen_name(s, request->req_eof, true), global_status_name);
else
printa(column, "if (!%s) break;", gen_name(s, request->req_eof, true));
@@ -2491,7 +2491,7 @@
{
const ref* into = action->act_object;
set_sqlcode(action, column);
- printa(column, "if (fbIStatus == Firebird::IStatus::FB_OK || fbIStatus == Firebird::IStatus::FB_SEGMENT)");
+ printa(column, "if (fbIStatus == Firebird::IStatus::RESULT_OK || fbIStatus == Firebird::IStatus::RESULT_SEGMENT)");
column += INDENT;
begin(column);
align(column);
@@ -3944,7 +3944,7 @@
align(column);
fprintf(gpreGlob.out_file, "if (!%s", db->dbb_name->sym_string);
if (stat && buffer[0])
- fprintf(gpreGlob.out_file, " && !(%s->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)", vector);
+ fprintf(gpreGlob.out_file, " && !(%s->getState() & Firebird::IStatus::STATE_ERRORS)", vector);
fprintf(gpreGlob.out_file, ")");
make_ready(db, filename, vector, (USHORT) (column + INDENT), 0);
if (buffer[0])
Modified: firebird/trunk/src/include/firebird/FirebirdInterface.idl
===================================================================
--- firebird/trunk/src/include/firebird/FirebirdInterface.idl 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/include/firebird/FirebirdInterface.idl 2015-02-18 15:01:17 UTC (rev 60724)
@@ -52,18 +52,18 @@
[exception]
interface Status : Disposable
{
- // flags in value returned by status()
- const uint FB_HAS_WARNINGS = 0x01;
- const uint FB_HAS_ERRORS = 0x02;
+ // flags in value returned by getState()
+ const uint STATE_WARNINGS = 0x01;
+ const uint STATE_ERRORS = 0x02;
// completion codes - not used in Status, but I must have them somewhere
- const int FB_ERROR = -1;
- const int FB_OK = 0;
- const int FB_NO_DATA = 1;
- const int FB_SEGMENT = 2;
+ const int RESULT_ERROR = -1;
+ const int RESULT_OK = 0;
+ const int RESULT_NO_DATA = 1;
+ const int RESULT_SEGMENT = 2;
void init();
- uint getStatus() const;
+ uint getState() const;
void setErrors2(uint length, const intptr* value);
void setWarnings2(uint length, const intptr* value);
@@ -217,17 +217,18 @@
interface PluginManager : Versioned
{
// Plugin types
- const uint Provider = 1;
- const uint FirstNonLibPlugin = 2;
- const uint AuthServer = 3;
- const uint AuthClient = 4;
- const uint AuthUserManagement = 5;
- const uint ExternalEngine = 6;
- const uint Trace = 7;
- const uint WireCrypt = 8;
- const uint DbCrypt = 9;
- const uint KeyHolder = 10;
- const uint MaxType = 11; // keep in sync please
+ const uint TYPE_PROVIDER = 1;
+ const uint TYPE_FIRST_NON_LIB = 2;
+ const uint TYPE_AUTH_SERVER = 3;
+ const uint TYPE_AUTH_CLIENT = 4;
+ const uint TYPE_AUTH_USER_MANAGEMENT = 5;
+ const uint TYPE_EXTERNAL_ENGINE = 6;
+ const uint TYPE_TRACE = 7;
+ const uint TYPE_WIRE_CRYPT = 8;
+ const uint TYPE_DB_CRYPT = 9;
+ const uint TYPE_KEY_HOLDER = 10;
+ const uint TYPE_COUNT = 11; // keep in sync
+ //// TODO: TYPE_COUNT is not count. And these constants starts from 1, different than DIR_* ones.
// Main function called by plugin modules in firebird_plugin()
void registerPluginFactory(uint pluginType, const string defaultName, PluginFactory factory);
@@ -272,24 +273,24 @@
interface ConfigManager : Versioned
{
// Codes for ConfigManager::getDirectory()
- const uint FB_DIR_BIN = 0;
- const uint FB_DIR_SBIN = 1;
- const uint FB_DIR_CONF = 2;
- const uint FB_DIR_LIB = 3;
- const uint FB_DIR_INC = 4;
- const uint FB_DIR_DOC = 5;
- const uint FB_DIR_UDF = 6;
- const uint FB_DIR_SAMPLE = 7;
- const uint FB_DIR_SAMPLEDB = 8;
- const uint FB_DIR_HELP = 9;
- const uint FB_DIR_INTL = 10;
- const uint FB_DIR_MISC = 11;
- const uint FB_DIR_SECDB = 12;
- const uint FB_DIR_MSG = 13;
- const uint FB_DIR_LOG = 14;
- const uint FB_DIR_GUARD = 15;
- const uint FB_DIR_PLUGINS = 16;
- const uint FB_DIRCOUNT = 17;
+ const uint DIR_BIN = 0;
+ const uint DIR_SBIN = 1;
+ const uint DIR_CONF = 2;
+ const uint DIR_LIB = 3;
+ const uint DIR_INC = 4;
+ const uint DIR_DOC = 5;
+ const uint DIR_UDF = 6;
+ const uint DIR_SAMPLE = 7;
+ const uint DIR_SAMPLEDB = 8;
+ const uint DIR_HELP = 9;
+ const uint DIR_INTL = 10;
+ const uint DIR_MISC = 11;
+ const uint DIR_SECDB = 12;
+ const uint DIR_MSG = 13;
+ const uint DIR_LOG = 14;
+ const uint DIR_GUARD = 15;
+ const uint DIR_PLUGINS = 16;
+ const uint DIR_COUNT = 17; // keep in sync
const string getDirectory(uint code);
FirebirdConf getFirebirdConf();
@@ -316,7 +317,7 @@
uint itemsLength, const uchar* items,
uint bufferLength, uchar* buffer);
- [notImplemented(Status::FB_ERROR)]
+ [notImplemented(Status::RESULT_ERROR)]
int getSegment(Status status, uint bufferLength, void* buffer, uint* segmentLength);
void putSegment(Status status, uint length,
@@ -381,12 +382,12 @@
interface ResultSet : ReferenceCounted
{
- [notImplemented(Status::FB_ERROR)] int fetchNext(Status status, void* message);
- [notImplemented(Status::FB_ERROR)] int fetchPrior(Status status, void* message);
- [notImplemented(Status::FB_ERROR)] int fetchFirst(Status status, void* message);
- [notImplemented(Status::FB_ERROR)] int fetchLast(Status status, void* message);
- [notImplemented(Status::FB_ERROR)] int fetchAbsolute(Status status, int position, void* message);
- [notImplemented(Status::FB_ERROR)] int fetchRelative(Status status, int offset, void* message);
+ [notImplemented(Status::RESULT_ERROR)] int fetchNext(Status status, void* message);
+ [notImplemented(Status::RESULT_ERROR)] int fetchPrior(Status status, void* message);
+ [notImplemented(Status::RESULT_ERROR)] int fetchFirst(Status status, void* message);
+ [notImplemented(Status::RESULT_ERROR)] int fetchLast(Status status, void* message);
+ [notImplemented(Status::RESULT_ERROR)] int fetchAbsolute(Status status, int position, void* message);
+ [notImplemented(Status::RESULT_ERROR)] int fetchRelative(Status status, int offset, void* message);
boolean isEof(Status status);
boolean isBof(Status status);
MessageMetadata getMetadata(Status status);
@@ -924,8 +925,8 @@
interface TraceConnection : Versioned
{
- const uint TRACE_CONNECTION_DATABASE = 1;
- const uint TRACE_CONNECTION_SERVICE = 2;
+ const uint KIND_DATABASE = 1;
+ const uint KIND_SERVICE = 2;
uint getKind();
@@ -947,10 +948,10 @@
interface TraceTransaction : Versioned
{
- const uint TRA_ISO_CONSISTENCY = 1;
- const uint TRA_ISO_CONCURRENCY = 2;
- const uint TRA_ISO_READ_COMMITTED_RECVER = 3;
- const uint TRA_ISO_READ_COMMITTED_NORECVER = 4;
+ const uint ISOLATION_CONSISTENCY = 1;
+ const uint ISOLATION_CONCURRENCY = 2;
+ const uint ISOLATION_READ_COMMITTED_RECVER = 3;
+ const uint ISOLATION_READ_COMMITTED_NORECVER = 4;
uint getTransactionID();
boolean getReadOnly();
@@ -1018,10 +1019,14 @@
interface TraceTrigger : Versioned
{
- const uint TRACE_ALL = 0;
- const uint TRACE_BEFORE = 1;
- const uint TRACE_AFTER = 2;
+ //// TODO: TYPE or WHICH? ExternalTrigger has similar constants.
+ const uint TYPE_ALL = 0;
+ const uint TYPE_BEFORE = 1;
+ const uint TYPE_AFTER = 2;
+ //// TODO: What about database triggers?
+ //// TODO: Action constants?
+
const string getTriggerName();
const string getRelationName();
int getAction();
@@ -1072,9 +1077,9 @@
// API of trace plugin. Used to deliver notifications for each database
interface TracePlugin : ReferenceCounted
{
- const uint TRACE_RESULT_SUCCESS = 0;
- const uint TRACE_RESULT_FAILED = 1;
- const uint TRACE_RESULT_UNAUTHORIZED = 2;
+ const uint RESULT_SUCCESS = 0;
+ const uint RESULT_FAILED = 1;
+ const uint RESULT_UNAUTHORIZED = 2;
// Function to return error string for hook failure
const string trace_get_error();
Modified: firebird/trunk/src/include/firebird/IdlFbInterfaces.h
===================================================================
--- firebird/trunk/src/include/firebird/IdlFbInterfaces.h 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/include/firebird/IdlFbInterfaces.h 2015-02-18 15:01:17 UTC (rev 60724)
@@ -202,7 +202,7 @@
struct VTable : public IDisposable::VTable
{
void (CLOOP_CARG *init)(IStatus* self) throw();
- unsigned (CLOOP_CARG *getStatus)(const IStatus* self) throw();
+ unsigned (CLOOP_CARG *getState)(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();
@@ -225,21 +225,21 @@
public:
static const unsigned VERSION = 3;
- static const unsigned FB_HAS_WARNINGS = 1;
- static const unsigned FB_HAS_ERRORS = 2;
- static const int FB_ERROR = -1;
- static const int FB_OK = 0;
- static const int FB_NO_DATA = 1;
- static const int FB_SEGMENT = 2;
+ static const unsigned STATE_WARNINGS = 1;
+ static const unsigned STATE_ERRORS = 2;
+ static const int RESULT_ERROR = -1;
+ static const int RESULT_OK = 0;
+ static const int RESULT_NO_DATA = 1;
+ static const int RESULT_SEGMENT = 2;
void init()
{
static_cast<VTable*>(this->cloopVTable)->init(this);
}
- unsigned getStatus() const
+ unsigned getState() const
{
- unsigned ret = static_cast<VTable*>(this->cloopVTable)->getStatus(this);
+ unsigned ret = static_cast<VTable*>(this->cloopVTable)->getState(this);
return ret;
}
@@ -763,17 +763,17 @@
public:
static const unsigned VERSION = 2;
- static const unsigned Provider = 1;
- static const unsigned FirstNonLibPlugin = 2;
- static const unsigned AuthServer = 3;
- static const unsigned AuthClient = 4;
- static const unsigned AuthUserManagement = 5;
- static const unsigned ExternalEngine = 6;
- static const unsigned Trace = 7;
- static const unsigned WireCrypt = 8;
- static const unsigned DbCrypt = 9;
- static const unsigned KeyHolder = 10;
- static const unsigned MaxType = 11;
+ static const unsigned TYPE_PROVIDER = 1;
+ static const unsigned TYPE_FIRST_NON_LIB = 2;
+ static const unsigned TYPE_AUTH_SERVER = 3;
+ static const unsigned TYPE_AUTH_CLIENT = 4;
+ static const unsigned TYPE_AUTH_USER_MANAGEMENT = 5;
+ static const unsigned TYPE_EXTERNAL_ENGINE = 6;
+ static const unsigned TYPE_TRACE = 7;
+ static const unsigned TYPE_WIRE_CRYPT = 8;
+ static const unsigned TYPE_DB_CRYPT = 9;
+ static const unsigned TYPE_KEY_HOLDER = 10;
+ static const unsigned TYPE_COUNT = 11;
void registerPluginFactory(unsigned pluginType, const char* defaultName, IPluginFactory* factory)
{
@@ -885,24 +885,24 @@
public:
static const unsigned VERSION = 2;
- static const unsigned FB_DIR_BIN = 0;
- static const unsigned FB_DIR_SBIN = 1;
- static const unsigned FB_DIR_CONF = 2;
- static const unsigned FB_DIR_LIB = 3;
- static const unsigned FB_DIR_INC = 4;
- static const unsigned FB_DIR_DOC = 5;
- static const unsigned FB_DIR_UDF = 6;
- static const unsigned FB_DIR_SAMPLE = 7;
- static const unsigned FB_DIR_SAMPLEDB = 8;
- static const unsigned FB_DIR_HELP = 9;
- static const unsigned FB_DIR_INTL = 10;
- static const unsigned FB_DIR_MISC = 11;
- static const unsigned FB_DIR_SECDB = 12;
- static const unsigned FB_DIR_MSG = 13;
- static const unsigned FB_DIR_LOG = 14;
- static const unsigned FB_DIR_GUARD = 15;
- static const unsigned FB_DIR_PLUGINS = 16;
- static const unsigned FB_DIRCOUNT = 17;
+ static const unsigned DIR_BIN = 0;
+ static const unsigned DIR_SBIN = 1;
+ static const unsigned DIR_CONF = 2;
+ static const unsigned DIR_LIB = 3;
+ static const unsigned DIR_INC = 4;
+ static const unsigned DIR_DOC = 5;
+ static const unsigned DIR_UDF = 6;
+ static const unsigned DIR_SAMPLE = 7;
+ static const unsigned DIR_SAMPLEDB = 8;
+ static const unsigned DIR_HELP = 9;
+ static const unsigned DIR_INTL = 10;
+ static const unsigned DIR_MISC = 11;
+ static const unsigned DIR_SECDB = 12;
+ static const unsigned DIR_MSG = 13;
+ static const unsigned DIR_LOG = 14;
+ static const unsigned DIR_GUARD = 15;
+ static const unsigned DIR_PLUGINS = 16;
+ static const unsigned DIR_COUNT = 17;
const char* getDirectory(unsigned code)
{
@@ -1513,7 +1513,6 @@
static const unsigned FLAG_REPEAT_EXECUTE = 2;
static const unsigned CURSOR_TYPE_SCROLLABLE = 1;
-
template <typename StatusType> void getInfo(StatusType* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer)
{
static_cast<VTable*>(this->cloopVTable)->getInfo(this, status, itemsLength, items, bufferLength, buffer);
@@ -3368,8 +3367,8 @@
public:
static const unsigned VERSION = 2;
- static const unsigned TRACE_CONNECTION_DATABASE = 1;
- static const unsigned TRACE_CONNECTION_SERVICE = 2;
+ static const unsigned KIND_DATABASE = 1;
+ static const unsigned KIND_SERVICE = 2;
unsigned getKind()
{
@@ -3486,10 +3485,10 @@
public:
static const unsigned VERSION = 2;
- static const unsigned TRA_ISO_CONSISTENCY = 1;
- static const unsigned TRA_ISO_CONCURRENCY = 2;
- static const unsigned TRA_ISO_READ_COMMITTED_RECVER = 3;
- static const unsigned TRA_ISO_READ_COMMITTED_NORECVER = 4;
+ static const unsigned ISOLATION_CONSISTENCY = 1;
+ static const unsigned ISOLATION_CONCURRENCY = 2;
+ static const unsigned ISOLATION_READ_COMMITTED_RECVER = 3;
+ static const unsigned ISOLATION_READ_COMMITTED_NORECVER = 4;
unsigned getTransactionID()
{
@@ -3890,9 +3889,9 @@
public:
static const unsigned VERSION = 2;
- static const unsigned TRACE_ALL = 0;
- static const unsigned TRACE_BEFORE = 1;
- static const unsigned TRACE_AFTER = 2;
+ static const unsigned TYPE_ALL = 0;
+ static const unsigned TYPE_BEFORE = 1;
+ static const unsigned TYPE_AFTER = 2;
const char* getTriggerName()
{
@@ -4211,9 +4210,9 @@
public:
static const unsigned VERSION = 3;
- static const unsigned TRACE_RESULT_SUCCESS = 0;
- static const unsigned TRACE_RESULT_FAILED = 1;
- static const unsigned TRACE_RESULT_UNAUTHORIZED = 2;
+ static const unsigned RESULT_SUCCESS = 0;
+ static const unsigned RESULT_FAILED = 1;
+ static const unsigned RESULT_UNAUTHORIZED = 2;
static const unsigned SWEEP_STATE_STARTED = 1;
static const unsigned SWEEP_STATE_FINISHED = 2;
static const unsigned SWEEP_STATE_FAILED = 3;
@@ -4726,7 +4725,7 @@
this->version = Base::VERSION;
this->dispose = &Name::cloopdisposeDispatcher;
this->init = &Name::cloopinitDispatcher;
- this->getStatus = &Name::cloopgetStatusDispatcher;
+ this->getState = &Name::cloopgetStateDispatcher;
this->setErrors2 = &Name::cloopsetErrors2Dispatcher;
this->setWarnings2 = &Name::cloopsetWarnings2Dispatcher;
this->setErrors = &Name::cloopsetErrorsDispatcher;
@@ -4752,11 +4751,11 @@
}
}
- static unsigned CLOOP_CARG cloopgetStatusDispatcher(const IStatus* self) throw()
+ static unsigned CLOOP_CARG cloopgetStateDispatcher(const IStatus* self) throw()
{
try
{
- return static_cast<const Name*>(self)->Name::getStatus();
+ return static_cast<const Name*>(self)->Name::getState();
}
catch (...)
{
@@ -4879,7 +4878,7 @@
}
virtual void init() = 0;
- virtual unsigned getStatus() const = 0;
+ virtual unsigned getState() const = 0;
virtual void setErrors2(unsigned length, const intptr_t* value) = 0;
virtual void setWarnings2(unsigned length, const intptr_t* value) = 0;
virtual void setErrors(const intptr_t* value) = 0;
Modified: firebird/trunk/src/include/firebird/Interface.h
===================================================================
--- firebird/trunk/src/include/firebird/Interface.h 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/include/firebird/Interface.h 2015-02-18 15:01:17 UTC (rev 60724)
@@ -152,9 +152,9 @@
status->init();
}
- virtual unsigned getStatus() const
+ virtual unsigned getState() const
{
- return dirty ? status->getStatus() : 0;
+ return dirty ? status->getState() : 0;
}
virtual void setErrors2(unsigned length, const intptr_t* value)
@@ -226,7 +226,7 @@
public:
static void checkException(ThrowStatusWrapper* status)
{
- if (status->dirty && (status->getStatus() & IStatus::FB_HAS_ERRORS))
+ if (status->dirty && (status->getState() & IStatus::STATE_ERRORS))
throw FbException(status->status);
}
};
Modified: firebird/trunk/src/include/firebird/UdrCppEngine.h
===================================================================
--- firebird/trunk/src/include/firebird/UdrCppEngine.h 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/include/firebird/UdrCppEngine.h 2015-02-18 15:01:17 UTC (rev 60724)
@@ -350,7 +350,7 @@
{
(plugin->*routine)(statusWrapper, node->name, node->factory);
- if (statusWrapper->getStatus() & IStatus::FB_HAS_ERRORS)
+ if (statusWrapper->getState() & IStatus::STATE_ERRORS)
return false;
}
Modified: firebird/trunk/src/isql/isql.epp
===================================================================
--- firebird/trunk/src/isql/isql.epp 2015-02-18 14:54:55 UTC (rev 60723)
+++ firebird/trunk/src/isql/isql.epp 2015-02-18 15:01:17 UTC (rev 60724)
@@ -277,7 +277,7 @@
if (ISQL_errmsg (fbStatus))
{
(*x)->rollback(fbStatus);
- if (!(fbStatus->getStatus() & Firebird::IStatus::FB_HAS_ERRORS))
+ if (!(fbStatus->getState() & Firebird::IStatus::STATE_ERRORS))
{
*x = NULL;
}
@@ -956,8 +956,8 @@
TEXT errbuf[MSG_LENGTH];
const ISC_STATUS* const status...
[truncated message content] |
|
From: <fir...@us...> - 2015-02-19 00:16:17
|
Revision: 60726
http://sourceforge.net/p/firebird/code/60726
Author: firebirds
Date: 2015-02-19 00:16:15 +0000 (Thu, 19 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-02-18 16:22:49 UTC (rev 60725)
+++ firebird/trunk/ChangeLog 2015-02-19 00:16:15 UTC (rev 60726)
@@ -1,3 +1,113 @@
+ 2015-02-18 15:01 asfernandes
+ M examples/dbcrypt/CryptApplication.cpp
+ M examples/dbcrypt/CryptKeyHolder.cpp
+ M examples/dbcrypt/DbCrypt.cpp
+ M src/auth/AuthDbg.cpp
+ M src/auth/SecureRemotePassword/Message.h
+ M src/auth/SecureRemotePassword/client/SrpClient.cpp
+ M src/auth/SecureRemotePassword/manage/SrpManagement.cpp
+ M src/auth/SecureRemotePassword/server/SrpServer.cpp
+ M src/auth/SecurityDatabase/LegacyClient.cpp
+ M src/auth/SecurityDatabase/LegacyManagement.epp
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+ M src/auth/trusted/AuthSspi.cpp
+ M src/common/IntlParametersBlock.cpp
+ M src/common/StatusArg.cpp
+ M src/common/StatusHolder.h
+ M src/common/call_service.cpp
+ M src/common/classes/ImplementHelper.h
+ M src/common/classes/MsgPrint.cpp
+ M src/common/config/config.cpp
+ M src/common/config/config_file.cpp
+ M src/common/db_alias.cpp
+ M src/common/os/win32/mod_loader.cpp
+ M src/common/security.cpp
+ M src/common/unicode_util.cpp
+ M src/common/utils.cpp
+ M src/dsql/DdlNodes.epp
+ M src/dsql/DsqlCursor.cpp
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/dsql.cpp
+ M src/gpre/languages/ftn.cpp
+ M src/gpre/obj_cxx.cpp
+ M src/include/firebird/FirebirdInterface.idl
+ M src/include/firebird/IdlFbInterfaces.h
+ M src/include/firebird/Interface.h
+ M src/include/firebird/UdrCppEngine.h
+ M src/isql/isql.epp
+ M src/isql/show.epp
+ M src/jrd/CryptoManager.cpp
+ M src/jrd/Database.cpp
+ M src/jrd/DbCreators.cpp
+ M src/jrd/ExtEngineManager.cpp
+ M src/jrd/IntlManager.cpp
+ M src/jrd/Mapping.cpp
+ M src/jrd/UserManagement.cpp
+ M src/jrd/exe.cpp
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/fun.epp
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+ M src/jrd/recsrc/ProcedureScan.cpp
+ M src/jrd/svc.cpp
+ M src/jrd/tra.cpp
+ M src/jrd/trace/TraceDSQLHelpers.h
+ M src/jrd/trace/TraceJrdHelpers.h
+ M src/jrd/trace/TraceManager.cpp
+ M src/jrd/trace/TraceObjects.cpp
+ M src/plugins/crypt/arc4/Arc4.cpp
+ M src/plugins/udr_engine/UdrEngine.cpp
+ M src/qli/help.epp
+ M src/remote/client/interface.cpp
+ M src/remote/inet.cpp
+ M src/remote/os/win32/wnet.cpp
+ M src/remote/remote.cpp
+ M src/remote/server/os/posix/inet_server.cpp
+ M src/remote/server/os/win32/srvr_w32.cpp
+ M src/remote/server/server.cpp
+ M src/utilities/gsec/gsec.cpp
+ M src/utilities/guard/util.cpp
+ M src/utilities/ibmgr/srvrmgr.cpp
+ M src/utilities/ntrace/TracePluginImpl.cpp
+ M src/utilities/ntrace/traceplugin.cpp
+ M src/yvalve/DistributedTransaction.cpp
+ M src/yvalve/PluginManager.cpp
+ M src/yvalve/gds.cpp
+ M src/yvalve/perf.cpp
+ M src/yvalve/utl.cpp
+ M src/yvalve/why.cpp
+Better constant names: avoid FB, enclosing class (double prefix) or wrong prefixes.
+Left some TODOs in FirebirdInterface.idl and utilities/ntrace/TracePluginImpl.cpp related to trace.
+(redo with fix for Windows build, and left another TODO comment in FirebirdInterface.idl)
+
+ 2015-02-18 14:22 alexpeshkoff
+ M src/yvalve/MasterImplementation.cpp
+Restore useful assert
+
+ 2015-02-18 13:39 alexpeshkoff
+ M src/yvalve/MasterImplementation.cpp
+Quick fix for posix build after Vlad's changes
+
+ 2015-02-18 12:55 dimitr
+ M src/jrd/evl.cpp
+Misc.
+
+ 2015-02-18 12:54 dimitr
+ M src/common/cvt.cpp
+ M src/common/dsc.h
+Misc.
+
+ 2015-02-18 12:44 hvlad
+ M src/common/dllinst.cpp
+ M src/common/dllinst.h
+ M src/jrd/os/win32/ibinitdll.cpp
+ M src/yvalve/MasterImplementation.cpp
+ M src/yvalve/MasterImplementation.h
+Attempt to implement thread cleanup for Windows (using DLL entry point).
+It is used in dispatcher (fbclient.dll) only for now.
+Fixed potential memory leak in StringsBuffer (it was possible to allocate few ThreadBuffer's for the same thread), see CORE-4683.
+
2015-02-17 23:21 asfernandes
M examples/dbcrypt/CryptApplication.cpp
M examples/dbcrypt/CryptKeyHolder.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-02-18 16:22:49 UTC (rev 60725)
+++ firebird/trunk/src/jrd/build_no.h 2015-02-19 00:16:15 UTC (rev 60726)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31655
+ FORMAL BUILD NUMBER:31661
*/
-#define PRODUCT_VER_STRING "3.0.0.31655"
-#define FILE_VER_STRING "WI-T3.0.0.31655"
-#define LICENSE_VER_STRING "WI-T3.0.0.31655"
-#define FILE_VER_NUMBER 3, 0, 0, 31655
+#define PRODUCT_VER_STRING "3.0.0.31661"
+#define FILE_VER_STRING "WI-T3.0.0.31661"
+#define LICENSE_VER_STRING "WI-T3.0.0.31661"
+#define FILE_VER_NUMBER 3, 0, 0, 31661
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31655"
+#define FB_BUILD_NO "31661"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-02-18 16:22:49 UTC (rev 60725)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-02-19 00:16:15 UTC (rev 60726)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31655
+BuildNum=31661
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-02-20 00:15:07
|
Revision: 60739
http://sourceforge.net/p/firebird/code/60739
Author: firebirds
Date: 2015-02-20 00:15:00 +0000 (Fri, 20 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-02-19 19:52:28 UTC (rev 60738)
+++ firebird/trunk/ChangeLog 2015-02-20 00:15:00 UTC (rev 60739)
@@ -1,3 +1,74 @@
+ 2015-02-19 19:52 dimitr
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/StmtNodes.cpp
+ M src/jrd/exe.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/tra.h
+Misc code simplification.
+
+ 2015-02-19 19:50 dimitr
+ M src/jrd/Record.h
+Small changes intended to fix SEGV in the release build.
+
+ 2015-02-19 15:58 dimitr
+ M src/jrd/tra.cpp
+Protection against exceptions thrown from VIO_verb_cleanup() during commit/rollback.
+
+ 2015-02-19 15:53 dimitr
+ M src/jrd/Record.h
+ M src/jrd/tra.h
+ M src/jrd/vio.cpp
+Misc.
+
+ 2015-02-19 14:56 dimitr
+ M src/jrd/idx.cpp
+Postfix for my big commit.
+
+ 2015-02-19 14:43 dimitr
+ M src/jrd/tra.cpp
+1) Fixed CORE-4382: User savepoints are not released on commit.
+2) Respect the "no-auto-undo" option when retaining a transaction context.
+Thanks to Dimitry Sibiryakov.
+
+ 2015-02-19 14:19 dimitr
+ M src/jrd/recsrc/ProcedureScan.cpp
+Misc.
+
+ 2015-02-19 14:15 dimitr
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/StmtNodes.cpp
+ M src/jrd/Monitoring.cpp
+ A src/jrd/Record.h
+ M src/jrd/RecordBuffer.cpp
+ M src/jrd/Relation.h
+ M src/jrd/blb.cpp
+ M src/jrd/dpm.epp
+ M src/jrd/evl.cpp
+ M src/jrd/exe.cpp
+ M src/jrd/ext.cpp
+ M src/jrd/idx.cpp
+ M src/jrd/recsrc/BufferedStream.cpp
+ M src/jrd/recsrc/ProcedureScan.cpp
+ M src/jrd/recsrc/RecordSource.cpp
+ M src/jrd/recsrc/RecursiveStream.cpp
+ M src/jrd/recsrc/SingularStream.cpp
+ M src/jrd/recsrc/SortedStream.cpp
+ M src/jrd/req.h
+ M src/jrd/tra.cpp
+ M src/jrd/tra.h
+ M src/jrd/vio.cpp
+1) Fixed CORE-4383: Index and BLOBs garbage collection doesn't work for update_in_place().
+2) Applied the same approach to temporary GC records.
+3) Refactored the Record class to avoid reallocations, to improve encapsulation and to simplify the code.
+4) Slightly refactored UndoItem to isolate its logic from the Record class.
+5) Reduced the in-memory size of the undo log.
+6) Slightly better alternative to the legacy NULL reporting for outer joins.
+7) Minor fixes and adjustments in BufferedStream.
+
+ 2015-02-19 14:06 dimitr
+ M src/jrd/nbak.h
+Misc.
+
2015-02-18 15:01 asfernandes
M examples/dbcrypt/CryptApplication.cpp
M examples/dbcrypt/CryptKeyHolder.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-02-19 19:52:28 UTC (rev 60738)
+++ firebird/trunk/src/jrd/build_no.h 2015-02-20 00:15:00 UTC (rev 60739)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31661
+ FORMAL BUILD NUMBER:31670
*/
-#define PRODUCT_VER_STRING "3.0.0.31661"
-#define FILE_VER_STRING "WI-T3.0.0.31661"
-#define LICENSE_VER_STRING "WI-T3.0.0.31661"
-#define FILE_VER_NUMBER 3, 0, 0, 31661
+#define PRODUCT_VER_STRING "3.0.0.31670"
+#define FILE_VER_STRING "WI-T3.0.0.31670"
+#define LICENSE_VER_STRING "WI-T3.0.0.31670"
+#define FILE_VER_NUMBER 3, 0, 0, 31670
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31661"
+#define FB_BUILD_NO "31670"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-02-19 19:52:28 UTC (rev 60738)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-02-20 00:15:00 UTC (rev 60739)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31661
+BuildNum=31670
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-02-21 00:13:43
|
Revision: 60750
http://sourceforge.net/p/firebird/code/60750
Author: firebirds
Date: 2015-02-21 00:13:36 +0000 (Sat, 21 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-02-20 20:08:27 UTC (rev 60749)
+++ firebird/trunk/ChangeLog 2015-02-21 00:13:36 UTC (rev 60750)
@@ -1,3 +1,24 @@
+ 2015-02-20 16:56 dimitr
+ M src/dsql/DsqlCompilerScratch.cpp
+Fixed CORE-4694: "Column unknown" error while preparing a recursive query if the recursive part contains ALIASED datasource in the join with anchor table.
+
+ 2015-02-20 15:31 hvlad
+ M src/jrd/Record.h
+Fix warning
+
+ 2015-02-20 14:27 asfernandes
+ M src/remote/client/interface.cpp
+Fixed segfault with events and the remote protocol.
+
+ 2015-02-20 10:40 alexpeshkoff
+ M src/common/os/posix/os_utils.cpp
+Do not raise errors when cannot generate unique ID for file, just keep ID empty
+
+ 2015-02-20 09:38 hvlad
+ M src/plugins/crypt/arc4/Arc4.cpp
+ M src/remote/remote.h
+More memory leaks (CORE-4683)
+
2015-02-19 19:52 dimitr
M src/dsql/ExprNodes.cpp
M src/dsql/StmtNodes.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-02-20 20:08:27 UTC (rev 60749)
+++ firebird/trunk/src/jrd/build_no.h 2015-02-21 00:13:36 UTC (rev 60750)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31670
+ FORMAL BUILD NUMBER:31675
*/
-#define PRODUCT_VER_STRING "3.0.0.31670"
-#define FILE_VER_STRING "WI-T3.0.0.31670"
-#define LICENSE_VER_STRING "WI-T3.0.0.31670"
-#define FILE_VER_NUMBER 3, 0, 0, 31670
+#define PRODUCT_VER_STRING "3.0.0.31675"
+#define FILE_VER_STRING "WI-T3.0.0.31675"
+#define LICENSE_VER_STRING "WI-T3.0.0.31675"
+#define FILE_VER_NUMBER 3, 0, 0, 31675
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31670"
+#define FB_BUILD_NO "31675"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-02-20 20:08:27 UTC (rev 60749)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-02-21 00:13:36 UTC (rev 60750)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31670
+BuildNum=31675
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-02-23 00:13:49
|
Revision: 60760
http://sourceforge.net/p/firebird/code/60760
Author: firebirds
Date: 2015-02-23 00:13:47 +0000 (Mon, 23 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-02-22 17:12:57 UTC (rev 60759)
+++ firebird/trunk/ChangeLog 2015-02-23 00:13:47 UTC (rev 60760)
@@ -1,3 +1,38 @@
+ 2015-02-22 16:04 hvlad
+ M src/jrd/extds/InternalDS.cpp
+Bit more safety
+
+ 2015-02-22 15:47 asfernandes
+ M src/jrd/extds/InternalDS.cpp
+Use RefPtr::assignRefNoIncr so we can clearly see the code is not going to crash.
+
+ 2015-02-22 11:17 hvlad
+ M src/jrd/btr.cpp
+Improvement CORE-4696 : No need to flush dirty pages to disk after creation of temporary table index
+
+ 2015-02-22 11:02 hvlad
+ M src/jrd/dfw.epp
+ M src/jrd/dpm.epp
+ M src/jrd/idx.cpp
+ M src/jrd/intl.cpp
+ M src/jrd/met.epp
+ M src/jrd/pag.cpp
+ M src/jrd/vio.cpp
+Use attachment's or relation's pool instead of dbb_permanent where it is more suitable.
+It fixed memory leak from dbb_permanent (CORE-4683)
+
+ 2015-02-22 10:58 hvlad
+ M src/jrd/EngineInterface.h
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/extds/InternalDS.h
+ M src/jrd/jrd.cpp
+Fixed leak of various J-objects in EXECUTE STATEMENT (CORE-4683)
+
+ 2015-02-22 10:49 hvlad
+ M src/jrd/tra.cpp
+ M src/utilities/ntrace/TracePluginImpl.cpp
+Fixed regression in 32-bit builds: transaction numbers in sweep info (both trace event and firebird.log message) printed incorrectly
+
2015-02-20 16:56 dimitr
M src/dsql/DsqlCompilerScratch.cpp
Fixed CORE-4694: "Column unknown" error while preparing a recursive query if the recursive part contains ALIASED datasource in the join with anchor table.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-02-22 17:12:57 UTC (rev 60759)
+++ firebird/trunk/src/jrd/build_no.h 2015-02-23 00:13:47 UTC (rev 60760)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31675
+ FORMAL BUILD NUMBER:31681
*/
-#define PRODUCT_VER_STRING "3.0.0.31675"
-#define FILE_VER_STRING "WI-T3.0.0.31675"
-#define LICENSE_VER_STRING "WI-T3.0.0.31675"
-#define FILE_VER_NUMBER 3, 0, 0, 31675
+#define PRODUCT_VER_STRING "3.0.0.31681"
+#define FILE_VER_STRING "WI-T3.0.0.31681"
+#define LICENSE_VER_STRING "WI-T3.0.0.31681"
+#define FILE_VER_NUMBER 3, 0, 0, 31681
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31675"
+#define FB_BUILD_NO "31681"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-02-22 17:12:57 UTC (rev 60759)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-02-23 00:13:47 UTC (rev 60760)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31675
+BuildNum=31681
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-02-24 00:12:37
|
Revision: 60766
http://sourceforge.net/p/firebird/code/60766
Author: firebirds
Date: 2015-02-24 00:12:34 +0000 (Tue, 24 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-02-23 17:52:41 UTC (rev 60765)
+++ firebird/trunk/ChangeLog 2015-02-24 00:12:34 UTC (rev 60766)
@@ -1,3 +1,7 @@
+ 2015-02-23 01:44 asfernandes
+ M src/include/firebird/FirebirdInterface.idl
+Change to make the generated C API work with latest cloop.
+
2015-02-22 16:04 hvlad
M src/jrd/extds/InternalDS.cpp
Bit more safety
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-02-23 17:52:41 UTC (rev 60765)
+++ firebird/trunk/src/jrd/build_no.h 2015-02-24 00:12:34 UTC (rev 60766)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31681
+ FORMAL BUILD NUMBER:31682
*/
-#define PRODUCT_VER_STRING "3.0.0.31681"
-#define FILE_VER_STRING "WI-T3.0.0.31681"
-#define LICENSE_VER_STRING "WI-T3.0.0.31681"
-#define FILE_VER_NUMBER 3, 0, 0, 31681
+#define PRODUCT_VER_STRING "3.0.0.31682"
+#define FILE_VER_STRING "WI-T3.0.0.31682"
+#define LICENSE_VER_STRING "WI-T3.0.0.31682"
+#define FILE_VER_NUMBER 3, 0, 0, 31682
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31681"
+#define FB_BUILD_NO "31682"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-02-23 17:52:41 UTC (rev 60765)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-02-24 00:12:34 UTC (rev 60766)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31681
+BuildNum=31682
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-02-25 00:15:37
|
Revision: 60779
http://sourceforge.net/p/firebird/code/60779
Author: firebirds
Date: 2015-02-25 00:15:29 +0000 (Wed, 25 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-02-24 19:04:52 UTC (rev 60778)
+++ firebird/trunk/ChangeLog 2015-02-25 00:15:29 UTC (rev 60779)
@@ -1,3 +1,11 @@
+ 2015-02-24 12:58 alexpeshkoff
+ M src/remote/remote.cpp
+Lost exception when initializing port with compression - thanks to Claudio
+
+ 2015-02-24 09:15 hvlad
+ M src/jrd/jrd.cpp
+Simplest fix for bug CORE-4698 : typing "add -user SYSDBA -pw masterkey -admin yes" into gsec crashes firebird.exe
+
2015-02-23 01:44 asfernandes
M src/include/firebird/FirebirdInterface.idl
Change to make the generated C API work with latest cloop.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-02-24 19:04:52 UTC (rev 60778)
+++ firebird/trunk/src/jrd/build_no.h 2015-02-25 00:15:29 UTC (rev 60779)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31682
+ FORMAL BUILD NUMBER:31684
*/
-#define PRODUCT_VER_STRING "3.0.0.31682"
-#define FILE_VER_STRING "WI-T3.0.0.31682"
-#define LICENSE_VER_STRING "WI-T3.0.0.31682"
-#define FILE_VER_NUMBER 3, 0, 0, 31682
+#define PRODUCT_VER_STRING "3.0.0.31684"
+#define FILE_VER_STRING "WI-T3.0.0.31684"
+#define LICENSE_VER_STRING "WI-T3.0.0.31684"
+#define FILE_VER_NUMBER 3, 0, 0, 31684
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31682"
+#define FB_BUILD_NO "31684"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-02-24 19:04:52 UTC (rev 60778)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-02-25 00:15:29 UTC (rev 60779)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31682
+BuildNum=31684
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-02-26 00:13:55
|
Revision: 60786
http://sourceforge.net/p/firebird/code/60786
Author: firebirds
Date: 2015-02-26 00:13:53 +0000 (Thu, 26 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-02-25 20:35:09 UTC (rev 60785)
+++ firebird/trunk/ChangeLog 2015-02-26 00:13:53 UTC (rev 60786)
@@ -1,3 +1,24 @@
+ 2015-02-25 20:35 dimitr
+ M src/jrd/tra.cpp
+Let's be on the paranoid side when committing.
+
+ 2015-02-25 17:03 alexpeshkoff
+ M src/common/StatusHolder.cpp
+ M src/common/StatusHolder.h
+ M src/common/utils.cpp
+ M src/common/utils_proto.h
+ M src/jrd/jrd.cpp
+ M src/remote/protocol.cpp
+ M src/remote/remote.cpp
+ M src/remote/server/server.cpp
+Dynamic buffer for status vector and dynamic strings in IStatus
+
+ 2015-02-25 14:24 alexpeshkoff
+ M src/remote/client/interface.cpp
+ M src/yvalve/YObjects.h
+ M src/yvalve/why.cpp
+Fixed memory leaks in events API
+
2015-02-24 12:58 alexpeshkoff
M src/remote/remote.cpp
Lost exception when initializing port with compression - thanks to Claudio
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-02-25 20:35:09 UTC (rev 60785)
+++ firebird/trunk/src/jrd/build_no.h 2015-02-26 00:13:53 UTC (rev 60786)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31684
+ FORMAL BUILD NUMBER:31687
*/
-#define PRODUCT_VER_STRING "3.0.0.31684"
-#define FILE_VER_STRING "WI-T3.0.0.31684"
-#define LICENSE_VER_STRING "WI-T3.0.0.31684"
-#define FILE_VER_NUMBER 3, 0, 0, 31684
+#define PRODUCT_VER_STRING "3.0.0.31687"
+#define FILE_VER_STRING "WI-T3.0.0.31687"
+#define LICENSE_VER_STRING "WI-T3.0.0.31687"
+#define FILE_VER_NUMBER 3, 0, 0, 31687
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31684"
+#define FB_BUILD_NO "31687"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-02-25 20:35:09 UTC (rev 60785)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-02-26 00:13:53 UTC (rev 60786)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31684
+BuildNum=31687
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-02-28 00:13:51
|
Revision: 60805
http://sourceforge.net/p/firebird/code/60805
Author: firebirds
Date: 2015-02-28 00:13:43 +0000 (Sat, 28 Feb 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-02-27 19:59:23 UTC (rev 60804)
+++ firebird/trunk/ChangeLog 2015-02-28 00:13:43 UTC (rev 60805)
@@ -1,3 +1,16 @@
+ 2015-02-27 16:01 alexpeshkoff
+ M src/common/classes/vector.h
+Most of methods of vector never throw
+
+ 2015-02-27 15:59 alexpeshkoff
+ M examples/interfaces/04.print_table.cpp
+Fixed error handlig in test
+
+ 2015-02-27 15:42 alexpeshkoff
+ M examples/interfaces/03.select.cpp
+ M examples/interfaces/04.print_table.cpp
+misc
+
2015-02-25 20:35 dimitr
M src/jrd/tra.cpp
Let's be on the paranoid side when committing.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-02-27 19:59:23 UTC (rev 60804)
+++ firebird/trunk/src/jrd/build_no.h 2015-02-28 00:13:43 UTC (rev 60805)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31687
+ FORMAL BUILD NUMBER:31690
*/
-#define PRODUCT_VER_STRING "3.0.0.31687"
-#define FILE_VER_STRING "WI-T3.0.0.31687"
-#define LICENSE_VER_STRING "WI-T3.0.0.31687"
-#define FILE_VER_NUMBER 3, 0, 0, 31687
+#define PRODUCT_VER_STRING "3.0.0.31690"
+#define FILE_VER_STRING "WI-T3.0.0.31690"
+#define LICENSE_VER_STRING "WI-T3.0.0.31690"
+#define FILE_VER_NUMBER 3, 0, 0, 31690
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31687"
+#define FB_BUILD_NO "31690"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-02-27 19:59:23 UTC (rev 60804)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-02-28 00:13:43 UTC (rev 60805)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31687
+BuildNum=31690
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-03-05 00:28:23
|
Revision: 60832
http://sourceforge.net/p/firebird/code/60832
Author: firebirds
Date: 2015-03-05 00:28:15 +0000 (Thu, 05 Mar 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-03-04 19:29:24 UTC (rev 60831)
+++ firebird/trunk/ChangeLog 2015-03-05 00:28:15 UTC (rev 60832)
@@ -1,3 +1,41 @@
+ 2015-03-04 19:29 egorpugin
+ M CMakeLists.txt
+[build][cmake] Add compiler switch '/MT(d)' for MSVC. Use '-DMSVC_STATIC_RUNTIME=1' parameter during cmake call to turn on static runtime linking.
+
+ 2015-03-04 17:58 dimitr
+ M src/burp/restore.epp
+Fixed CORE-4704: Generator/exception permissions get corrupted after backup/restore.
+
+ 2015-03-04 16:18 alexpeshkoff
+ M src/dsql/dsql.cpp
+ M src/dsql/dsql.h
+ M src/jrd/EngineInterface.h
+ M src/jrd/JrdStatement.cpp
+ M src/jrd/JrdStatement.h
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd_proto.h
+ M src/jrd/svc.cpp
+ M src/jrd/svc.h
+Full fix for CORE-4698, also fixed some more or less related leaks, segfaults and assertions
+
+ 2015-03-04 16:01 alexpeshkoff
+ M src/common/classes/RefMutex.h
+Perform non-atomic counter operations under locked mutex
+
+ 2015-03-04 15:21 asfernandes
+ M src/include/firebird/UdrCppEngine.h
+Correction.
+
+ 2015-03-04 10:49 hvlad
+ M src/yvalve/MasterImplementation.cpp
+Fixed rare deadlock (take cleanupMutex before StringsBuffer::mutex)
+
+ 2015-03-04 10:37 hvlad
+ M src/jrd/btr.cpp
+ M src/jrd/pcmet.epp
+Additional patch for CORE-4671 : Release internal temporary blobs early to free some memory\disk space
+The patch fixed AV when expression indices with blob-based expression is built (see CORE-952, for example)
+
2015-02-27 16:01 alexpeshkoff
M src/common/classes/vector.h
Most of methods of vector never throw
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-03-04 19:29:24 UTC (rev 60831)
+++ firebird/trunk/src/jrd/build_no.h 2015-03-05 00:28:15 UTC (rev 60832)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31690
+ FORMAL BUILD NUMBER:31697
*/
-#define PRODUCT_VER_STRING "3.0.0.31690"
-#define FILE_VER_STRING "WI-T3.0.0.31690"
-#define LICENSE_VER_STRING "WI-T3.0.0.31690"
-#define FILE_VER_NUMBER 3, 0, 0, 31690
+#define PRODUCT_VER_STRING "3.0.0.31697"
+#define FILE_VER_STRING "WI-T3.0.0.31697"
+#define LICENSE_VER_STRING "WI-T3.0.0.31697"
+#define FILE_VER_NUMBER 3, 0, 0, 31697
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31690"
+#define FB_BUILD_NO "31697"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-03-04 19:29:24 UTC (rev 60831)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-03-05 00:28:15 UTC (rev 60832)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31690
+BuildNum=31697
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-03-06 00:15:54
|
Revision: 60840
http://sourceforge.net/p/firebird/code/60840
Author: firebirds
Date: 2015-03-06 00:15:52 +0000 (Fri, 06 Mar 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-03-05 18:26:17 UTC (rev 60839)
+++ firebird/trunk/ChangeLog 2015-03-06 00:15:52 UTC (rev 60840)
@@ -1,3 +1,40 @@
+ 2015-03-05 16:18 alexpeshkoff
+ M src/jrd/DataTypeUtil.cpp
+ M src/jrd/Database.cpp
+ M src/jrd/ExtEngineManager.cpp
+ M src/jrd/Function.epp
+ M src/jrd/UserManagement.h
+ M src/jrd/blb.cpp
+ M src/jrd/blob_filter.cpp
+ M src/jrd/cmp.cpp
+ M src/jrd/cvt2.cpp
+ M src/jrd/dfw.epp
+ M src/jrd/dpm.epp
+ M src/jrd/dyn_util.epp
+ M src/jrd/evl.cpp
+ M src/jrd/extds/ExtDS.cpp
+ M src/jrd/extds/IscDS.h
+ M src/jrd/filters.cpp
+ M src/jrd/fun.epp
+ M src/jrd/grant.epp
+ M src/jrd/inf.cpp
+ M src/jrd/ini.epp
+ M src/jrd/intl.h
+ M src/jrd/jrd.cpp
+ M src/jrd/met.epp
+ M src/jrd/opt.cpp
+ M src/jrd/os/posix/unix.cpp
+ M src/jrd/pag.cpp
+ M src/jrd/par.cpp
+ M src/jrd/pcmet.epp
+ M src/jrd/scl.epp
+ M src/jrd/shut.cpp
+ M src/jrd/svc.cpp
+ M src/jrd/tra.cpp
+ M src/jrd/trace/TraceService.cpp
+ M src/jrd/vio.cpp
+cleanup
+
2015-03-04 19:29 egorpugin
M CMakeLists.txt
[build][cmake] Add compiler switch '/MT(d)' for MSVC. Use '-DMSVC_STATIC_RUNTIME=1' parameter during cmake call to turn on static runtime linking.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-03-05 18:26:17 UTC (rev 60839)
+++ firebird/trunk/src/jrd/build_no.h 2015-03-06 00:15:52 UTC (rev 60840)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31697
+ FORMAL BUILD NUMBER:31698
*/
-#define PRODUCT_VER_STRING "3.0.0.31697"
-#define FILE_VER_STRING "WI-T3.0.0.31697"
-#define LICENSE_VER_STRING "WI-T3.0.0.31697"
-#define FILE_VER_NUMBER 3, 0, 0, 31697
+#define PRODUCT_VER_STRING "3.0.0.31698"
+#define FILE_VER_STRING "WI-T3.0.0.31698"
+#define LICENSE_VER_STRING "WI-T3.0.0.31698"
+#define FILE_VER_NUMBER 3, 0, 0, 31698
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31697"
+#define FB_BUILD_NO "31698"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-03-05 18:26:17 UTC (rev 60839)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-03-06 00:15:52 UTC (rev 60840)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31697
+BuildNum=31698
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-03-07 00:13:27
|
Revision: 60852
http://sourceforge.net/p/firebird/code/60852
Author: firebirds
Date: 2015-03-07 00:13:20 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-03-06 20:43:57 UTC (rev 60851)
+++ firebird/trunk/ChangeLog 2015-03-07 00:13:20 UTC (rev 60852)
@@ -1,3 +1,20 @@
+ 2015-03-06 20:43 dimitr
+ M src/jrd/jrd.cpp
+Fixed a possible reason for CORE-4705. Alex, please review.
+
+ 2015-03-06 14:04 dimitr
+ M src/jrd/Optimizer.cpp
+Fixed inconsistency between unique vs non-unique retrievals (see CORE-4702).
+
+ 2015-03-06 10:24 dimitr
+ M src/jrd/Optimizer.cpp
+Minor adjustments to the join order selection.
+
+ 2015-03-06 09:02 paulbeach
+ M builds/install/arch-specific/darwin/install-script
+ A builds/install/arch-specific/darwin/launchdss.org.firebird.gds.plist
+StartupItems is now deprecated on Yosemite (10.10), use launchctl for SuperServer as well as Classic
+
2015-03-05 16:18 alexpeshkoff
M src/jrd/DataTypeUtil.cpp
M src/jrd/Database.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-03-06 20:43:57 UTC (rev 60851)
+++ firebird/trunk/src/jrd/build_no.h 2015-03-07 00:13:20 UTC (rev 60852)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31698
+ FORMAL BUILD NUMBER:31702
*/
-#define PRODUCT_VER_STRING "3.0.0.31698"
-#define FILE_VER_STRING "WI-T3.0.0.31698"
-#define LICENSE_VER_STRING "WI-T3.0.0.31698"
-#define FILE_VER_NUMBER 3, 0, 0, 31698
+#define PRODUCT_VER_STRING "3.0.0.31702"
+#define FILE_VER_STRING "WI-T3.0.0.31702"
+#define LICENSE_VER_STRING "WI-T3.0.0.31702"
+#define FILE_VER_NUMBER 3, 0, 0, 31702
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31698"
+#define FB_BUILD_NO "31702"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-03-06 20:43:57 UTC (rev 60851)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-03-07 00:13:20 UTC (rev 60852)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31698
+BuildNum=31702
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ego...@us...> - 2015-03-08 13:20:13
|
Revision: 60874
http://sourceforge.net/p/firebird/code/60874
Author: egorpugin
Date: 2015-03-08 13:20:06 +0000 (Sun, 08 Mar 2015)
Log Message:
-----------
[build] [cmake] Fix OS X build.
Modified Paths:
--------------
firebird/trunk/CMakeLists.txt
firebird/trunk/src/CMakeLists.txt
Modified: firebird/trunk/CMakeLists.txt
===================================================================
--- firebird/trunk/CMakeLists.txt 2015-03-08 13:19:50 UTC (rev 60873)
+++ firebird/trunk/CMakeLists.txt 2015-03-08 13:20:06 UTC (rev 60874)
@@ -220,7 +220,7 @@
set(LIB_iconv iconv)
endif()
-if (FREEBSD)
+if (FREEBSD OR APPLE)
include_directories(/usr/local/include)
link_directories(/usr/local/lib)
endif()
Modified: firebird/trunk/src/CMakeLists.txt
===================================================================
--- firebird/trunk/src/CMakeLists.txt 2015-03-08 13:19:50 UTC (rev 60873)
+++ firebird/trunk/src/CMakeLists.txt 2015-03-08 13:20:06 UTC (rev 60874)
@@ -617,7 +617,7 @@
if (NOT CMAKE_CROSSCOMPILING)
add_executable (gpre_boot ${gpre_boot_src} ${VERSION_RC})
-target_link_libraries (gpre_boot gpre_common common ${LIB_Ws2_32})
+target_link_libraries (gpre_boot gpre_common common ${LIB_iconv} ${LIB_Ws2_32})
set_output_directory (gpre_boot . CURRENT_DIR)
project_group (gpre_boot Boot)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-03-09 00:12:36
|
Revision: 60879
http://sourceforge.net/p/firebird/code/60879
Author: firebirds
Date: 2015-03-09 00:12:29 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-03-08 23:29:20 UTC (rev 60878)
+++ firebird/trunk/ChangeLog 2015-03-09 00:12:29 UTC (rev 60879)
@@ -1,3 +1,8 @@
+ 2015-03-08 13:20 egorpugin
+ M CMakeLists.txt
+ M src/CMakeLists.txt
+[build] [cmake] Fix OS X build.
+
2015-03-06 20:43 dimitr
M src/jrd/jrd.cpp
Fixed a possible reason for CORE-4705. Alex, please review.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-03-08 23:29:20 UTC (rev 60878)
+++ firebird/trunk/src/jrd/build_no.h 2015-03-09 00:12:29 UTC (rev 60879)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31702
+ FORMAL BUILD NUMBER:31703
*/
-#define PRODUCT_VER_STRING "3.0.0.31702"
-#define FILE_VER_STRING "WI-T3.0.0.31702"
-#define LICENSE_VER_STRING "WI-T3.0.0.31702"
-#define FILE_VER_NUMBER 3, 0, 0, 31702
+#define PRODUCT_VER_STRING "3.0.0.31703"
+#define FILE_VER_STRING "WI-T3.0.0.31703"
+#define LICENSE_VER_STRING "WI-T3.0.0.31703"
+#define FILE_VER_NUMBER 3, 0, 0, 31703
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31702"
+#define FB_BUILD_NO "31703"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-03-08 23:29:20 UTC (rev 60878)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-03-09 00:12:29 UTC (rev 60879)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31702
+BuildNum=31703
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-03-11 00:12:11
|
Revision: 60897
http://sourceforge.net/p/firebird/code/60897
Author: firebirds
Date: 2015-03-11 00:12:03 +0000 (Wed, 11 Mar 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-03-10 23:35:24 UTC (rev 60896)
+++ firebird/trunk/ChangeLog 2015-03-11 00:12:03 UTC (rev 60897)
@@ -1,3 +1,11 @@
+ 2015-03-10 16:05 asfernandes
+ M src/isql/isql.epp
+Fixed CORE-4706 - ISQL pads blob columns wrongly when the column alias has more than 17 characters.
+
+ 2015-03-10 13:48 alexpeshkoff
+ M src/jrd/dfw.epp
+Postfix for CORE-4571: avoid processing same index more than once when it has segments with different charsets
+
2015-03-08 13:20 egorpugin
M CMakeLists.txt
M src/CMakeLists.txt
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-03-10 23:35:24 UTC (rev 60896)
+++ firebird/trunk/src/jrd/build_no.h 2015-03-11 00:12:03 UTC (rev 60897)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31703
+ FORMAL BUILD NUMBER:31705
*/
-#define PRODUCT_VER_STRING "3.0.0.31703"
-#define FILE_VER_STRING "WI-T3.0.0.31703"
-#define LICENSE_VER_STRING "WI-T3.0.0.31703"
-#define FILE_VER_NUMBER 3, 0, 0, 31703
+#define PRODUCT_VER_STRING "3.0.0.31705"
+#define FILE_VER_STRING "WI-T3.0.0.31705"
+#define LICENSE_VER_STRING "WI-T3.0.0.31705"
+#define FILE_VER_NUMBER 3, 0, 0, 31705
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31703"
+#define FB_BUILD_NO "31705"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-03-10 23:35:24 UTC (rev 60896)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-03-11 00:12:03 UTC (rev 60897)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31703
+BuildNum=31705
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-03-12 00:13:02
|
Revision: 60935
http://sourceforge.net/p/firebird/code/60935
Author: firebirds
Date: 2015-03-12 00:12:59 +0000 (Thu, 12 Mar 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-03-11 21:20:56 UTC (rev 60934)
+++ firebird/trunk/ChangeLog 2015-03-12 00:12:59 UTC (rev 60935)
@@ -1,3 +1,13 @@
+ 2015-03-11 13:39 alexpeshkoff
+ M src/jrd/DbCreators.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd_proto.h
+Fixed role's case handling when checking grant for create database - thanks to Claudio
+
+ 2015-03-11 13:37 alexpeshkoff
+ M src/isql/show.epp
+Fixed BOF, cleanup misc
+
2015-03-10 16:05 asfernandes
M src/isql/isql.epp
Fixed CORE-4706 - ISQL pads blob columns wrongly when the column alias has more than 17 characters.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-03-11 21:20:56 UTC (rev 60934)
+++ firebird/trunk/src/jrd/build_no.h 2015-03-12 00:12:59 UTC (rev 60935)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31705
+ FORMAL BUILD NUMBER:31707
*/
-#define PRODUCT_VER_STRING "3.0.0.31705"
-#define FILE_VER_STRING "WI-T3.0.0.31705"
-#define LICENSE_VER_STRING "WI-T3.0.0.31705"
-#define FILE_VER_NUMBER 3, 0, 0, 31705
+#define PRODUCT_VER_STRING "3.0.0.31707"
+#define FILE_VER_STRING "WI-T3.0.0.31707"
+#define LICENSE_VER_STRING "WI-T3.0.0.31707"
+#define FILE_VER_NUMBER 3, 0, 0, 31707
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31705"
+#define FB_BUILD_NO "31707"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-03-11 21:20:56 UTC (rev 60934)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-03-12 00:12:59 UTC (rev 60935)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31705
+BuildNum=31707
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-03-13 00:13:36
|
Revision: 60969
http://sourceforge.net/p/firebird/code/60969
Author: firebirds
Date: 2015-03-13 00:13:34 +0000 (Fri, 13 Mar 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-03-12 21:52:47 UTC (rev 60968)
+++ firebird/trunk/ChangeLog 2015-03-13 00:13:34 UTC (rev 60969)
@@ -1,3 +1,7 @@
+ 2015-03-12 21:52 dimitr
+ M src/yvalve/gds.cpp
+Improved BLR printer for scrollable cursors. It also fixes ISQL crash for core-0883.fbt.
+
2015-03-11 13:39 alexpeshkoff
M src/jrd/DbCreators.cpp
M src/jrd/jrd.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-03-12 21:52:47 UTC (rev 60968)
+++ firebird/trunk/src/jrd/build_no.h 2015-03-13 00:13:34 UTC (rev 60969)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31707
+ FORMAL BUILD NUMBER:31708
*/
-#define PRODUCT_VER_STRING "3.0.0.31707"
-#define FILE_VER_STRING "WI-T3.0.0.31707"
-#define LICENSE_VER_STRING "WI-T3.0.0.31707"
-#define FILE_VER_NUMBER 3, 0, 0, 31707
+#define PRODUCT_VER_STRING "3.0.0.31708"
+#define FILE_VER_STRING "WI-T3.0.0.31708"
+#define LICENSE_VER_STRING "WI-T3.0.0.31708"
+#define FILE_VER_NUMBER 3, 0, 0, 31708
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31707"
+#define FB_BUILD_NO "31708"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-03-12 21:52:47 UTC (rev 60968)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-03-13 00:13:34 UTC (rev 60969)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31707
+BuildNum=31708
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2015-03-13 15:26:30
|
Revision: 60981
http://sourceforge.net/p/firebird/code/60981
Author: robocop
Date: 2015-03-13 15:26:22 +0000 (Fri, 13 Mar 2015)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/examples/interfaces/01.create.cpp
firebird/trunk/src/common/StatusArg.cpp
firebird/trunk/src/common/StatusHolder.h
firebird/trunk/src/common/isc_file.cpp
firebird/trunk/src/common/os/posix/os_utils.cpp
firebird/trunk/src/common/utils.cpp
firebird/trunk/src/dsql/DdlNodes.epp
firebird/trunk/src/dsql/ExprNodes.cpp
firebird/trunk/src/gpre/cmp.cpp
firebird/trunk/src/gpre/sql.cpp
firebird/trunk/src/isql/isql.epp
firebird/trunk/src/jrd/Record.h
firebird/trunk/src/jrd/cch.cpp
firebird/trunk/src/jrd/dpm.epp
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/opt.cpp
firebird/trunk/src/jrd/pag.cpp
firebird/trunk/src/jrd/trace/TraceObjects.cpp
firebird/trunk/src/remote/SockAddr.h
firebird/trunk/src/remote/client/interface.cpp
firebird/trunk/src/remote/inet.cpp
firebird/trunk/src/remote/remote.cpp
firebird/trunk/src/remote/remote.h
firebird/trunk/src/remote/server/server.cpp
firebird/trunk/src/yvalve/PluginManager.cpp
Modified: firebird/trunk/examples/interfaces/01.create.cpp
===================================================================
--- firebird/trunk/examples/interfaces/01.create.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/examples/interfaces/01.create.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -2,7 +2,7 @@
* PROGRAM: Object oriented API samples.
* MODULE: 01.create.cpp
* DESCRIPTION: A sample of creating new database and new table in it.
- * Run second time (whene database already exists) to see
+ * Run second time (when database already exists) to see
* how FbException is caught and handled by this code.
*
* Example for the following interfaces:
Modified: firebird/trunk/src/common/StatusArg.cpp
===================================================================
--- firebird/trunk/src/common/StatusArg.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/common/StatusArg.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -71,7 +71,8 @@
}
}
-StatusVector::ImplStatusVector::ImplStatusVector(const IStatus* s) throw() : Base::ImplBase(0, 0)
+StatusVector::ImplStatusVector::ImplStatusVector(const IStatus* s) throw() :
+ Base::ImplBase(0, 0)
{
fb_assert(s);
@@ -84,7 +85,8 @@
append(s->getWarnings(), FB_NELEM(m_status_vector) - 1);
}
-StatusVector::ImplStatusVector::ImplStatusVector(const Exception& ex) throw() : Base::ImplBase(0, 0)
+StatusVector::ImplStatusVector::ImplStatusVector(const Exception& ex) throw() :
+ Base::ImplBase(0, 0)
{
assign(ex);
}
Modified: firebird/trunk/src/common/StatusHolder.h
===================================================================
--- firebird/trunk/src/common/StatusHolder.h 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/common/StatusHolder.h 2015-03-13 15:26:22 UTC (rev 60981)
@@ -49,7 +49,7 @@
: HalfStaticArray<ISC_STATUS, S>()
{ }
- SimpleStatusVector(MemoryPool& p)
+ explicit SimpleStatusVector(MemoryPool& p)
: HalfStaticArray<ISC_STATUS, S>(p)
{ }
};
@@ -60,7 +60,7 @@
class DynamicVector : private SimpleStatusVector<S>
{
public:
- DynamicVector(MemoryPool& p)
+ explicit DynamicVector(MemoryPool& p)
: SimpleStatusVector<S>(p)
{
fb_utils::init_status(this->getBuffer(3));
@@ -192,7 +192,7 @@
}
public:
- BaseStatus(MemoryPool& p)
+ explicit BaseStatus(MemoryPool& p)
: errors(p), warnings(p)
{
init();
Modified: firebird/trunk/src/common/isc_file.cpp
===================================================================
--- firebird/trunk/src/common/isc_file.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/common/isc_file.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -1398,7 +1398,7 @@
TEXT device[128], mount_point[128], m_type[16], opts[256], ftime[128];
const int n = fscanf(mnt_tab.mtab, "%s %s %s %s %s ", device, mount_point, type, opts, ftime);
- if (n<5)
+ if (n < 5)
return false;
mount = mount_point;
Modified: firebird/trunk/src/common/os/posix/os_utils.cpp
===================================================================
--- firebird/trunk/src/common/os/posix/os_utils.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/common/os/posix/os_utils.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -234,7 +234,7 @@
#endif
}
-// check if OS have support for IPv6 protocol
+// check if OS has support for IPv6 protocol
bool isIPv6supported()
{
#ifdef ANDROID
@@ -281,7 +281,7 @@
return f;
}
-static void makeUniqueFileId(struct stat& statistics, UCharBuffer& id)
+static void makeUniqueFileId(const struct stat& statistics, UCharBuffer& id)
{
const size_t len1 = sizeof(statistics.st_dev);
const size_t len2 = sizeof(statistics.st_ino);
Modified: firebird/trunk/src/common/utils.cpp
===================================================================
--- firebird/trunk/src/common/utils.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/common/utils.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -1137,7 +1137,7 @@
{
const ISC_STATUS* s;
unsigned int copied = 0;
- int state = from->getState();
+ const int state = from->getState();
ISC_STATUS* to = dest;
if (state & Firebird::IStatus::STATE_ERRORS)
Modified: firebird/trunk/src/dsql/DdlNodes.epp
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.epp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/dsql/DdlNodes.epp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -124,6 +124,7 @@
if (!secDbContext)
{
Attachment* lAtt = localTransaction->getAttachment();
+ fb_assert(lAtt && lAtt->att_database && lAtt->att_database->dbb_config); // paranoid check
const char* secDb = lAtt->att_database->dbb_config->getSecurityDatabase();
ClumpletWriter dpb(ClumpletWriter::WideTagged, MAX_DPB_SIZE, isc_dpb_version2);
if (lAtt->att_user)
@@ -7061,7 +7062,7 @@
dsql_rel* relation;
relation = METD_get_relation(dsqlScratch->getTransaction(), dsqlScratch, name);
- if (!relation || (relation && (relation->rel_flags & REL_view)))
+ if (!relation || (relation->rel_flags & REL_view))
{
status_exception::raise(
Arg::Gds(isc_sqlerr) << Arg::Num(-607) <<
Modified: firebird/trunk/src/dsql/ExprNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/ExprNodes.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/dsql/ExprNodes.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -6843,7 +6843,7 @@
(context->ctx_flags & CTX_cursor) &&
val->is<FieldNode>())
{
- // ASF: FieldNode::execute do not verify rpb_number.isValid(), and due to system triggers
+ // ASF: FieldNode::execute does not verify rpb_number.isValid(), and due to system triggers
// and also singular queries, we cannot start to do it. So to fix CORE-4488, we introduce
// the usage of blr_derived_expr for cursor fields, which in practice prefixes the
// FieldNode::execute by a test of rpb_number.isValid().
Modified: firebird/trunk/src/gpre/cmp.cpp
===================================================================
--- firebird/trunk/src/gpre/cmp.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/gpre/cmp.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -442,8 +442,9 @@
{
*p++ = lock_block->rrl_lock_mode;
const char* q = lock_block->rrl_relation->rel_symbol->sym_string;
- *p++ = static_cast<char>(strlen(q));
- while (*q)
+ UCHAR temp = static_cast<UCHAR>(strlen(q));
+ *p++ = temp;
+ while (*q && temp-- > 0)
*p++ = *q++;
*p++ = lock_block->rrl_lock_level;
}
@@ -1016,18 +1017,19 @@
CME_rse(selection, request);
request->add_byte(blr_begin);
+ const bool isReturning = request->req_flags & REQ_sql_returning;
gpre_nod* node = (req_node->nod_type == nod_list) ? req_node->nod_arg[0] : req_node;
switch (node->nod_type)
{
case nod_modify:
{
- const int blr_op = (request->req_flags & REQ_sql_returning) ? blr_modify2 : blr_modify;
+ const int blr_op = isReturning ? blr_modify2 : blr_modify;
request->add_byte(blr_op);
request->add_byte(for_context->ctx_internal);
request->add_byte(update_context->ctx_internal);
cmp_assignment_list(node->nod_arg[0], request);
- if (request->req_flags & REQ_sql_returning)
+ if (isReturning)
cmp_returning(request, node->nod_arg[1]);
}
break;
@@ -1035,7 +1037,7 @@
cmp_store(request, node);
break;
case nod_erase:
- if (request->req_flags & REQ_sql_returning)
+ if (isReturning)
{
request->add_byte(blr_begin);
cmp_returning(request, node->nod_arg[0]);
Modified: firebird/trunk/src/gpre/sql.cpp
===================================================================
--- firebird/trunk/src/gpre/sql.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/gpre/sql.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -4817,7 +4817,7 @@
gpre_req* request = MSC_request(REQ_mass_update);
request->req_trans = transaction;
- gpre_ctx* context = SQE_context(request);
+ gpre_ctx* const context = SQE_context(request);
gpre_rel* relation = context->ctx_relation;
int count = 0;
Modified: firebird/trunk/src/isql/isql.epp
===================================================================
--- firebird/trunk/src/isql/isql.epp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/isql/isql.epp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -164,7 +164,7 @@
const int MAX_TERMS = 10; // max # of terms in an interactive cmd
const char* ISQL_COUNTERS_SET = "CurrentMemory, MaxMemory, RealTime, UserTime, Buffers, Reads, Writes, Fetches";
-#define ISQL_COUNTERS 8
+const int ISQL_COUNTERS = 8;
namespace IcuUtil
@@ -2596,9 +2596,12 @@
return (SKIP);
}
+ unsigned prepFlags = Firebird::IStatement::PREPARE_PREFETCH_METADATA |
+ (setValues.Plan ? Firebird::IStatement::PREPARE_PREFETCH_DETAILED_PLAN : 0);
+
global_Stmt = DB->prepare(fbStatus, setValues.Autocommit ? D__trans : M__trans, 0, command,
- isqlGlob.SQL_dialect, Firebird::IStatement::PREPARE_PREFETCH_METADATA |
- (setValues.Plan ? Firebird::IStatement::PREPARE_PREFETCH_DETAILED_PLAN : 0));
+ isqlGlob.SQL_dialect, prepFlags);
+
if (failed())
{
if (isqlGlob.SQL_dialect == SQL_DIALECT_V6_TRANSITION && Input_file)
@@ -3272,7 +3275,7 @@
if (done)
{
- // Save whatever we were able to pump, except when the failed was the commit itself.
+ // Save whatever we were able to pump, except when the failure was the commit itself.
if (M__trans)
{
if (commit_failedM)
@@ -4383,7 +4386,7 @@
Ofp.close();
PathName tmpfile = Ofp.fileName(false);
gds__edit(tmpfile.c_str(), 0);
- Ofp.init(fopen(tmpfile.c_str(), "r+"), tmpfile.c_str(), tmpfile.c_str()); // We don't check for failed.
+ Ofp.init(fopen(tmpfile.c_str(), "r+"), tmpfile.c_str(), tmpfile.c_str()); // We don't check for failure.
Filelist->Ifp().init(Ofp);
Input_file = true;
getColumn = -1;
@@ -4406,7 +4409,7 @@
* either commit or rollback
*
* Called by newtrans, createdb, newdb;
- * Returns success or failed.
+ * Returns success or failure.
*
**************************************/
@@ -7745,7 +7748,7 @@
isqlGlob.printf("%s%s", line, NEWLINE);
- // If blobdisplay is not wanted, set varnum back to -1
+ // If blobdisplay is not wanted, set varnum back to 0
if (setValues.Doblob == NO_BLOBS)
varnum = 0;
@@ -7932,7 +7935,7 @@
// p r o c e s s _ p l a n
// ***********************
// Retrieve and show the server's execution plan.
-// We don't consider critical a failed to get the plan, so we don't return
+// We don't consider critical a failure to get the plan, so we don't return
// any result to the caller.
static void process_plan()
{
@@ -8064,7 +8067,7 @@
// p r o c e s s _ r e q u e s t _ t y p e
// ***************************************
// Retrieve the statement type according to the DSQL layer.
-// A failed is indicated by returning zero.
+// A failure is indicated by returning zero.
static int process_request_type()
{
if (!global_Stmt)
Modified: firebird/trunk/src/jrd/Record.h
===================================================================
--- firebird/trunk/src/jrd/Record.h 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/jrd/Record.h 2015-03-13 15:26:22 UTC (rev 60981)
@@ -126,7 +126,7 @@
memcpy(getData(), data, getLength());
}
- void copyDataTo(UCHAR* data)
+ void copyDataTo(UCHAR* data) const
{
memcpy(data, getData(), getLength());
}
@@ -179,7 +179,7 @@
class AutoTempRecord
{
public:
- AutoTempRecord(Record* record = NULL)
+ explicit AutoTempRecord(Record* record = NULL)
: m_record(record)
{
// validate record and its flag
Modified: firebird/trunk/src/jrd/cch.cpp
===================================================================
--- firebird/trunk/src/jrd/cch.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/jrd/cch.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -3841,7 +3841,7 @@
QUE_DELETE(bdb->bdb_que);
QUE_INSERT(bcb->bcb_pending, bdb->bdb_que);
- const bool needCleanup = bdb->bdb_flags & (BDB_dirty | BDB_db_dirty) ||
+ const bool needCleanup = (bdb->bdb_flags & (BDB_dirty | BDB_db_dirty)) ||
QUE_NOT_EMPTY(bdb->bdb_higher) || QUE_NOT_EMPTY(bdb->bdb_lower);
if (needCleanup)
Modified: firebird/trunk/src/jrd/dpm.epp
===================================================================
--- firebird/trunk/src/jrd/dpm.epp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/jrd/dpm.epp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -3116,7 +3116,7 @@
// Look for space anywhere
// Make few tries to lock consecutive data pages without waiting. In highly
- // concurrent environment with shared page cache it could be faster then wait
+ // concurrent environment with shared page cache it could be faster than wait
// in OS for first candidate page.
int tries = dbb->dbb_config->getSharedCache() ? 8 : 0;
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/jrd/jrd.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -6016,7 +6016,7 @@
{
/**************************************
*
- * i n i t
+ * i n i t A t t a c h m e n t
*
**************************************
*
@@ -6025,7 +6025,7 @@
* Upon entry mutex dbInitMutex must be locked.
*
**************************************/
- RefDeb(DEB_AR_JATT, "jrd/init()");
+ RefDeb(DEB_AR_JATT, "jrd/initAttachment()");
SET_TDBB(tdbb);
fb_assert(dbInitMutex->locked());
Modified: firebird/trunk/src/jrd/opt.cpp
===================================================================
--- firebird/trunk/src/jrd/opt.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/jrd/opt.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -909,7 +909,7 @@
if (needIndices && !relation->rel_file && !relation->isVirtual())
{
- csb->csb_rpt[stream].csb_indices = BTR_all(tdbb, relation, &tail->csb_idx, relPages);
+ tail->csb_indices = BTR_all(tdbb, relation, &tail->csb_idx, relPages);
if (tail->csb_plan)
mark_indices(tail, relation->rel_id);
@@ -917,9 +917,9 @@
sort_indices_by_selectivity(tail);
}
else
- csb->csb_rpt[stream].csb_indices = 0;
+ tail->csb_indices = 0;
- csb->csb_rpt[stream].csb_cardinality =
+ tail->csb_cardinality =
get_cardinality(tdbb, relation, CMP_format(tdbb, csb, stream));
}
@@ -2282,7 +2282,7 @@
else if (relation->isVirtual())
{
// Virtual table: monitoring or security
- switch(relation->rel_id)
+ switch (relation->rel_id)
{
case rel_global_auth_mapping:
rsb = FB_NEW(*tdbb->getDefaultPool()) GlobalMappingScan(csb, alias, stream, relation);
@@ -3070,7 +3070,7 @@
if (relation->isVirtual())
{
// Just a dumb estimation
- return (double) 100;
+ return 100.0;
}
if (relation->rel_file)
Modified: firebird/trunk/src/jrd/pag.cpp
===================================================================
--- firebird/trunk/src/jrd/pag.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/jrd/pag.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -2333,7 +2333,7 @@
}
}
return tempPageSpaceID;
-};
+}
ULONG PAG_page_count(Database* database, PageCountCallback* cb)
{
Modified: firebird/trunk/src/jrd/trace/TraceObjects.cpp
===================================================================
--- firebird/trunk/src/jrd/trace/TraceObjects.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/jrd/trace/TraceObjects.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -508,7 +508,7 @@
void* TraceServiceImpl::getServiceID()
{
- return (void*)m_svc;
+ return (void*) m_svc;
}
const char* TraceServiceImpl::getServiceMgr()
Modified: firebird/trunk/src/remote/SockAddr.h
===================================================================
--- firebird/trunk/src/remote/SockAddr.h 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/remote/SockAddr.h 2015-03-13 15:26:22 UTC (rev 60981)
@@ -143,7 +143,8 @@
inline unsigned short SockAddr::port() const
{
const struct sockaddr* sa = (const struct sockaddr*) data;
- switch(sa->sa_family) {
+ switch (sa->sa_family)
+ {
case AF_INET:
return ntohs(((const struct sockaddr_in*) data)->sin_port);
case AF_INET6:
@@ -156,7 +157,8 @@
inline void SockAddr::setPort(unsigned short x)
{
const struct sockaddr* sa = (const struct sockaddr*) data;
- switch(sa->sa_family) {
+ switch (sa->sa_family)
+ {
case AF_INET:
((struct sockaddr_in*) data)->sin_port = htons(x);
return;
Modified: firebird/trunk/src/remote/client/interface.cpp
===================================================================
--- firebird/trunk/src/remote/client/interface.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/remote/client/interface.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -1855,7 +1855,7 @@
ResultSet* Statement::openCursor(CheckStatusWrapper* status, Firebird::ITransaction* apiTra,
- IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outFormat, unsigned int flags)
+ IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outFormat, unsigned int /*flags*/)
{
/**************************************
*
Modified: firebird/trunk/src/remote/inet.cpp
===================================================================
--- firebird/trunk/src/remote/inet.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/remote/inet.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -1779,10 +1779,8 @@
return 0;
}
-#endif
-#ifdef WIN_NT
// Windows does not have an inet_aton function.
bool inet_aton(const char* name, in_addr* address)
{
Modified: firebird/trunk/src/remote/remote.cpp
===================================================================
--- firebird/trunk/src/remote/remote.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/remote/remote.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -1360,7 +1360,7 @@
return NULL;
}
-void rem_port::versionInfo(Firebird::string& version)
+void rem_port::versionInfo(Firebird::string& version) const
{
version.printf("%s/%s", FB_VERSION, port_version->str_data);
#ifndef WIRE_COMPRESS_SUPPORT
@@ -1382,7 +1382,7 @@
class ZLib
{
public:
- ZLib(Firebird::MemoryPool&)
+ explicit ZLib(Firebird::MemoryPool&)
{
#ifdef WIN_NT
const char* name = "zlib1.dll";
@@ -1520,10 +1520,11 @@
return false;
}
- if (strm.next_in != &port->port_compressed[REM_RECV_OFFSET(port->port_buff_size)])
+ UCHAR* compressed = &port->port_compressed[REM_RECV_OFFSET(port->port_buff_size)];
+ if (strm.next_in != compressed)
{
- memmove(&port->port_compressed[REM_RECV_OFFSET(port->port_buff_size)], strm.next_in, strm.avail_in);
- strm.next_in = &port->port_compressed[REM_RECV_OFFSET(port->port_buff_size)];
+ memmove(compressed, strm.next_in, strm.avail_in);
+ strm.next_in = compressed;
}
}
else
@@ -1560,7 +1561,7 @@
z_stream& strm = port->port_send_stream;
strm.avail_in = xdrs->x_private - xdrs->x_base;
- strm.next_in = (Bytef*)xdrs->x_base;
+ strm.next_in = (Bytef*) xdrs->x_base;
if (!strm.next_out)
{
@@ -1666,6 +1667,7 @@
zlib().inflateEnd(&port_recv_stream);
throw;
}
+
memset(port_compressed, 0, port_buff_size * 2);
port_recv_stream.next_in = &port_compressed[REM_RECV_OFFSET(port_buff_size)];
Modified: firebird/trunk/src/remote/remote.h
===================================================================
--- firebird/trunk/src/remote/remote.h 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/remote/remote.h 2015-03-13 15:26:22 UTC (rev 60981)
@@ -664,10 +664,10 @@
void set(unsigned keyLength, const void* key)
{
- assign(reinterpret_cast<const UCHAR*>(key), keyLength);
+ assign(static_cast<const UCHAR*>(key), keyLength);
}
- const void* get(unsigned* length)
+ const void* get(unsigned* length) const
{
if (getCount() > 0)
{
@@ -1019,7 +1019,7 @@
void linkParent(rem_port* const parent);
void unlinkParent();
const Firebird::RefPtr<Config>& getPortConfig() const;
- void versionInfo(Firebird::string& version);
+ void versionInfo(Firebird::string& version) const;
bool extractNewKeys(CSTRING* to, bool flagPlugList = false)
{
Modified: firebird/trunk/src/remote/server/server.cpp
===================================================================
--- firebird/trunk/src/remote/server/server.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/remote/server/server.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -3220,7 +3220,7 @@
this->port_statement->rsr_format = this->port_statement->rsr_select_format;
sendL->p_operation = op_sql_response;
- sendL->p_sqldata.p_sqldata_messages = (status_vector.getState() & Firebird::IStatus::STATE_ERRORS || !out_msg) ? 0 : 1;
+ sendL->p_sqldata.p_sqldata_messages = ((status_vector.getState() & Firebird::IStatus::STATE_ERRORS) || !out_msg) ? 0 : 1;
this->send_partial(sendL);
}
Modified: firebird/trunk/src/yvalve/PluginManager.cpp
===================================================================
--- firebird/trunk/src/yvalve/PluginManager.cpp 2015-03-13 13:12:21 UTC (rev 60980)
+++ firebird/trunk/src/yvalve/PluginManager.cpp 2015-03-13 15:26:22 UTC (rev 60981)
@@ -727,7 +727,7 @@
RefPtr<ConfigFile> conf;
bool required;
- PluginLoadInfo(const char* pluginName)
+ explicit PluginLoadInfo(const char* pluginName)
{
// define default values for plugin ...
curModule = fb_utils::getPrefix(IConfigManager::DIR_PLUGINS, pluginName);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-03-14 00:17:02
|
Revision: 60990
http://sourceforge.net/p/firebird/code/60990
Author: firebirds
Date: 2015-03-14 00:17:00 +0000 (Sat, 14 Mar 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-03-13 20:09:10 UTC (rev 60989)
+++ firebird/trunk/ChangeLog 2015-03-14 00:17:00 UTC (rev 60990)
@@ -1,3 +1,45 @@
+ 2015-03-13 15:31 robocop
+ M src/dsql/metd.epp
+ M src/jrd/scl.epp
+rdb$system_flag is not nullable in FB3.
+
+ 2015-03-13 15:30 robocop
+ M src/jrd/idx.cpp
+ M src/jrd/vio.cpp
+Misc.
+
+ 2015-03-13 15:26 robocop
+ M examples/interfaces/01.create.cpp
+ M src/common/StatusArg.cpp
+ M src/common/StatusHolder.h
+ M src/common/isc_file.cpp
+ M src/common/os/posix/os_utils.cpp
+ M src/common/utils.cpp
+ M src/dsql/DdlNodes.epp
+ M src/dsql/ExprNodes.cpp
+ M src/gpre/cmp.cpp
+ M src/gpre/sql.cpp
+ M src/isql/isql.epp
+ M src/jrd/Record.h
+ M src/jrd/cch.cpp
+ M src/jrd/dpm.epp
+ M src/jrd/jrd.cpp
+ M src/jrd/opt.cpp
+ M src/jrd/pag.cpp
+ M src/jrd/trace/TraceObjects.cpp
+ M src/remote/SockAddr.h
+ M src/remote/client/interface.cpp
+ M src/remote/inet.cpp
+ M src/remote/remote.cpp
+ M src/remote/remote.h
+ M src/remote/server/server.cpp
+ M src/yvalve/PluginManager.cpp
+Misc.
+
+ 2015-03-13 12:07 dimitr
+ M src/jrd/opt.cpp
+Cleanup.
+
2015-03-12 21:52 dimitr
M src/yvalve/gds.cpp
Improved BLR printer for scrollable cursors. It also fixes ISQL crash for core-0883.fbt.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-03-13 20:09:10 UTC (rev 60989)
+++ firebird/trunk/src/jrd/build_no.h 2015-03-14 00:17:00 UTC (rev 60990)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31708
+ FORMAL BUILD NUMBER:31712
*/
-#define PRODUCT_VER_STRING "3.0.0.31708"
-#define FILE_VER_STRING "WI-T3.0.0.31708"
-#define LICENSE_VER_STRING "WI-T3.0.0.31708"
-#define FILE_VER_NUMBER 3, 0, 0, 31708
+#define PRODUCT_VER_STRING "3.0.0.31712"
+#define FILE_VER_STRING "WI-T3.0.0.31712"
+#define LICENSE_VER_STRING "WI-T3.0.0.31712"
+#define FILE_VER_NUMBER 3, 0, 0, 31712
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31708"
+#define FB_BUILD_NO "31712"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-03-13 20:09:10 UTC (rev 60989)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-03-14 00:17:00 UTC (rev 60990)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31708
+BuildNum=31712
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-03-18 00:13:25
|
Revision: 61000
http://sourceforge.net/p/firebird/code/61000
Author: firebirds
Date: 2015-03-18 00:13:22 +0000 (Wed, 18 Mar 2015)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2015-03-17 21:44:55 UTC (rev 60999)
+++ firebird/trunk/ChangeLog 2015-03-18 00:13:22 UTC (rev 61000)
@@ -1,3 +1,19 @@
+ 2015-03-17 21:44 asfernandes
+ M src/auth/SecurityDatabase/LegacyManagement.epp
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+ M src/jrd/Record.h
+ M src/jrd/pcmet.epp
+ M src/jrd/vio.cpp
+ M src/msgs/facilities2.sql
+ M src/remote/server/server.cpp
+ M src/yvalve/MasterImplementation.cpp
+ M src/yvalve/why.cpp
+Misc.
+
+ 2015-03-17 09:15 paulbeach
+ M builds/install/arch-specific/darwin/launchdss.org.firebird.gds.plist
+Use RunAtLoad rather than KeepAlive
+
2015-03-13 15:31 robocop
M src/dsql/metd.epp
M src/jrd/scl.epp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-03-17 21:44:55 UTC (rev 60999)
+++ firebird/trunk/src/jrd/build_no.h 2015-03-18 00:13:22 UTC (rev 61000)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31712
+ FORMAL BUILD NUMBER:31714
*/
-#define PRODUCT_VER_STRING "3.0.0.31712"
-#define FILE_VER_STRING "WI-T3.0.0.31712"
-#define LICENSE_VER_STRING "WI-T3.0.0.31712"
-#define FILE_VER_NUMBER 3, 0, 0, 31712
+#define PRODUCT_VER_STRING "3.0.0.31714"
+#define FILE_VER_STRING "WI-T3.0.0.31714"
+#define LICENSE_VER_STRING "WI-T3.0.0.31714"
+#define FILE_VER_NUMBER 3, 0, 0, 31714
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31712"
+#define FB_BUILD_NO "31714"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-03-17 21:44:55 UTC (rev 60999)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-03-18 00:13:22 UTC (rev 61000)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31712
+BuildNum=31714
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X