From 38bacaa84ad344b97aab9d374ceaee705a21cde5 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 16 Jun 1998 02:18:53 +0000 Subject: [PATCH] use smart gdd ptr --- src/cas/generic/casAsyncRdIOI.cc | 11 +++-------- src/cas/generic/server.h | 13 ++++++++----- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/cas/generic/casAsyncRdIOI.cc b/src/cas/generic/casAsyncRdIOI.cc index bfb81a7c5..9a0b608dd 100644 --- a/src/cas/generic/casAsyncRdIOI.cc +++ b/src/cas/generic/casAsyncRdIOI.cc @@ -29,6 +29,9 @@ * * History * $Log$ + * Revision 1.4 1997/08/05 00:47:01 jhill + * fixed warnings + * * Revision 1.3 1997/04/10 19:33:56 jhill * API changes * @@ -83,11 +86,6 @@ casAsyncRdIOI::~casAsyncRdIOI() this->chan.removeAsyncIO(*this); - if (this->pDD) { - gddStatus = this->pDD->unreference(); - assert(!gddStatus); - } - this->unlock(); } @@ -101,11 +99,8 @@ epicsShareFunc caStatus casAsyncRdIOI::postIOCompletion(caStatus completionStatu this->lock(); this->pDD = &valueRead; - gddStatus = this->pDD->reference(); this->unlock(); - assert(!gddStatus); - this->completionStatus = completionStatusIn; return this->postIOCompletionI(); } diff --git a/src/cas/generic/server.h b/src/cas/generic/server.h index 1fffda1e8..72d981c7f 100644 --- a/src/cas/generic/server.h +++ b/src/cas/generic/server.h @@ -29,6 +29,9 @@ * * History * $Log$ + * Revision 1.22 1998/04/20 18:14:57 jhill + * made clientHostName virtual in casDGClient + * * Revision 1.21 1998/02/18 22:46:47 jhill * fixed warning * @@ -139,7 +142,7 @@ void serverToolDebugFunc(const char *pFile, unsigned line, const char *pComment) #define serverToolDebug(COMMENT) \ {serverToolDebugFunc(__FILE__, __LINE__, COMMENT); } #define casVerify(EXP) {if ((EXP)==0) casVerifyFunc(__FILE__, __LINE__, #EXP); } -caStatus createDBRDD(unsigned dbrType, aitIndex dbrCount, gdd *&pDescRet); +caStatus createDBRDD(unsigned dbrType, aitIndex dbrCount, smartGDDPointer &pDescRet); caStatus copyBetweenDD(gdd &dest, gdd &src); enum xRecvStatus {xRecvOK, xRecvDisconnect}; @@ -570,10 +573,10 @@ protected: // // logBadIdWithFileAndLineno() // -# define logBadId(MP, DP) \ - this->logBadIdWithFileAndLineno(MP, DP, __FILE__, __LINE__) +# define logBadId(MP, DP, CACSTAT) \ + this->logBadIdWithFileAndLineno(MP, DP, CACSTAT, __FILE__, __LINE__) caStatus logBadIdWithFileAndLineno(const caHdr *mp, - const void *dp, const char *pFileName, + const void *dp, int cacStat, const char *pFileName, const unsigned lineno); private: @@ -715,7 +718,7 @@ private: // these prepare the gdd based on what is in the ca hdr // - caStatus read (gdd *&pDesc); + caStatus read (smartGDDPointer &pDesc); caStatus write (); //