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

Remove uneeded Jrd::

Browse Source
This commit is contained in:
hvlad 2009-11-04 14:52:32 +00:00
parent 47d3e2ae41
commit c6c7e64ed2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ static RegisterInternalProvider reg;
// InternalProvider // InternalProvider
void InternalProvider::jrdAttachmentEnd(thread_db* tdbb, Jrd::Attachment* att) void InternalProvider::jrdAttachmentEnd(thread_db* tdbb, Attachment* att)
{ {
if (m_connections.getCount() == 0) if (m_connections.getCount() == 0)
return; return;
@ -119,7 +119,7 @@ void InternalConnection::attach(thread_db* tdbb, const Firebird::string& dbName,
Database* dbb = tdbb->getDatabase(); Database* dbb = tdbb->getDatabase();
fb_assert(dbName.isEmpty() || dbName == dbb->dbb_database_name.c_str()); fb_assert(dbName.isEmpty() || dbName == dbb->dbb_database_name.c_str());
Jrd::Attachment* attachment = tdbb->getAttachment(); Attachment* attachment = tdbb->getAttachment();
if ((user.isEmpty() || user == attachment->att_user->usr_user_name) && if ((user.isEmpty() || user == attachment->att_user->usr_user_name) &&
pwd.isEmpty() && pwd.isEmpty() &&
(role.isEmpty() || role == attachment->att_user->usr_sql_role_name)) (role.isEmpty() || role == attachment->att_user->usr_sql_role_name))
@ -162,7 +162,7 @@ void InternalConnection::doDetach(thread_db* tdbb)
ISC_STATUS_ARRAY status = {0}; ISC_STATUS_ARRAY status = {0};
{ // scope { // scope
Jrd::Attachment* att = m_attachment; Attachment* att = m_attachment;
m_attachment = NULL; m_attachment = NULL;
EngineCallbackGuard guard(tdbb, *this); EngineCallbackGuard guard(tdbb, *this);
@ -248,7 +248,7 @@ void InternalTransaction::doStart(ISC_STATUS* status, thread_db* tdbb, ClumpletW
} }
else else
{ {
Jrd::Attachment* att = m_IntConnection.getJrdAtt(); Attachment* att = m_IntConnection.getJrdAtt();
EngineCallbackGuard guard(tdbb, *this); EngineCallbackGuard guard(tdbb, *this);
jrd8_start_transaction(status, 0, &m_transaction, 1, &att, //// FIXME: public_handle jrd8_start_transaction(status, 0, &m_transaction, 1, &att, //// FIXME: public_handle
@ -329,7 +329,7 @@ void InternalStatement::doPrepare(thread_db* tdbb, const string& sql)
m_inBlr.clear(); m_inBlr.clear();
m_outBlr.clear(); m_outBlr.clear();
Jrd::Attachment* att = m_intConnection.getJrdAtt(); Attachment* att = m_intConnection.getJrdAtt();
jrd_tra* tran = getIntTransaction()->getJrdTran(); jrd_tra* tran = getIntTransaction()->getJrdTran();
ISC_STATUS_ARRAY status = {0}; ISC_STATUS_ARRAY status = {0};
@ -552,7 +552,7 @@ void InternalBlob::open(thread_db* tdbb, Transaction& tran, const dsc& desc, con
fb_assert(!m_blob); fb_assert(!m_blob);
fb_assert(sizeof(m_blob_id) == desc.dsc_length); fb_assert(sizeof(m_blob_id) == desc.dsc_length);
Jrd::Attachment* att = m_connection.getJrdAtt(); Attachment* att = m_connection.getJrdAtt();
jrd_tra* transaction = ((InternalTransaction&) tran).getJrdTran(); jrd_tra* transaction = ((InternalTransaction&) tran).getJrdTran();
memcpy(&m_blob_id, desc.dsc_address, sizeof(m_blob_id)); memcpy(&m_blob_id, desc.dsc_address, sizeof(m_blob_id));
@ -577,7 +577,7 @@ void InternalBlob::create(thread_db* tdbb, Transaction& tran, dsc& desc, const U
fb_assert(!m_blob); fb_assert(!m_blob);
fb_assert(sizeof(m_blob_id) == desc.dsc_length); fb_assert(sizeof(m_blob_id) == desc.dsc_length);
Jrd::Attachment* att = m_connection.getJrdAtt(); Attachment* att = m_connection.getJrdAtt();
jrd_tra* transaction = ((InternalTransaction&) tran).getJrdTran(); jrd_tra* transaction = ((InternalTransaction&) tran).getJrdTran();
m_blob_id.clear(); m_blob_id.clear();