diff --git a/src/ca/access.cpp b/src/ca/access.cpp index a11624a2e..768ddb330 100644 --- a/src/ca/access.cpp +++ b/src/ca/access.cpp @@ -540,7 +540,6 @@ int epicsShareAPI ca_array_put ( chtype type, arrayElementCount count, int epicsShareAPI ca_change_connection_event ( chid pChan, caCh *pfunc ) { return pChan->changeConnCallBack ( pfunc ); - return ECA_INTERNAL; } /* diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp index 46972c997..c10679108 100644 --- a/src/ca/cac.cpp +++ b/src/ca/cac.cpp @@ -431,10 +431,10 @@ void cac::uninstallCASG ( CASG & sg ) this->sgTable.remove ( sg ); } -CASG * cac::lookupCASG ( unsigned id ) +CASG * cac::lookupCASG ( unsigned idIn ) { epicsGuard < cacMutex > guard ( this->mutex ); - CASG * psg = this->sgTable.lookup ( id ); + CASG * psg = this->sgTable.lookup ( idIn ); if ( psg ) { if ( ! psg->verify () ) { psg = 0; @@ -443,7 +443,7 @@ CASG * cac::lookupCASG ( unsigned id ) return psg; } -void cac::registerService ( cacService &service ) +void cac::registerService ( cacService & service ) { this->services.registerService ( service ); } @@ -781,7 +781,7 @@ cac::readNotifyRequest ( nciu &chan, unsigned type, // X aCC 361 return pIO.release()->getId (); } -void cac::ioCancel ( nciu &chan, const cacChannel::ioid &id ) +void cac::ioCancel ( nciu &chan, const cacChannel::ioid & idIn ) { baseNMIU * pmiu; @@ -790,7 +790,7 @@ void cac::ioCancel ( nciu &chan, const cacChannel::ioid &id ) // in deadlock { epicsGuard < cacMutex > guard ( this->mutex ); - pmiu = this->ioTable.remove ( id ); + pmiu = this->ioTable.remove ( idIn ); if ( ! pmiu ) { return; } @@ -818,23 +818,23 @@ void cac::ioCancel ( nciu &chan, const cacChannel::ioid &id ) } } -void cac::ioShow ( const cacChannel::ioid &id, unsigned level ) const +void cac::ioShow ( const cacChannel::ioid & idIn, unsigned level ) const { epicsGuard < cacMutex > autoMutex ( this->mutex ); - baseNMIU * pmiu = this->ioTable.lookup ( id ); + baseNMIU * pmiu = this->ioTable.lookup ( idIn ); if ( pmiu ) { pmiu->show ( level ); } } -void cac::ioCompletionNotify ( unsigned id, unsigned type, +void cac::ioCompletionNotify ( unsigned idIn, unsigned type, arrayElementCount count, const void *pData ) { baseNMIU * pmiu; { epicsGuard < cacMutex > autoMutex ( this->mutex ); - pmiu = this->ioTable.lookup ( id ); + pmiu = this->ioTable.lookup ( idIn ); if ( ! pmiu ) { return; } @@ -849,12 +849,12 @@ void cac::ioCompletionNotify ( unsigned id, unsigned type, pmiu->completion ( type, count, pData ); } -void cac::ioExceptionNotify ( unsigned id, int status, const char *pContext ) +void cac::ioExceptionNotify ( unsigned idIn, int status, const char *pContext ) { baseNMIU * pmiu; { epicsGuard < cacMutex > autoMutex ( this->mutex ); - pmiu = this->ioTable.lookup ( id ); + pmiu = this->ioTable.lookup ( idIn ); } if ( ! pmiu ) { @@ -871,14 +871,14 @@ void cac::ioExceptionNotify ( unsigned id, int status, const char *pContext ) pmiu->exception ( status, pContext ); } -void cac::ioExceptionNotify ( unsigned id, int status, +void cac::ioExceptionNotify ( unsigned idIn, int status, const char *pContext, unsigned type, arrayElementCount count ) { baseNMIU * pmiu; { epicsGuard < cacMutex > autoMutex ( this->mutex ); - pmiu = this->ioTable.lookup ( id ); + pmiu = this->ioTable.lookup ( idIn ); if ( ! pmiu ) { return; } @@ -893,10 +893,10 @@ void cac::ioExceptionNotify ( unsigned id, int status, pmiu->exception ( status, pContext, type, count ); } -void cac::ioCompletionNotifyAndDestroy ( unsigned id ) +void cac::ioCompletionNotifyAndDestroy ( unsigned idIn ) { epicsGuard < cacMutex > autoMutex ( this->mutex ); - baseNMIU * pmiu = this->ioTable.remove ( id ); + baseNMIU * pmiu = this->ioTable.remove ( idIn ); if ( ! pmiu ) { return; } @@ -917,11 +917,11 @@ void cac::ioCompletionNotifyAndDestroy ( unsigned id ) pmiu->destroy ( *this ); } -void cac::ioCompletionNotifyAndDestroy ( unsigned id, +void cac::ioCompletionNotifyAndDestroy ( unsigned idIn, unsigned type, arrayElementCount count, const void *pData ) { epicsGuard < cacMutex > autoMutex ( this->mutex ); - baseNMIU * pmiu = this->ioTable.remove ( id ); + baseNMIU * pmiu = this->ioTable.remove ( idIn ); if ( ! pmiu ) { return; } @@ -941,11 +941,11 @@ void cac::ioCompletionNotifyAndDestroy ( unsigned id, pmiu->destroy ( *this ); } -void cac::ioExceptionNotifyAndDestroy ( unsigned id, int status, +void cac::ioExceptionNotifyAndDestroy ( unsigned idIn, int status, const char *pContext ) { epicsGuard < cacMutex > autoMutex ( this->mutex ); - baseNMIU * pmiu = this->ioTable.remove ( id ); + baseNMIU * pmiu = this->ioTable.remove ( idIn ); if ( ! pmiu ) { return; } @@ -965,11 +965,11 @@ void cac::ioExceptionNotifyAndDestroy ( unsigned id, int status, pmiu->destroy ( *this ); } -void cac::ioExceptionNotifyAndDestroy ( unsigned id, int status, +void cac::ioExceptionNotifyAndDestroy ( unsigned idIn, int status, const char *pContext, unsigned type, arrayElementCount count ) { epicsGuard < cacMutex > autoMutex ( this->mutex ); - baseNMIU * pmiu = this->ioTable.remove ( id ); + baseNMIU * pmiu = this->ioTable.remove ( idIn ); if ( ! pmiu ) { return; } diff --git a/src/ca/tcpiiu.cpp b/src/ca/tcpiiu.cpp index 050a42330..cf918b488 100644 --- a/src/ca/tcpiiu.cpp +++ b/src/ca/tcpiiu.cpp @@ -830,7 +830,9 @@ bool tcpiiu::processIncoming ( epicsGuard < callbackMutex > & guard ) this->msgHeaderAvailable = false; this->curDataBytes = 0u; } - return false; // to make compiler happy... +# if defined ( __HP_aCC ) && _HP_aCC <= 033300 + return false; // to make hpux compiler happy... +# endif } /* @@ -1177,7 +1179,9 @@ bool tcpiiu::flush () return false; } } - return false; // happy compiler +# if defined ( __HP_aCC ) && _HP_aCC <= 033300 + return false; // to make hpux compiler happy... +# endif } // ~tcpiiu() will not return while this->blockingForFlush is greater than zero diff --git a/src/cas/generic/casChannelI.cc b/src/cas/generic/casChannelI.cc index 2598fad96..5bdf8cea4 100644 --- a/src/cas/generic/casChannelI.cc +++ b/src/cas/generic/casChannelI.cc @@ -23,7 +23,7 @@ // // casChannelI::casChannelI() // -casChannelI::casChannelI ( const casCtx & ctx ) : +casChannelI::casChannelI ( const casCtx & ) : pClient ( 0 ), pPV ( 0 ), cid ( 0xffffffff ), accessRightsEvPending ( false ) { diff --git a/src/cas/generic/casCoreClient.cc b/src/cas/generic/casCoreClient.cc index 454a49d2c..3d3a5626a 100644 --- a/src/cas/generic/casCoreClient.cc +++ b/src/cas/generic/casCoreClient.cc @@ -92,7 +92,7 @@ void casCoreClient::show (unsigned level) const // caStatus casCoreClient::asyncSearchResponse ( const caNetAddr &, const caHdrLargeArray &, const pvExistReturn &, - ca_uint16_t protocolRevision, ca_uint32_t sequenceNumber ) + ca_uint16_t, ca_uint32_t ) { return S_casApp_noSupport; } @@ -135,7 +135,7 @@ caStatus casCoreClient::enumPostponedCreateChanResponse ( casChannelI &, return S_casApp_noSupport; } caStatus casCoreClient::channelCreateFailedResp ( const caHdrLargeArray &, - caStatus createStatus ) + caStatus ) { return S_casApp_noSupport; } @@ -143,7 +143,7 @@ caStatus casCoreClient::channelCreateFailedResp ( const caHdrLargeArray &, // // casCoreClient::installChannel() // -void casCoreClient::installChannel (casChannelI &) +void casCoreClient::installChannel ( casChannelI & ) { assert (0); // dont install channels on the wrong type of client } @@ -151,7 +151,7 @@ void casCoreClient::installChannel (casChannelI &) // // casCoreClient::removeChannel() // -void casCoreClient::removeChannel (casChannelI &) +void casCoreClient::removeChannel ( casChannelI & ) { assert (0); // dont install channels on the wrong type of client } diff --git a/src/cas/generic/casEventSys.cc b/src/cas/generic/casEventSys.cc index 96a37b810..da525fee9 100644 --- a/src/cas/generic/casEventSys.cc +++ b/src/cas/generic/casEventSys.cc @@ -235,7 +235,7 @@ void casEventSys::eventSignal() // this is a pure virtual function, but we nevertheless need a // noop to be called if they call this when we are in the // casStrmClient destructor -caStatus casEventSys::disconnectChan (caResId id) +caStatus casEventSys::disconnectChan ( caResId ) { return S_cas_success; } diff --git a/src/cas/generic/casPVListChan.cc b/src/cas/generic/casPVListChan.cc index da0b54f6e..332b43a1a 100644 --- a/src/cas/generic/casPVListChan.cc +++ b/src/cas/generic/casPVListChan.cc @@ -27,9 +27,9 @@ casPVListChan::casPVListChan (const casCtx &ctx) : { } -void casPVListChan::bindToClient ( casCoreClient & client, casPVI & pv, caResId cid ) +void casPVListChan::bindToClient ( casCoreClient & client, casPVI & pv, caResId cidIn ) { - this->bindToClientI ( client, pv, cid ); + this->bindToClientI ( client, pv, cidIn ); this->pPV->installChannel ( *this ); } diff --git a/src/cas/generic/casdef.h b/src/cas/generic/casdef.h index 610d8d52c..1c7870007 100644 --- a/src/cas/generic/casdef.h +++ b/src/cas/generic/casdef.h @@ -113,7 +113,7 @@ public: // most server tools will use this pvExistReturn ( pvExistReturnEnum s = pverDoesNotExistHere ); // directory service server tools will use this (see caNetAddr.h) - pvExistReturn ( const caNetAddr & addressIn ); + pvExistReturn ( const caNetAddr & ); ~pvExistReturn (); const pvExistReturn & operator = ( pvExistReturnEnum rhs ); const pvExistReturn & operator = ( const caNetAddr & rhs ); diff --git a/src/cas/generic/pvExistReturn.cc b/src/cas/generic/pvExistReturn.cc index 79321d897..8e2e9702c 100644 --- a/src/cas/generic/pvExistReturn.cc +++ b/src/cas/generic/pvExistReturn.cc @@ -22,7 +22,7 @@ pvExistReturn::pvExistReturn ( pvExistReturnEnum s ) : status ( s ) {} -pvExistReturn::pvExistReturn ( const caNetAddr & addressIn ) : +pvExistReturn::pvExistReturn ( const caNetAddr & ) : status ( pverExistsHere ) {} pvExistReturn::~pvExistReturn () diff --git a/src/libCom/cxxTemplates/resourceLib.h b/src/libCom/cxxTemplates/resourceLib.h index d62daf5d0..5eb602501 100644 --- a/src/libCom/cxxTemplates/resourceLib.h +++ b/src/libCom/cxxTemplates/resourceLib.h @@ -293,7 +293,7 @@ inline unsigned resTable::resTableBitMask ( const unsigned nBits ) // remove a res from the resTable // template -T * resTable::remove ( const ID &idIn ) // X aCC 361 +T * resTable::remove ( const ID & idIn ) // X aCC 361 { if ( this->pTable ) { // search list for idIn and remove the first match @@ -301,8 +301,8 @@ T * resTable::remove ( const ID &idIn ) // X aCC 361 tsSLIter pItem = list.firstIter (); T *pPrev = 0; while ( pItem.valid () ) { - const ID & id = *pItem; - if ( id == idIn ) { + const ID & idOfItem = *pItem; + if ( idOfItem == idIn ) { if ( pPrev ) { list.remove ( *pPrev ); } @@ -337,7 +337,7 @@ void resTable::removeAll ( tsSLList & destination ) // resTable::lookup () // template -inline T * resTable::lookup ( const ID &idIn ) const // X aCC 361 +inline T * resTable::lookup ( const ID & idIn ) const // X aCC 361 { if ( this->pTable ) { tsSLList & list = this->pTable [ this->hash ( idIn ) ]; @@ -669,8 +669,8 @@ T * resTable::find ( tsSLList &list, const ID &idIn ) const { tsSLIter pItem = list.firstIter (); while ( pItem.valid () ) { - const ID &id = *pItem; - if ( id == idIn ) { + const ID & idOfItem = *pItem; + if ( idOfItem == idIn ) { break; } pItem++;