diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp index b3c4ccb61..e2eacd237 100644 --- a/src/ca/cac.cpp +++ b/src/ca/cac.cpp @@ -1249,17 +1249,17 @@ cacChannel::ioid cac::subscriptionRequest ( nciu &chan, unsigned type, } } -bool cac::noopAction ( tcpiiu &iiu, const caHdr &, void *pMsgBdy ) +bool cac::noopAction ( tcpiiu &, const caHdr &, void * /* pMsgBdy */ ) { return true; } -bool cac::echoRespAction ( tcpiiu &iiu, const caHdr &, void *pMsgBdy ) +bool cac::echoRespAction ( tcpiiu &, const caHdr &, void * /* pMsgBdy */ ) { return true; } -bool cac::writeNotifyRespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy ) +bool cac::writeNotifyRespAction ( tcpiiu &, const caHdr &hdr, void * /* pMsgBdy */ ) { int caStatus = hdr.m_cid; if ( caStatus == ECA_NORMAL ) { @@ -1358,13 +1358,13 @@ bool cac::eventRespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy ) } } -bool cac::readRespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy ) +bool cac::readRespAction ( tcpiiu &, const caHdr &hdr, void *pMsgBdy ) { return this->ioCompletionNotifyAndDestroy ( hdr.m_available, hdr.m_dataType, hdr.m_count, pMsgBdy ); } -bool cac::clearChannelRespAction ( tcpiiu &iiu, const caHdr &, void *pMsgBdy ) +bool cac::clearChannelRespAction ( tcpiiu &, const caHdr &, void * /* pMsgBdy */ ) { return true; // currently a noop } @@ -1412,7 +1412,7 @@ bool cac::exceptionRespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy ) } } -bool cac::accessRightsRespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy ) +bool cac::accessRightsRespAction ( tcpiiu &, const caHdr &hdr, void * /* pMsgBdy */ ) { nciu * pChan = this->chanTable.lookup ( hdr.m_cid ); if ( pChan ) { @@ -1425,7 +1425,7 @@ bool cac::accessRightsRespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy return true; } -bool cac::claimCIURespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy ) +bool cac::claimCIURespAction ( tcpiiu &iiu, const caHdr &hdr, void * /* pMsgBdy */ ) { nciu * pChan = this->chanTable.lookup ( hdr.m_cid ); if ( pChan ) { @@ -1444,7 +1444,7 @@ bool cac::claimCIURespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy ) } } -bool cac::verifyAndDisconnectChan ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy ) +bool cac::verifyAndDisconnectChan ( tcpiiu &, const caHdr &hdr, void * /* pMsgBdy */ ) { nciu * pChan = this->chanTable.lookup ( hdr.m_cid ); if ( pChan ) { @@ -1455,7 +1455,7 @@ bool cac::verifyAndDisconnectChan ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy return true; } -bool cac::badTCPRespAction ( tcpiiu &iiu, const caHdr &hdr, void *pMsgBdy ) +bool cac::badTCPRespAction ( tcpiiu &iiu, const caHdr &hdr, void * /* pMsgBdy */ ) { char hostName[64]; iiu.hostName ( hostName, sizeof(hostName) ); diff --git a/src/ca/iocinf.h b/src/ca/iocinf.h index b4e588c61..c71b3a7f7 100644 --- a/src/ca/iocinf.h +++ b/src/ca/iocinf.h @@ -331,7 +331,7 @@ public: nciu &chan, unsigned type, unsigned long count, unsigned mask, cacDataNotify ¬ify ); void show ( unsigned level ) const; - unsigned long getCount ( nciu & ) const; + unsigned long getCount () const; unsigned getType () const; unsigned getMask () const; void destroy ( class cacRecycle & ); diff --git a/src/ca/nciu.cpp b/src/ca/nciu.cpp index 8a9cc92fe..ecffc8177 100644 --- a/src/ca/nciu.cpp +++ b/src/ca/nciu.cpp @@ -323,14 +323,14 @@ void nciu::subscribe ( unsigned type, unsigned long nElem, } } -void nciu::ioCancel ( const ioid &id ) +void nciu::ioCancel ( const ioid &idIn ) { - this->cacCtx.ioCancel ( *this, id ); + this->cacCtx.ioCancel ( *this, idIn ); } -void nciu::ioShow ( const ioid &id, unsigned level ) const +void nciu::ioShow ( const ioid &idIn, unsigned level ) const { - this->cacCtx.ioShow ( id, level ); + this->cacCtx.ioShow ( idIn, level ); } void nciu::initiateConnect () diff --git a/src/ca/netSubscription.cpp b/src/ca/netSubscription.cpp index d14ec8cb7..652767196 100644 --- a/src/ca/netSubscription.cpp +++ b/src/ca/netSubscription.cpp @@ -59,10 +59,10 @@ void netSubscription::exception ( int status, const char *pContext ) this->notify.exception ( status, pContext, UINT_MAX, 0 ); } -void netSubscription::completion ( unsigned type, - unsigned long count, const void *pData ) +void netSubscription::completion ( unsigned typeIn, + unsigned long countIn, const void *pDataIn ) { - this->notify.completion ( type, count, pData ); + this->notify.completion ( typeIn, countIn, pDataIn ); } void netSubscription::exception ( int status, diff --git a/src/ca/netSubscription_IL.h b/src/ca/netSubscription_IL.h index db73f1cb3..4235249c8 100644 --- a/src/ca/netSubscription_IL.h +++ b/src/ca/netSubscription_IL.h @@ -46,9 +46,9 @@ inline void netSubscription::operator delete ( void *pCadaver, size_t size, } #endif -inline unsigned long netSubscription::getCount ( nciu &chan ) const +inline unsigned long netSubscription::getCount () const { - unsigned long nativeCount = chan.nativeElementCount (); + unsigned long nativeCount = this->chan.nativeElementCount (); if ( this->count == 0u || this->count > nativeCount ) { return nativeCount; } diff --git a/src/ca/netWriteNotifyIO.cpp b/src/ca/netWriteNotifyIO.cpp index d55995d4b..cb5d82613 100644 --- a/src/ca/netWriteNotifyIO.cpp +++ b/src/ca/netWriteNotifyIO.cpp @@ -49,14 +49,14 @@ void netWriteNotifyIO::exception ( int status, const char *pContext ) this->notify.exception ( status, pContext ); } -void netWriteNotifyIO::completion ( unsigned type, - unsigned long count, const void *pData ) +void netWriteNotifyIO::completion ( unsigned /* type */, + unsigned long /* count */, const void * /* pData */ ) { this->chan.getClient().printf ( "Write response with data ?\n" ); } void netWriteNotifyIO::exception ( int status, - const char *pContext, unsigned type, unsigned long count ) + const char *pContext, unsigned /* type */, unsigned long /* count */ ) { this->notify.exception ( status, pContext ); } diff --git a/src/ca/tcpiiu.cpp b/src/ca/tcpiiu.cpp index 4a164b763..81acb218e 100644 --- a/src/ca/tcpiiu.cpp +++ b/src/ca/tcpiiu.cpp @@ -1261,7 +1261,7 @@ void tcpiiu::subscriptionRequest ( nciu &chan, netSubscription & subscr ) return; } - unsigned long count = subscr.getCount ( chan ); + unsigned long count = subscr.getCount (); if ( count == 0u || count > 0xffff ) { this->pCAC()->printf ( "CAC: subscriptionRequest() ignored because of unexpected bad count that was checked earlier\n" ); return; @@ -1291,7 +1291,7 @@ void tcpiiu::subscriptionCancelRequest ( nciu &chan, netSubscription &subscr ) this->sendQue.pushUInt16 ( CA_PROTO_EVENT_CANCEL ); // cmd this->sendQue.pushUInt16 ( 0u ); // postsize this->sendQue.pushUInt16 ( static_cast < ca_uint16_t > ( subscr.getType () ) ); // dataType - this->sendQue.pushUInt16 ( static_cast < ca_uint16_t > ( subscr.getCount ( chan ) ) ); // count + this->sendQue.pushUInt16 ( static_cast < ca_uint16_t > ( subscr.getCount () ) ); // count this->sendQue.pushUInt32 ( chan.getSID () ); // cid this->sendQue.pushUInt32 ( subscr.getID() ); // available } diff --git a/src/db/dbCAC.h b/src/db/dbCAC.h index c813c7a4c..c4bc60b70 100644 --- a/src/db/dbCAC.h +++ b/src/db/dbCAC.h @@ -143,7 +143,7 @@ public: virtual ~dbServiceIO (); cacChannel *createChannel ( const char *pName, cacChannelNotify & ); void callReadNotify ( struct dbAddr &addr, unsigned type, unsigned long count, - const struct db_field_log *pfl, cacChannel &, cacDataNotify ¬ify ); + const struct db_field_log *pfl, cacDataNotify ¬ify ); dbEventSubscription subscribe ( struct dbAddr &addr, dbChannelIO &chan, dbSubscriptionIO &subscr, unsigned mask, cacChannel::ioid * ); void initiatePutNotify ( dbChannelIO &, struct dbAddr &, unsigned type, diff --git a/src/db/dbChannelIO.cpp b/src/db/dbChannelIO.cpp index 7d557f6c3..4e047f3e4 100644 --- a/src/db/dbChannelIO.cpp +++ b/src/db/dbChannelIO.cpp @@ -55,7 +55,7 @@ cacChannel::ioStatus dbChannelIO::read ( unsigned type, unsigned long count, cacDataNotify ¬ify, ioid * ) { this->serviceIO.callReadNotify ( this->addr, - type, count, 0, *this, notify ); + type, count, 0, notify ); return iosSynch; } diff --git a/src/db/dbChannelIOIL.h b/src/db/dbChannelIOIL.h index 49cfc33f8..6ce4cdec5 100644 --- a/src/db/dbChannelIOIL.h +++ b/src/db/dbChannelIOIL.h @@ -57,5 +57,5 @@ inline short dbChannelIO::nativeType () const inline void dbChannelIO::callReadNotify ( unsigned type, unsigned long count, const struct db_field_log *pfl, cacDataNotify ¬ify ) { - this->serviceIO.callReadNotify ( this->addr, type, count, pfl, *this, notify ); + this->serviceIO.callReadNotify ( this->addr, type, count, pfl, notify ); } diff --git a/src/db/dbServiceIO.cpp b/src/db/dbServiceIO.cpp index 444fba821..a8074563a 100644 --- a/src/db/dbServiceIO.cpp +++ b/src/db/dbServiceIO.cpp @@ -84,7 +84,7 @@ cacChannel *dbServiceIO::createChannel ( void dbServiceIO::callReadNotify ( struct dbAddr &addr, unsigned type, unsigned long count, const struct db_field_log *pfl, - cacChannel &chan, cacDataNotify ¬ify ) + cacDataNotify ¬ify ) { unsigned long size = dbr_size_n ( type, count );