Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[60724] firebird/trunk
|
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] |
