epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Fixed fixes for HP-UX.

Browse Source
This commit is contained in:
Ralph Lange
2005-11-04 15:54:34 +00:00
parent 6820307b60
commit 892f8581b1
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ca/cac.cpp
View File

@@ -749,7 +749,7 @@ bool cac::versionAction ( callbackManager &, tcpiiu &,
bool cac::echoRespAction (
callbackManager & mgr, tcpiiu & iiu,
const epicsTime &, const caHdrLargeArray &, void * )
const epicsTime & /* current */, 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 * )
const epicsTime &, const caHdrLargeArray &, void * /* pMsgBody */ )
{
return true; // currently a noop
}
@@ -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 * )
const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ )
{
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 * )
const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ )
{
epicsGuard < epicsMutex > guard ( this->mutex );
nciu * pChan = this->chanTable.lookup ( hdr.m_cid );
@@ -1077,7 +1077,7 @@ bool cac::createChannelRespAction (
bool cac::verifyAndDisconnectChan (
callbackManager & mgr, tcpiiu &,
const epicsTime &, const caHdrLargeArray & hdr, void * )
const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ )
{
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 * )
const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ )
{
epicsGuard < epicsMutex > guard ( this->mutex );
char hostName[64];

2
src/ca/disconnectGovernorTimer.cpp
View File

@@ -63,7 +63,7 @@ void disconnectGovernorTimer::shutdown (
}
epicsTimerNotify::expireStatus disconnectGovernorTimer::expire (
const epicsTime & ) // X aCC 361
const epicsTime & /* currentTime */ ) // X aCC 361
{
epicsGuard < epicsMutex > guard ( this->mutex );
while ( nciu * pChan = chanList.get () ) {

6
src/ca/netiiu.cpp
View File

@@ -154,15 +154,15 @@ double netiiu::receiveWatchdogDelay (
void netiiu::uninstallChanDueToSuccessfulSearchResponse (
epicsGuard < epicsMutex > &, nciu &,
const epicsTime & )
const epicsTime & currentTime )
{
throw std::runtime_error (
"search response occured when not attached to udpiiu?" );
}
bool netiiu::searchMsg (
epicsGuard < epicsMutex > &, ca_uint32_t,
const char *, unsigned )
epicsGuard < epicsMutex > &, ca_uint32_t /* id */,
const char * /* pName */, unsigned /* nameLength */ )
{
return false;
}

6
src/ca/udpiiu.cpp
View File

@@ -599,7 +599,7 @@ bool udpiiu::badUDPRespAction (
}
bool udpiiu::versionAction ( epicsGuard < epicsMutex > &,
const caHdr & hdr, const osiSockAddr &, const epicsTime & )
const caHdr & hdr, const osiSockAddr &, const epicsTime & /* currentTime */ )
{
epicsGuard < epicsMutex > guard ( this->cacMutex );
@@ -724,7 +724,7 @@ bool udpiiu::beaconAction (
}
bool udpiiu::repeaterAckAction (
epicsGuard < epicsMutex > &, const caHdr &,
epicsGuard < epicsMutex > & /* cbGuard */, 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 & )
epicsGuard < epicsMutex > &, const epicsTime & /* currentTime */ )
{
// dont send the version header by itself
if ( this->nBytesInXmitBuf <= sizeof ( caHdr ) ) {