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

Avoid some casts in yValve

Browse Source
This commit is contained in:
alexpeshkoff 2011-07-01 07:56:39 +00:00
parent 9a58295f44
commit bba27cb187
2 changed files with 58 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/yvalve/YObjects.h
View File

@ -240,6 +240,8 @@ private:
} }
}; };
typedef Firebird::RefPtr<Firebird::ITransaction> NextTransaction;
class YBlob : public YHelper<YBlob, Firebird::IBlob, FB_BLOB_VERSION> class YBlob : public YHelper<YBlob, Firebird::IBlob, FB_BLOB_VERSION>
{ {
public: public:
@ -290,7 +292,7 @@ public:
virtual const Firebird::IParametersMetadata* FB_CARG getOutputParameters(Firebird::IStatus* status); virtual const Firebird::IParametersMetadata* FB_CARG getOutputParameters(Firebird::IStatus* status);
virtual ISC_UINT64 FB_CARG getAffectedRecords(Firebird::IStatus* status); virtual ISC_UINT64 FB_CARG getAffectedRecords(Firebird::IStatus* status);
virtual void FB_CARG setCursorName(Firebird::IStatus* status, const char* name); virtual void FB_CARG setCursorName(Firebird::IStatus* status, const char* name);
virtual YTransaction* FB_CARG execute(Firebird::IStatus* status, Firebird::ITransaction* transaction, virtual Firebird::ITransaction* FB_CARG execute(Firebird::IStatus* status, Firebird::ITransaction* transaction,
unsigned int inMsgType, const Firebird::FbMessage* inMsgBuffer, unsigned int inMsgType, const Firebird::FbMessage* inMsgBuffer,
const Firebird::FbMessage* outMsgBuffer); const Firebird::FbMessage* outMsgBuffer);
virtual int FB_CARG fetch(Firebird::IStatus* status, const Firebird::FbMessage* msgBuffer); virtual int FB_CARG fetch(Firebird::IStatus* status, const Firebird::FbMessage* msgBuffer);
@ -355,7 +357,7 @@ public:
const unsigned char* param, int sliceLength, unsigned char* slice); 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 ddl(Firebird::IStatus* status, Firebird::ITransaction* transaction, unsigned int length,
const unsigned char* dyn); const unsigned char* dyn);
virtual YTransaction* FB_CARG execute(Firebird::IStatus* status, Firebird::ITransaction* transaction, virtual Firebird::ITransaction* FB_CARG execute(Firebird::IStatus* status, Firebird::ITransaction* transaction,
unsigned int length, const char* string, unsigned int dialect, unsigned int inMsgType, unsigned int length, const char* string, unsigned int dialect, unsigned int inMsgType,
const Firebird::FbMessage* inMsgBuffer, const Firebird::FbMessage* outMsgBuffer); const Firebird::FbMessage* inMsgBuffer, const Firebird::FbMessage* outMsgBuffer);
virtual YEvents* FB_CARG queEvents(Firebird::IStatus* status, Firebird::IEventCallback* callback, virtual YEvents* FB_CARG queEvents(Firebird::IStatus* status, Firebird::IEventCallback* callback,
@ -366,7 +368,8 @@ public:
virtual void FB_CARG drop(Firebird::IStatus* status); virtual void FB_CARG drop(Firebird::IStatus* status);
void addCleanupHandler(Firebird::IStatus* status, CleanupCallback* callback); void addCleanupHandler(Firebird::IStatus* status, CleanupCallback* callback);
Firebird::ITransaction* getNextTransaction(Firebird::IStatus* status, Firebird::ITransaction* tra); YTransaction* getTransaction(Firebird::IStatus* status, Firebird::ITransaction* tra);
void getNextTransaction(Firebird::IStatus* status, Firebird::ITransaction* tra, NextTransaction& next);
public: public:
Firebird::IProvider* provider; Firebird::IProvider* provider;

85
src/yvalve/why.cpp
View File

@ -1890,7 +1890,7 @@ ISC_STATUS API_ROUTINE isc_dsql_execute2_m(ISC_STATUS* userStatus, FB_API_HANDLE
InternalMessageBuffer outMsgBuffer(outBlrLength, reinterpret_cast<unsigned char*>(outBlr), InternalMessageBuffer outMsgBuffer(outBlrLength, reinterpret_cast<unsigned char*>(outBlr),
outMsgLength, reinterpret_cast<unsigned char*>(outMsg)); outMsgLength, reinterpret_cast<unsigned char*>(outMsg));
YTransaction* newTrans = statement->execute(&status, transaction, inMsgType, ITransaction* newTrans = statement->execute(&status, transaction, inMsgType,
&inMsgBuffer, &outMsgBuffer); &inMsgBuffer, &outMsgBuffer);
if (status.isSuccess()) if (status.isSuccess())
@ -1902,8 +1902,9 @@ ISC_STATUS API_ROUTINE isc_dsql_execute2_m(ISC_STATUS* userStatus, FB_API_HANDLE
} }
else if (!transaction && newTrans) else if (!transaction && newTrans)
{ {
// in this case we know for sure that newTrans points to YTransaction
if (traHandle) if (traHandle)
*traHandle = newTrans->handle; *traHandle = static_cast<YTransaction*>(newTrans)->handle;
} }
} }
} }
@ -2097,7 +2098,7 @@ ISC_STATUS API_ROUTINE isc_dsql_exec_immed3_m(ISC_STATUS* userStatus, FB_API_HAN
InternalMessageBuffer outMsgBuffer(outBlrLength, reinterpret_cast<unsigned char*>(outBlr), InternalMessageBuffer outMsgBuffer(outBlrLength, reinterpret_cast<unsigned char*>(outBlr),
outMsgLength, reinterpret_cast<unsigned char*>(outMsg)); outMsgLength, reinterpret_cast<unsigned char*>(outMsg));
YTransaction* newTrans = attachment->execute(&status, transaction, stmtLength, sqlStmt, ITransaction* newTrans = attachment->execute(&status, transaction, stmtLength, sqlStmt,
dialect, inMsgType, &inMsgBuffer, &outMsgBuffer); dialect, inMsgType, &inMsgBuffer, &outMsgBuffer);
if (status.isSuccess()) if (status.isSuccess())
@ -2109,8 +2110,9 @@ ISC_STATUS API_ROUTINE isc_dsql_exec_immed3_m(ISC_STATUS* userStatus, FB_API_HAN
} }
else if (!transaction && newTrans) else if (!transaction && newTrans)
{ {
// in this case we know for sure that newTrans points to YTransaction
if (traHandle) if (traHandle)
*traHandle = newTrans->handle; *traHandle = static_cast<YTransaction*>(newTrans)->handle;
} }
} }
} }
@ -3446,7 +3448,8 @@ void YRequest::start(IStatus* status, ITransaction* transaction, int level)
{ {
YEntry<YRequest> entry(status, this); YEntry<YRequest> entry(status, this);
ITransaction* trans = attachment->getNextTransaction(status, transaction); NextTransaction trans;
attachment->getNextTransaction(status, transaction, trans);
entry.next()->start(status, trans, level); entry.next()->start(status, trans, level);
} }
catch (const Exception& e) catch (const Exception& e)
@ -3462,7 +3465,8 @@ void YRequest::startAndSend(IStatus* status, ITransaction* transaction, int leve
{ {
YEntry<YRequest> entry(status, this); YEntry<YRequest> entry(status, this);
ITransaction* trans = attachment->getNextTransaction(status, transaction); NextTransaction trans;
attachment->getNextTransaction(status, transaction, trans);
entry.next()->startAndSend(status, trans, level, msgType, length, message); entry.next()->startAndSend(status, trans, level, msgType, length, message);
} }
catch (const Exception& e) catch (const Exception& e)
@ -3657,7 +3661,9 @@ void YStatement::prepare(IStatus* status, ITransaction* transaction,
if (!sqlStmt) if (!sqlStmt)
Arg::Gds(isc_command_end_err).raise(); Arg::Gds(isc_command_end_err).raise();
ITransaction* trans = transaction ? attachment->getNextTransaction(status, transaction) : NULL; NextTransaction trans;
if (transaction)
attachment->getNextTransaction(status, transaction, trans);
entry.next()->prepare(status, trans, stmtLength, sqlStmt, dialect, flags); entry.next()->prepare(status, trans, stmtLength, sqlStmt, dialect, flags);
} }
@ -3776,14 +3782,16 @@ void YStatement::setCursorName(IStatus* status, const char* name)
} }
} }
YTransaction* YStatement::execute(IStatus* status, ITransaction* transaction, ITransaction* YStatement::execute(IStatus* status, ITransaction* transaction,
unsigned int inMsgType, const FbMessage* inMsgBuffer, const FbMessage* outMsgBuffer) unsigned int inMsgType, const FbMessage* inMsgBuffer, const FbMessage* outMsgBuffer)
{ {
try try
{ {
YEntry<YStatement> entry(status, this); YEntry<YStatement> entry(status, this);
ITransaction* trans = transaction ? attachment->getNextTransaction(status, transaction) : NULL; NextTransaction trans;
if (transaction)
attachment->getNextTransaction(status, transaction, trans);
ITransaction* newTrans = entry.next()->execute(status, trans, inMsgType, inMsgBuffer, outMsgBuffer); ITransaction* newTrans = entry.next()->execute(status, trans, inMsgType, inMsgBuffer, outMsgBuffer);
if (newTrans) if (newTrans)
@ -3794,7 +3802,7 @@ YTransaction* YStatement::execute(IStatus* status, ITransaction* transaction,
newTrans = new YTransaction(attachment, newTrans); newTrans = new YTransaction(attachment, newTrans);
} }
return static_cast<YTransaction*>(newTrans); return newTrans;
} }
catch (const Exception& e) catch (const Exception& e)
{ {
@ -4180,9 +4188,7 @@ YTransaction* YAttachment::startTransaction(IStatus* status, unsigned int tpbLen
ITransaction* transaction = entry.next()->startTransaction(status, tpbLength, tpb); ITransaction* transaction = entry.next()->startTransaction(status, tpbLength, tpb);
if (transaction) if (transaction)
transaction = new YTransaction(this, transaction); return new YTransaction(this, transaction);
return static_cast<YTransaction*>(transaction);
} }
catch (const Exception& e) catch (const Exception& e)
{ {
@ -4202,9 +4208,7 @@ YTransaction* YAttachment::reconnectTransaction(IStatus* status, unsigned int le
ITransaction* transaction = entry.next()->reconnectTransaction(status, length, id); ITransaction* transaction = entry.next()->reconnectTransaction(status, length, id);
if (transaction) if (transaction)
transaction = new YTransaction(this, transaction); return new YTransaction(this, transaction);
return static_cast<YTransaction*>(transaction);
} }
catch (const Exception& e) catch (const Exception& e)
{ {
@ -4260,7 +4264,8 @@ void YAttachment::transactRequest(IStatus* status, ITransaction* transaction,
{ {
YEntry<YAttachment> entry(status, this); YEntry<YAttachment> entry(status, this);
ITransaction* trans = getNextTransaction(status, transaction); NextTransaction trans;
getNextTransaction(status, transaction, trans);
entry.next()->transactRequest(status, trans, blrLength, blr, inMsgLength, inMsg, entry.next()->transactRequest(status, trans, blrLength, blr, inMsgLength, inMsg,
outMsgLength, outMsg); outMsgLength, outMsg);
@ -4278,10 +4283,11 @@ YBlob* YAttachment::createBlob(IStatus* status, ITransaction* transaction, ISC_Q
{ {
YEntry<YAttachment> entry(status, this); YEntry<YAttachment> entry(status, this);
ITransaction* trans = getNextTransaction(status, transaction); YTransaction* yTra = getTransaction(status, transaction);
NextTransaction nextTra(yTra->next);
IBlob* blob = entry.next()->createBlob(status, trans, id, bpbLength, bpb); IBlob* blob = entry.next()->createBlob(status, nextTra, id, bpbLength, bpb);
YBlob* yBlob = blob ? new YBlob(this, static_cast<YTransaction*>(transaction), blob) : NULL; YBlob* yBlob = blob ? new YBlob(this, yTra, blob) : NULL;
return yBlob; return yBlob;
} }
catch (const Exception& e) catch (const Exception& e)
@ -4299,10 +4305,11 @@ YBlob* YAttachment::openBlob(IStatus* status, ITransaction* transaction, ISC_QUA
{ {
YEntry<YAttachment> entry(status, this); YEntry<YAttachment> entry(status, this);
ITransaction* trans = getNextTransaction(status, transaction); YTransaction* yTra = getTransaction(status, transaction);
NextTransaction nextTra(yTra->next);
IBlob* blob = entry.next()->openBlob(status, trans, id, bpbLength, bpb); IBlob* blob = entry.next()->openBlob(status, nextTra, id, bpbLength, bpb);
YBlob* yBlob = blob ? new YBlob(this, static_cast<YTransaction*>(transaction), blob) : NULL; YBlob* yBlob = blob ? new YBlob(this, yTra, blob) : NULL;
return yBlob; return yBlob;
} }
catch (const Exception& e) catch (const Exception& e)
@ -4321,7 +4328,8 @@ int YAttachment::getSlice(IStatus* status, ITransaction* transaction, ISC_QUAD*
{ {
YEntry<YAttachment> entry(status, this); YEntry<YAttachment> entry(status, this);
ITransaction* trans = getNextTransaction(status, transaction); NextTransaction trans;
getNextTransaction(status, transaction, trans);
return entry.next()->getSlice(status, trans, id, sdlLength, sdl, paramLength, param, return entry.next()->getSlice(status, trans, id, sdlLength, sdl, paramLength, param,
sliceLength, slice); sliceLength, slice);
@ -4342,7 +4350,8 @@ void YAttachment::putSlice(IStatus* status, ITransaction* transaction, ISC_QUAD*
{ {
YEntry<YAttachment> entry(status, this); YEntry<YAttachment> entry(status, this);
ITransaction* trans = getNextTransaction(status, transaction); NextTransaction trans;
getNextTransaction(status, transaction, trans);
entry.next()->putSlice(status, trans, id, sdlLength, sdl, paramLength, param, sliceLength, slice); entry.next()->putSlice(status, trans, id, sdlLength, sdl, paramLength, param, sliceLength, slice);
} }
catch (const Exception& e) catch (const Exception& e)
@ -4358,7 +4367,8 @@ void YAttachment::ddl(IStatus* status, ITransaction* transaction, unsigned int l
{ {
YEntry<YAttachment> entry(status, this); YEntry<YAttachment> entry(status, this);
ITransaction* trans = getNextTransaction(status, transaction); NextTransaction trans;
getNextTransaction(status, transaction, trans);
return entry.next()->ddl(status, trans, length, dyn); return entry.next()->ddl(status, trans, length, dyn);
} }
catch (const Exception& e) catch (const Exception& e)
@ -4367,7 +4377,7 @@ void YAttachment::ddl(IStatus* status, ITransaction* transaction, unsigned int l
} }
} }
YTransaction* YAttachment::execute(IStatus* status, ITransaction* transaction, ITransaction* YAttachment::execute(IStatus* status, ITransaction* transaction,
unsigned int length, const char* string, unsigned int dialect, unsigned int inMsgType, unsigned int length, const char* string, unsigned int dialect, unsigned int inMsgType,
const FbMessage* inMsgBuffer, const FbMessage* outMsgBuffer) const FbMessage* inMsgBuffer, const FbMessage* outMsgBuffer)
{ {
@ -4375,7 +4385,9 @@ YTransaction* YAttachment::execute(IStatus* status, ITransaction* transaction,
{ {
YEntry<YAttachment> entry(status, this); YEntry<YAttachment> entry(status, this);
ITransaction* trans = transaction ? getNextTransaction(status, transaction) : NULL; NextTransaction trans;
if (transaction)
getNextTransaction(status, transaction, trans);
ITransaction* newTrans = entry.next()->execute(status, trans, length, string, dialect, ITransaction* newTrans = entry.next()->execute(status, trans, length, string, dialect,
inMsgType, inMsgBuffer, outMsgBuffer); inMsgType, inMsgBuffer, outMsgBuffer);
@ -4387,7 +4399,7 @@ YTransaction* YAttachment::execute(IStatus* status, ITransaction* transaction,
newTrans = new YTransaction(this, newTrans); newTrans = new YTransaction(this, newTrans);
} }
return static_cast<YTransaction*>(newTrans); return newTrans;
} }
catch (const Exception& e) catch (const Exception& e)
{ {
@ -4512,7 +4524,7 @@ void YAttachment::addCleanupHandler(IStatus* status, CleanupCallback* callback)
} }
ITransaction* YAttachment::getNextTransaction(IStatus* status, ITransaction* tra) YTransaction* YAttachment::getTransaction(IStatus* status, ITransaction* tra)
{ {
if (!tra) if (!tra)
Arg::Gds(isc_bad_trans_handle).raise(); Arg::Gds(isc_bad_trans_handle).raise();
@ -4528,7 +4540,15 @@ ITransaction* YAttachment::getNextTransaction(IStatus* status, ITransaction* tra
Arg::Gds(isc_bad_trans_handle).raise(); Arg::Gds(isc_bad_trans_handle).raise();
yt->selfCheck(); yt->selfCheck();
return yt->next; return yt;
}
void YAttachment::getNextTransaction(Firebird::IStatus* status, Firebird::ITransaction* tra, NextTransaction& next)
{
next = getTransaction(status, tra)->next;
if (!next.hasData())
Arg::Gds(isc_bad_trans_handle).raise();
} }
@ -4891,8 +4911,7 @@ YService* Dispatcher::attachServiceManager(IStatus* status, const char* serviceN
if (status->isSuccess()) if (status->isSuccess())
{ {
service = new YService(provider, service); return new YService(provider, service);
return static_cast<YService*>(service);
} }
service = NULL; service = NULL;