From 22be6c91e16b055fcd3db06dd3cf6de0a97a24c8 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Fri, 4 Nov 2005 14:20:12 +0000 Subject: [PATCH] Fixed warnings for HP-UX. --- src/ca/baseNMIU.cpp | 2 +- src/ca/cac.cpp | 16 ++++++++-------- src/ca/cacChannel.cpp | 2 +- src/ca/disconnectGovernorTimer.cpp | 2 +- src/ca/netiiu.cpp | 10 +++++----- src/ca/udpiiu.cpp | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/ca/baseNMIU.cpp b/src/ca/baseNMIU.cpp index 94374d1b9..20f153b0a 100644 --- a/src/ca/baseNMIU.cpp +++ b/src/ca/baseNMIU.cpp @@ -30,7 +30,7 @@ baseNMIU::~baseNMIU () } void baseNMIU::forceSubscriptionUpdate ( - epicsGuard < epicsMutex > & guard, nciu & chan ) + epicsGuard < epicsMutex > &, nciu & ) { } diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp index 6110e2879..43344a84f 100644 --- a/src/ca/cac.cpp +++ b/src/ca/cac.cpp @@ -749,7 +749,7 @@ bool cac::versionAction ( callbackManager &, tcpiiu &, bool cac::echoRespAction ( callbackManager & mgr, tcpiiu & iiu, - const epicsTime & current, const caHdrLargeArray &, void * ) + const epicsTime &, const caHdrLargeArray &, void * ) { iiu.probeResponseNotify ( mgr.cbGuard ); return true; @@ -911,7 +911,7 @@ bool cac::readRespAction ( callbackManager &, tcpiiu &, } bool cac::clearChannelRespAction ( callbackManager &, tcpiiu &, - const epicsTime &, const caHdrLargeArray &, void * /* pMsgBdy */ ) + const epicsTime &, const caHdrLargeArray &, void * ) { return true; // currently a noop } @@ -941,7 +941,7 @@ void cac::exception ( } bool cac::eventAddExcep ( - callbackManager &, tcpiiu & /* iiu */, + callbackManager &, tcpiiu &, const caHdrLargeArray &hdr, const char *pCtx, unsigned status ) { @@ -1033,7 +1033,7 @@ bool cac::exceptionRespAction ( callbackManager & cbMutexIn, tcpiiu & iiu, bool cac::accessRightsRespAction ( callbackManager & mgr, tcpiiu &, // X aCC 431 - const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBdy */ ) + const epicsTime &, const caHdrLargeArray & hdr, void * ) { epicsGuard < epicsMutex > guard ( this->mutex ); nciu * pChan = this->chanTable.lookup ( hdr.m_cid ); @@ -1050,7 +1050,7 @@ bool cac::accessRightsRespAction ( bool cac::createChannelRespAction ( callbackManager & mgr, tcpiiu & iiu, // X aCC 431 - const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBdy */ ) + const epicsTime &, const caHdrLargeArray & hdr, void * ) { epicsGuard < epicsMutex > guard ( this->mutex ); nciu * pChan = this->chanTable.lookup ( hdr.m_cid ); @@ -1076,8 +1076,8 @@ bool cac::createChannelRespAction ( } bool cac::verifyAndDisconnectChan ( - callbackManager & mgr, tcpiiu & /* iiu */, - const epicsTime & currentTime, const caHdrLargeArray & hdr, void * /* pMsgBdy */ ) + callbackManager & mgr, tcpiiu &, + const epicsTime &, const caHdrLargeArray & hdr, void * ) { epicsGuard < epicsMutex > guard ( this->mutex ); nciu * pChan = this->chanTable.lookup ( hdr.m_cid ); @@ -1101,7 +1101,7 @@ void cac::disconnectChannel ( } bool cac::badTCPRespAction ( callbackManager &, tcpiiu & iiu, - const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBdy */ ) + const epicsTime &, const caHdrLargeArray & hdr, void * ) { epicsGuard < epicsMutex > guard ( this->mutex ); char hostName[64]; diff --git a/src/ca/cacChannel.cpp b/src/ca/cacChannel.cpp index 66ed96c0d..284c54187 100644 --- a/src/ca/cacChannel.cpp +++ b/src/ca/cacChannel.cpp @@ -95,7 +95,7 @@ unsigned cacChannel::getHostName ( // the default is to assume that it is a locally hosted channel const char * cacChannel::pHostName ( - epicsGuard < epicsMutex > & guard ) const throw () + epicsGuard < epicsMutex > & ) const throw () { epicsSingleton < localHostName >::reference ref ( localHostNameAtLoadTime.getReference () ); diff --git a/src/ca/disconnectGovernorTimer.cpp b/src/ca/disconnectGovernorTimer.cpp index 262798106..29d538806 100644 --- a/src/ca/disconnectGovernorTimer.cpp +++ b/src/ca/disconnectGovernorTimer.cpp @@ -63,7 +63,7 @@ void disconnectGovernorTimer::shutdown ( } epicsTimerNotify::expireStatus disconnectGovernorTimer::expire ( - const epicsTime & currentTime ) // X aCC 361 + const epicsTime & ) // X aCC 361 { epicsGuard < epicsMutex > guard ( this->mutex ); while ( nciu * pChan = chanList.get () ) { diff --git a/src/ca/netiiu.cpp b/src/ca/netiiu.cpp index f391bfc5e..afd30b397 100644 --- a/src/ca/netiiu.cpp +++ b/src/ca/netiiu.cpp @@ -92,7 +92,7 @@ void netiiu::subscriptionUpdateRequest ( static const char * const pHostNameNetIIU = ""; unsigned netiiu::getHostName ( - epicsGuard < epicsMutex > & guard, + epicsGuard < epicsMutex > &, char * pBuf, unsigned bufLen ) const throw () { if ( bufLen ) { @@ -147,22 +147,22 @@ void netiiu::uninstallChan ( } double netiiu::receiveWatchdogDelay ( - epicsGuard < epicsMutex > & guard ) const + epicsGuard < epicsMutex > & ) const { return - DBL_MAX; } void netiiu::uninstallChanDueToSuccessfulSearchResponse ( epicsGuard < epicsMutex > &, nciu &, - const epicsTime & currentTime ) + const epicsTime & ) { throw std::runtime_error ( "search response occured when not attached to udpiiu?" ); } bool netiiu::searchMsg ( - epicsGuard < epicsMutex > &, ca_uint32_t id, - const char * pName, unsigned nameLength ) + epicsGuard < epicsMutex > &, ca_uint32_t, + const char *, unsigned ) { return false; } diff --git a/src/ca/udpiiu.cpp b/src/ca/udpiiu.cpp index 22e5525cf..dd5dccc7f 100644 --- a/src/ca/udpiiu.cpp +++ b/src/ca/udpiiu.cpp @@ -599,7 +599,7 @@ bool udpiiu::badUDPRespAction ( } bool udpiiu::versionAction ( epicsGuard < epicsMutex > &, - const caHdr & hdr, const osiSockAddr &, const epicsTime & currentTime ) + const caHdr & hdr, const osiSockAddr &, const epicsTime & ) { epicsGuard < epicsMutex > guard ( this->cacMutex ); @@ -724,7 +724,7 @@ bool udpiiu::beaconAction ( } bool udpiiu::repeaterAckAction ( - epicsGuard < epicsMutex > & cbGuard, const caHdr &, + epicsGuard < epicsMutex > &, const caHdr &, const osiSockAddr &, const epicsTime &) { this->repeaterSubscribeTmr.confirmNotify (); @@ -892,7 +892,7 @@ bool udpiiu::pushDatagramMsg ( epicsGuard < epicsMutex > & guard, } bool udpiiu::datagramFlush ( - epicsGuard < epicsMutex > &, const epicsTime & currentTime ) + epicsGuard < epicsMutex > &, const epicsTime & ) { // dont send the version header by itself if ( this->nBytesInXmitBuf <= sizeof ( caHdr ) ) { @@ -1058,7 +1058,7 @@ bool udpiiu::searchMsg ( msg.m_count = epicsHTON16 ( CA_MINOR_PROTOCOL_REVISION ); msg.m_cid = epicsHTON32 ( id ); return this->pushDatagramMsg ( - guard, msg, pName, nameLength ); + guard, msg, pName, (ca_uint16_t) nameLength ); } void udpiiu::installNewChannel (