firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 20:43:02 +01:00
Code Issues

Better names for API functions

Browse Source
This commit is contained in:
alexpeshkoff 2012-06-26 13:43:26 +00:00
parent b68a03e791
commit 0fc893a4e1
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/firebird/Provider.h
View File

@ -200,7 +200,7 @@ public:
unsigned int sdlLength, const unsigned char* sdl,
unsigned int paramLength, const unsigned char* param,
int sliceLength, unsigned char* slice) = 0;
virtual void FB_CARG ddl(IStatus* status, ITransaction* transaction, unsigned int length,
virtual void FB_CARG executeDyn(IStatus* status, ITransaction* transaction, unsigned int length,
const unsigned char* dyn) = 0;
virtual ITransaction* FB_CARG execute(IStatus* status, ITransaction* transaction,
unsigned int length, const char* string, unsigned int dialect,
@ -211,7 +211,7 @@ public:
virtual void FB_CARG cancelOperation(IStatus* status, int option) = 0;
virtual void FB_CARG ping(IStatus* status) = 0;
virtual void FB_CARG detach(IStatus* status) = 0;
virtual void FB_CARG drop(IStatus* status) = 0;
virtual void FB_CARG dropDatabase(IStatus* status) = 0;
};
#define FB_ATTACHMENT_VERSION (FB_REFCOUNTED_VERSION + 17)

4
src/jrd/EngineInterface.h
View File

@ -284,7 +284,7 @@ public:
unsigned int sdl_length, const unsigned char* sdl,
unsigned int param_length, const unsigned char* param,
int sliceLength, unsigned char* slice);
virtual void FB_CARG ddl(Firebird::IStatus* status, Firebird::ITransaction* transaction, unsigned int length,
virtual void FB_CARG executeDyn(Firebird::IStatus* status, Firebird::ITransaction* transaction, unsigned int length,
const unsigned char* dyn);
virtual JTransaction* FB_CARG execute(Firebird::IStatus* status, Firebird::ITransaction* transaction,
unsigned int length, const char* string, unsigned int dialect,
@ -295,7 +295,7 @@ public:
virtual void FB_CARG cancelOperation(Firebird::IStatus* status, int option);
virtual void FB_CARG ping(Firebird::IStatus* status);
virtual void FB_CARG detach(Firebird::IStatus* status);
virtual void FB_CARG drop(Firebird::IStatus* status);
virtual void FB_CARG dropDatabase(Firebird::IStatus* status);
public:
explicit JAttachment(Attachment* handle);

4
src/jrd/jrd.cpp
View File

@ -2622,7 +2622,7 @@ void JAttachment::getInfo(IStatus* user_status, unsigned int item_length, const
}
void JAttachment::ddl(IStatus* status, ITransaction* /*tra*/, unsigned int /*length*/,
void JAttachment::executeDyn(IStatus* status, ITransaction* /*tra*/, unsigned int /*length*/,
const unsigned char* /*dyn*/)
{
/**************************************
@ -2734,7 +2734,7 @@ void JAttachment::freeEngineData(IStatus* user_status)
}
void JAttachment::drop(IStatus* user_status)
void JAttachment::dropDatabase(IStatus* user_status)
{
/**************************************
*

8
src/remote/client/interface.cpp
View File

@ -373,7 +373,7 @@ public:
unsigned int sdl_length, const unsigned char* sdl,
unsigned int param_length, const unsigned char* param,
int sliceLength, unsigned char* slice);
virtual void FB_CARG ddl(IStatus* status, ITransaction* transaction, unsigned int length,
virtual void FB_CARG executeDyn(IStatus* status, ITransaction* transaction, unsigned int length,
const unsigned char* dyn);
virtual Firebird::ITransaction* FB_CARG execute(IStatus* status, Firebird::ITransaction* transaction,
unsigned int length, const char* string, unsigned int dialect,
@ -384,7 +384,7 @@ public:
virtual void FB_CARG cancelOperation(IStatus* status, int option);
virtual void FB_CARG ping(IStatus* status);
virtual void FB_CARG detach(IStatus* status);
virtual void FB_CARG drop(IStatus* status);
virtual void FB_CARG dropDatabase(IStatus* status);
public:
Attachment(Rdb* handle, const PathName& path)
@ -1311,7 +1311,7 @@ void Attachment::getInfo(IStatus* status,
}
void Attachment::ddl(IStatus* status, ITransaction* apiTra, unsigned int length,
void Attachment::executeDyn(IStatus* status, ITransaction* apiTra, unsigned int length,
const unsigned char* dyn)
{
/**************************************
@ -1433,7 +1433,7 @@ void Attachment::detach(IStatus* status)
}
void Attachment::drop(IStatus* status)
void Attachment::dropDatabase(IStatus* status)
{
/**************************************
*

4
src/remote/server/server.cpp
View File

@ -2266,7 +2266,7 @@ ISC_STATUS rem_port::ddl(P_DDL* ddlL, PACKET* sendL)
const UCHAR* blr = ddlL->p_ddl_blr.cstr_address;
const USHORT blr_length = ddlL->p_ddl_blr.cstr_length;
rdb->rdb_iface->ddl(&status_vector, transaction->rtr_iface, blr_length, blr);
rdb->rdb_iface->executeDyn(&status_vector, transaction->rtr_iface, blr_length, blr);
return this->send_response(sendL, 0, 0, &status_vector, false);
}
@ -2431,7 +2431,7 @@ void rem_port::drop_database(P_RLSE* /*release*/, PACKET* sendL)
return;
}
rdb->rdb_iface->drop(&status_vector);
rdb->rdb_iface->dropDatabase(&status_vector);
if (!status_vector.isSuccess() && (status_vector.get()[1] != isc_drdb_completed_with_errs))
{

4
src/yvalve/YObjects.h
View File

@ -366,7 +366,7 @@ public:
virtual void FB_CARG putSlice(Firebird::IStatus* status, Firebird::ITransaction* transaction, ISC_QUAD* id,
unsigned int sdlLength, const unsigned char* sdl, unsigned int paramLength,
const unsigned char* param, int sliceLength, unsigned char* slice);
virtual void FB_CARG ddl(Firebird::IStatus* status, Firebird::ITransaction* transaction, unsigned int length,
virtual void FB_CARG executeDyn(Firebird::IStatus* status, Firebird::ITransaction* transaction, unsigned int length,
const unsigned char* dyn);
virtual Firebird::ITransaction* FB_CARG execute(Firebird::IStatus* status, Firebird::ITransaction* transaction,
unsigned int length, const char* string, unsigned int dialect, unsigned int inMsgType,
@ -376,7 +376,7 @@ public:
virtual void FB_CARG cancelOperation(Firebird::IStatus* status, int option);
virtual void FB_CARG ping(Firebird::IStatus* status);
virtual void FB_CARG detach(Firebird::IStatus* status);
virtual void FB_CARG drop(Firebird::IStatus* status);
virtual void FB_CARG dropDatabase(Firebird::IStatus* status);
void addCleanupHandler(Firebird::IStatus* status, CleanupCallback* callback);
YTransaction* getTransaction(Firebird::IStatus* status, Firebird::ITransaction* tra);

12
src/yvalve/why.cpp
View File

@ -1689,7 +1689,7 @@ ISC_STATUS API_ROUTINE isc_ddl(ISC_STATUS* userStatus, FB_API_HANDLE* dbHandle,
RefPtr<YAttachment> attachment(translateHandle(attachments, dbHandle));
RefPtr<YTransaction> transaction(translateHandle(transactions, traHandle));
attachment->ddl(&status, transaction, length, dyn);
attachment->executeDyn(&status, transaction, length, dyn);
}
catch (const Exception& e)
{
@ -1738,7 +1738,7 @@ ISC_STATUS API_ROUTINE isc_drop_database(ISC_STATUS* userStatus, FB_API_HANDLE*
try
{
RefPtr<YAttachment> attachment(translateHandle(attachments, handle));
attachment->drop(&status);
attachment->dropDatabase(&status);
if (status.isSuccess() || status[1] == isc_drdb_completed_with_errs)
*handle = 0;
@ -4371,7 +4371,7 @@ void YAttachment::putSlice(IStatus* status, ITransaction* transaction, ISC_QUAD*
}
}
void YAttachment::ddl(IStatus* status, ITransaction* transaction, unsigned int length,
void YAttachment::executeDyn(IStatus* status, ITransaction* transaction, unsigned int length,
const unsigned char* dyn)
{
try
@ -4381,7 +4381,7 @@ void YAttachment::ddl(IStatus* status, ITransaction* transaction, unsigned int l
NextTransaction trans;
getNextTransaction(status, transaction, trans);
return entry.next()->ddl(status, trans, length, dyn);
return entry.next()->executeDyn(status, trans, length, dyn);
}
catch (const Exception& e)
{
@ -4504,13 +4504,13 @@ void YAttachment::detach(IStatus* status)
}
}
void YAttachment::drop(IStatus* status)
void YAttachment::dropDatabase(IStatus* status)
{
try
{
YEntry<YAttachment> entry(status, this);
entry.next()->drop(status);
entry.next()->dropDatabase(status);
if (status->isSuccess())
destroy();