From 2a20d48ca4acf289f380a204f5040adee4a6817b Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 12 Apr 2012 11:13:50 -0500 Subject: [PATCH] HPUX: Remove all // X aCC comments These were added to suppress warnings from the HPUX compiler. --- src/ca/client/CASG.cpp | 2 +- src/ca/client/access.cpp | 6 ++-- src/ca/client/bhe.cpp | 2 +- src/ca/client/ca_client_context.cpp | 6 ++-- src/ca/client/cac.cpp | 12 +++---- src/ca/client/cac.h | 2 +- src/ca/client/cacIO.h | 14 ++++---- src/ca/client/casw.cpp | 4 +-- src/ca/client/comBuf.h | 4 +-- src/ca/client/comQueRecv.cpp | 2 +- src/ca/client/comQueSend.cpp | 2 +- src/ca/client/disconnectGovernorTimer.cpp | 2 +- src/ca/client/disconnectGovernorTimer.h | 2 +- src/ca/client/getCallback.cpp | 2 +- src/ca/client/getCopy.cpp | 2 +- src/ca/client/iocinf.cpp | 20 ++++++------ src/ca/client/msgForMultiplyDefinedPV.cpp | 2 +- src/ca/client/msgForMultiplyDefinedPV.h | 2 +- src/ca/client/nciu.cpp | 2 +- src/ca/client/nciu.h | 2 +- src/ca/client/netIO.h | 10 +++--- src/ca/client/netReadNotifyIO.cpp | 2 +- src/ca/client/netSubscription.cpp | 2 +- src/ca/client/netWriteNotifyIO.cpp | 2 +- src/ca/client/netiiu.h | 2 +- src/ca/client/oldChannelNotify.cpp | 4 +-- src/ca/client/putCallback.cpp | 2 +- src/ca/client/repeater.cpp | 8 ++--- src/ca/client/repeaterSubscribeTimer.cpp | 2 +- src/ca/client/repeaterSubscribeTimer.h | 2 +- src/ca/client/searchTimer.cpp | 2 +- src/ca/client/searchTimer.h | 2 +- src/ca/client/syncGroup.h | 2 +- src/ca/client/syncGroupReadNotify.cpp | 4 +-- src/ca/client/syncGroupWriteNotify.cpp | 2 +- src/ca/client/syncgrp.cpp | 4 +-- src/ca/client/tcpRecvWatchdog.cpp | 2 +- src/ca/client/tcpiiu.cpp | 32 +++++++++---------- src/ca/client/test_event.cpp | 4 +-- src/ca/client/udpiiu.cpp | 4 +-- src/ca/client/virtualCircuit.h | 2 +- src/ca/legacy/gdd/aitConvert.h | 8 ++--- src/ca/legacy/gdd/gddI.h | 20 ++++++------ src/ca/legacy/gdd/gddUtilsI.h | 2 +- src/ca/legacy/gdd/smartGDDPointer.h | 4 +-- .../directoryService/directoryServer.h | 2 +- src/ca/legacy/pcas/generic/caNetAddr.cc | 2 +- src/ca/legacy/pcas/generic/caServer.cc | 14 ++++---- src/ca/legacy/pcas/generic/casChannel.cc | 2 +- src/ca/legacy/pcas/generic/casDGClient.cc | 2 +- src/ca/legacy/pcas/generic/casMonEvent.cc | 2 +- src/ca/legacy/pcas/generic/casMonitor.cc | 6 ++-- src/ca/legacy/pcas/generic/casMonitor.h | 2 +- src/ca/legacy/pcas/generic/casPVI.cc | 4 +-- src/ca/legacy/pcas/generic/casStrmClient.cc | 8 ++--- src/ca/legacy/pcas/generic/casdef.h | 2 +- src/ca/legacy/pcas/generic/chanIntfForPV.h | 2 +- src/ca/legacy/pcas/generic/inBuf.cc | 4 +-- src/ca/legacy/pcas/generic/inBuf.h | 2 +- src/ca/legacy/pcas/generic/outBuf.cc | 4 +-- src/ca/legacy/pcas/generic/outBuf.h | 2 +- src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc | 2 +- .../legacy/pcas/io/bsdSocket/casDGIntfIO.cc | 8 ++--- src/ca/legacy/pcas/io/bsdSocket/casIntfIO.cc | 2 +- .../legacy/pcas/io/bsdSocket/casStreamIO.cc | 4 +-- .../pcas/io/bsdSocket/ipIgnoreEntry.cpp | 2 +- src/ioc/db/dbCAC.h | 2 +- src/ioc/db/dbChannelIO.cpp | 2 +- src/ioc/db/dbContext.cpp | 2 +- src/ioc/db/dbPutNotifyBlocker.cpp | 2 +- src/ioc/db/dbSubscriptionIO.cpp | 2 +- src/libCom/cxxTemplates/resourceLib.h | 12 +++---- src/libCom/fdmgr/fdmgr.cpp | 4 +-- src/libCom/misc/ipAddrToAsciiAsynchronous.cpp | 2 +- src/libCom/misc/ipAddrToAsciiAsynchronous.h | 4 +-- src/libCom/osi/epicsMutex.cpp | 2 +- src/libCom/osi/os/posix/osdTime.cpp | 4 +-- src/libCom/timer/epicsTimer.h | 10 +++--- src/libCom/timer/timer.cpp | 4 +-- src/libCom/timer/timerPrivate.h | 2 +- src/std/softIoc/softMain.cpp | 2 +- src/template/base/top/caServerApp/exPV.cc | 2 +- src/template/base/top/caServerApp/exServer.cc | 4 +-- src/template/base/top/caServerApp/exServer.h | 2 +- .../base/top/caServerApp/exVectorPV.cc | 2 +- 85 files changed, 183 insertions(+), 183 deletions(-) diff --git a/src/ca/client/CASG.cpp b/src/ca/client/CASG.cpp index 16573d1bc..721f4b3e1 100644 --- a/src/ca/client/CASG.cpp +++ b/src/ca/client/CASG.cpp @@ -295,7 +295,7 @@ void CASG::exception ( } } -void * CASG::operator new ( size_t ) // X aCC 361 +void * CASG::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ca/client/access.cpp b/src/ca/client/access.cpp index 85fe2b205..74278acd2 100644 --- a/src/ca/client/access.cpp +++ b/src/ca/client/access.cpp @@ -433,7 +433,7 @@ chid epicsShareAPI ca_evid_to_chid ( evid pMon ) } // extern "C" -int epicsShareAPI ca_pend ( ca_real timeout, int early ) // X aCC 361 +int epicsShareAPI ca_pend ( ca_real timeout, int early ) { if ( early ) { return ca_pend_io ( timeout ); @@ -516,7 +516,7 @@ int epicsShareAPI ca_flush_io () /* * CA_TEST_IO () */ -int epicsShareAPI ca_test_io () // X aCC 361 +int epicsShareAPI ca_test_io () { ca_client_context *pcac; int caStatus = fetchClientContext ( &pcac ); @@ -551,7 +551,7 @@ void epicsShareAPI ca_signal ( long ca_status, const char *message ) * (if they call this routine again). */ // extern "C" -const char * epicsShareAPI ca_message ( long ca_status ) // X aCC 361 +const char * epicsShareAPI ca_message ( long ca_status ) { unsigned msgNo = CA_EXTRACT_MSG_NO ( ca_status ); diff --git a/src/ca/client/bhe.cpp b/src/ca/client/bhe.cpp index 8ede482b4..a43fe0bc7 100644 --- a/src/ca/client/bhe.cpp +++ b/src/ca/client/bhe.cpp @@ -332,7 +332,7 @@ void bhe::unregisterIIU ( } } -void * bhe::operator new ( size_t ) // X aCC 361 +void * bhe::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ca/client/ca_client_context.cpp b/src/ca/client/ca_client_context.cpp index f0d71f5b3..c96c215f9 100644 --- a/src/ca/client/ca_client_context.cpp +++ b/src/ca/client/ca_client_context.cpp @@ -106,7 +106,7 @@ ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) : { osiSockIoctl_t yes = true; - int status = socket_ioctl ( this->sock, // X aCC 392 + int status = socket_ioctl ( this->sock, FIONBIO, & yes); if ( status < 0 ) { char sockErrBuf[64]; @@ -126,7 +126,7 @@ ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) : memset ( (char *)&addr, 0 , sizeof ( addr ) ); addr.ia.sin_family = AF_INET; addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY ); - addr.ia.sin_port = htons ( PORT_ANY ); // X aCC 818 + addr.ia.sin_port = htons ( PORT_ANY ); int status = bind (this->sock, &addr.sa, sizeof (addr) ); if ( status < 0 ) { char sockErrBuf[64]; @@ -277,7 +277,7 @@ int ca_client_context :: printFormated ( } int ca_client_context :: varArgsPrintFormated ( - const char *pformat, va_list args ) const // X aCC 361 + const char *pformat, va_list args ) const { caPrintfFunc * pFunc; { diff --git a/src/ca/client/cac.cpp b/src/ca/client/cac.cpp index 42a491fec..99825f417 100644 --- a/src/ca/client/cac.cpp +++ b/src/ca/client/cac.cpp @@ -568,7 +568,7 @@ bool cac::findOrCreateVirtCircuit ( } void cac::transferChanToVirtCircuit ( - unsigned cid, unsigned sid, // X aCC 431 + unsigned cid, unsigned sid, ca_uint16_t typeCode, arrayElementCount count, unsigned minorVersionNumber, const osiSockAddr & addr, const epicsTime & currentTime ) @@ -787,7 +787,7 @@ void cac::recycleSubscription ( netSubscription & cac::subscriptionRequest ( epicsGuard < epicsMutex > & guard, nciu & chan, privateInterfaceForIO & privChan, - unsigned type, // X aCC 361 + unsigned type, arrayElementCount nElem, unsigned mask, cacStateNotify & notifyIn, bool chanIsInstalled ) @@ -1021,7 +1021,7 @@ bool cac::readExcep ( callbackManager &, tcpiiu &, } bool cac::writeExcep ( - callbackManager & mgr, // X aCC 431 + callbackManager & mgr, tcpiiu &, const caHdrLargeArray & hdr, const char * pCtx, unsigned status ) { @@ -1093,7 +1093,7 @@ bool cac::exceptionRespAction ( callbackManager & cbMutexIn, tcpiiu & iiu, } bool cac::accessRightsRespAction ( - callbackManager & mgr, tcpiiu &, // X aCC 431 + callbackManager & mgr, tcpiiu &, const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ ) { epicsGuard < epicsMutex > guard ( this->mutex ); @@ -1110,7 +1110,7 @@ bool cac::accessRightsRespAction ( } bool cac::createChannelRespAction ( - callbackManager & mgr, tcpiiu & iiu, // X aCC 431 + callbackManager & mgr, tcpiiu & iiu, const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ ) { epicsGuard < epicsMutex > guard ( this->mutex ); @@ -1157,7 +1157,7 @@ bool cac::verifyAndDisconnectChan ( } void cac::disconnectChannel ( - epicsGuard < epicsMutex > & cbGuard, // X aCC 431 + epicsGuard < epicsMutex > & cbGuard, epicsGuard < epicsMutex > & guard, nciu & chan ) { guard.assertIdenticalMutex ( this->mutex ); diff --git a/src/ca/client/cac.h b/src/ca/client/cac.h index ae20eef27..2e95ed6bf 100644 --- a/src/ca/client/cac.h +++ b/src/ca/client/cac.h @@ -55,7 +55,7 @@ class netSubscription; // used to control access to cac's recycle routines which // should only be indirectly invoked by CAC when its lock // is applied -class cacRecycle { // X aCC 655 +class cacRecycle { public: virtual void recycleReadNotifyIO ( epicsGuard < epicsMutex > &, netReadNotifyIO &io ) = 0; diff --git a/src/ca/client/cacIO.h b/src/ca/client/cacIO.h index 8086f1239..f1cf81f47 100644 --- a/src/ca/client/cacIO.h +++ b/src/ca/client/cacIO.h @@ -69,7 +69,7 @@ typedef unsigned long arrayElementCount; // 1) this should not be passing caerr.h status to the exception callback // 2) needless-to-say the data should be passed here using the new data access API -class epicsShareClass cacWriteNotify { // X aCC 655 +class epicsShareClass cacWriteNotify { public: virtual ~cacWriteNotify () = 0; virtual void completion ( epicsGuard < epicsMutex > & ) = 0; @@ -82,7 +82,7 @@ public: // 1) this should not be passing caerr.h status to the exception callback // 2) needless-to-say the data should be passed here using the new data access API -class epicsShareClass cacReadNotify { // X aCC 655 +class epicsShareClass cacReadNotify { public: virtual ~cacReadNotify () = 0; virtual void completion ( @@ -97,7 +97,7 @@ public: // 1) this should not be passing caerr.h status to the exception callback // 2) needless-to-say the data should be passed here using the new data access API -class epicsShareClass cacStateNotify { // X aCC 655 +class epicsShareClass cacStateNotify { public: virtual ~cacStateNotify () = 0; virtual void current ( @@ -131,7 +131,7 @@ private: bool f_operatorConfirmationRequest:1; }; -class epicsShareClass cacChannelNotify { // X aCC 655 +class epicsShareClass cacChannelNotify { public: virtual ~cacChannelNotify () = 0; virtual void connectNotify ( epicsGuard < epicsMutex > & ) = 0; @@ -258,7 +258,7 @@ private: cacChannel & operator = ( const cacChannel & ); }; -class epicsShareClass cacContext { // X aCC 655 +class epicsShareClass cacContext { public: virtual ~cacContext (); virtual cacChannel & createChannel ( @@ -277,7 +277,7 @@ public: epicsGuard < epicsMutex > &, unsigned level ) const = 0; }; -class epicsShareClass cacContextNotify { // X aCC 655 +class epicsShareClass cacContextNotify { public: virtual ~cacContextNotify () = 0; virtual cacContext & createNetworkContext ( @@ -297,7 +297,7 @@ public: // **** Lock Hierarchy **** // callbackControl must be taken before mutualExclusion if both are held at // the same time -class epicsShareClass cacService { // X aCC 655 +class epicsShareClass cacService { public: virtual ~cacService () = 0; virtual cacContext & contextCreate ( diff --git a/src/ca/client/casw.cpp b/src/ca/client/casw.cpp index d8334b8ca..f69632c13 100644 --- a/src/ca/client/casw.cpp +++ b/src/ca/client/casw.cpp @@ -131,7 +131,7 @@ int main ( int argc, char ** argv ) } osiSockIoctl_t yes = true; - status = socket_ioctl ( sock, FIONBIO, &yes ); // X aCC 392 + status = socket_ioctl ( sock, FIONBIO, &yes ); if ( status < 0 ) { char sockErrBuf[64]; epicsSocketConvertErrnoToString ( @@ -166,7 +166,7 @@ int main ( int argc, char ** argv ) } osiSockIoctl_t no = false; - status = socket_ioctl ( sock, FIONBIO, &no ); // X aCC 392 + status = socket_ioctl ( sock, FIONBIO, &no ); if ( status < 0 ) { char sockErrBuf[64]; epicsSocketConvertErrnoToString ( diff --git a/src/ca/client/comBuf.h b/src/ca/client/comBuf.h index 2f6c6faa1..2da44df4c 100644 --- a/src/ca/client/comBuf.h +++ b/src/ca/client/comBuf.h @@ -44,7 +44,7 @@ public: virtual void release ( void * ) = 0; }; -class wireSendAdapter { // X aCC 655 +class wireSendAdapter { public: virtual unsigned sendBytes ( const void * pBuf, unsigned nBytesInBuf, @@ -65,7 +65,7 @@ struct statusWireIO { swioCircuitState circuitState; }; -class wireRecvAdapter { // X aCC 655 +class wireRecvAdapter { public: virtual void recvBytes ( void * pBuf, unsigned nBytesInBuf, statusWireIO & ) = 0; diff --git a/src/ca/client/comQueRecv.cpp b/src/ca/client/comQueRecv.cpp index db797fd65..88263544d 100644 --- a/src/ca/client/comQueRecv.cpp +++ b/src/ca/client/comQueRecv.cpp @@ -155,7 +155,7 @@ epicsUInt32 comQueRecv::multiBufferPopUInt32 () unsigned byte3 = this->popUInt8(); unsigned byte4 = this->popUInt8(); tmp = static_cast - ( ( byte1 << 24u ) | ( byte2 << 16u ) | //X aCC 392 + ( ( byte1 << 24u ) | ( byte2 << 16u ) | ( byte3 << 8u ) | byte4 ); } else { diff --git a/src/ca/client/comQueSend.cpp b/src/ca/client/comQueSend.cpp index 5ae150be2..6ed516bb3 100644 --- a/src/ca/client/comQueSend.cpp +++ b/src/ca/client/comQueSend.cpp @@ -368,7 +368,7 @@ void comQueSend::insertRequestWithPayLoad ( // the above checks verify that the total size // is lest that 0xffffffff size = static_cast < ca_uint32_t > - ( dbr_size_n ( dataType, nElem ) ); // X aCC 392 + ( dbr_size_n ( dataType, nElem ) ); payloadSize = CA_MESSAGE_ALIGN ( size ); this->insertRequestHeader ( request, payloadSize, static_cast ( dataType ), diff --git a/src/ca/client/disconnectGovernorTimer.cpp b/src/ca/client/disconnectGovernorTimer.cpp index 755b29cb3..f1d517f07 100644 --- a/src/ca/client/disconnectGovernorTimer.cpp +++ b/src/ca/client/disconnectGovernorTimer.cpp @@ -65,7 +65,7 @@ void disconnectGovernorTimer::shutdown ( } epicsTimerNotify::expireStatus disconnectGovernorTimer::expire ( - const epicsTime & /* currentTime */ ) // X aCC 361 + const epicsTime & /* currentTime */ ) { epicsGuard < epicsMutex > guard ( this->mutex ); while ( nciu * pChan = chanList.get () ) { diff --git a/src/ca/client/disconnectGovernorTimer.h b/src/ca/client/disconnectGovernorTimer.h index 06b8a36a8..f636d6260 100644 --- a/src/ca/client/disconnectGovernorTimer.h +++ b/src/ca/client/disconnectGovernorTimer.h @@ -43,7 +43,7 @@ #include "caProto.h" #include "netiiu.h" -class disconnectGovernorNotify { // X aCC 655 +class disconnectGovernorNotify { public: virtual ~disconnectGovernorNotify () = 0; virtual void govExpireNotify ( diff --git a/src/ca/client/getCallback.cpp b/src/ca/client/getCallback.cpp index e95433dd5..71e13cf64 100644 --- a/src/ca/client/getCallback.cpp +++ b/src/ca/client/getCallback.cpp @@ -90,7 +90,7 @@ void getCallback::exception ( } } -void * getCallback::operator new ( size_t ) // X aCC 361 +void * getCallback::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ca/client/getCopy.cpp b/src/ca/client/getCopy.cpp index 978676ef0..fb3898dc4 100644 --- a/src/ca/client/getCopy.cpp +++ b/src/ca/client/getCopy.cpp @@ -105,7 +105,7 @@ void getCopy::show ( unsigned level ) const } } -void * getCopy::operator new ( size_t ) // X aCC 361 +void * getCopy::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ca/client/iocinf.cpp b/src/ca/client/iocinf.cpp index d6fac8178..487067c00 100644 --- a/src/ca/client/iocinf.cpp +++ b/src/ca/client/iocinf.cpp @@ -133,7 +133,7 @@ extern "C" void epicsShareAPI removeDuplicateAddresses if ( pNode->addr.sa.sa_family == AF_INET ) { - pTmpNode = (osiSockAddrNode *) ellFirst (pDestList); // X aCC 749 + pTmpNode = (osiSockAddrNode *) ellFirst (pDestList); while ( pTmpNode ) { if (pTmpNode->addr.sa.sa_family == AF_INET) { if ( pNode->addr.ia.sin_addr.s_addr == pTmpNode->addr.ia.sin_addr.s_addr && @@ -149,7 +149,7 @@ extern "C" void epicsShareAPI removeDuplicateAddresses break; } } - pTmpNode = (osiSockAddrNode *) ellNext (&pTmpNode->node); // X aCC 749 + pTmpNode = (osiSockAddrNode *) ellNext (&pTmpNode->node); } if (pNode) { ellAdd (pDestList, &pNode->node); @@ -168,12 +168,12 @@ static void forcePort ( ELLLIST *pList, unsigned short port ) { osiSockAddrNode *pNode; - pNode = ( osiSockAddrNode * ) ellFirst ( pList ); // X aCC 749 + pNode = ( osiSockAddrNode * ) ellFirst ( pList ); while ( pNode ) { if ( pNode->addr.sa.sa_family == AF_INET ) { pNode->addr.ia.sin_port = htons ( port ); } - pNode = ( osiSockAddrNode * ) ellNext ( &pNode->node ); // X aCC 749 + pNode = ( osiSockAddrNode * ) ellNext ( &pNode->node ); } } @@ -192,9 +192,9 @@ extern "C" void epicsShareAPI configureChannelAccessAddressList /* * dont load the list twice */ - assert ( ellCount (pList) == 0 ); // X aCC 392 + assert ( ellCount (pList) == 0 ); - ellInit ( &tmpList ); // X aCC 392 + ellInit ( &tmpList ); /* * Check to see if the user has disabled @@ -217,12 +217,12 @@ extern "C" void epicsShareAPI configureChannelAccessAddressList if (yes) { ELLLIST bcastList; osiSockAddr addr; - ellInit ( &bcastList ); // X aCC 392 + ellInit ( &bcastList ); addr.ia.sin_family = AF_UNSPEC; osiSockDiscoverBroadcastAddresses ( &bcastList, sock, &addr ); forcePort ( &bcastList, port ); removeDuplicateAddresses ( &tmpList, &bcastList, 1 ); - if ( ellCount ( &tmpList ) == 0 ) { // X aCC 392 + if ( ellCount ( &tmpList ) == 0 ) { osiSockAddrNode *pNewNode; pNewNode = (osiSockAddrNode *) calloc ( 1, sizeof (*pNewNode) ); if ( pNewNode ) { @@ -254,11 +254,11 @@ extern "C" void epicsShareAPI printChannelAccessAddressList ( const ELLLIST *pLi osiSockAddrNode *pNode; ::printf ( "Channel Access Address List\n" ); - pNode = (osiSockAddrNode *) ellFirst ( pList ); // X aCC 749 + pNode = (osiSockAddrNode *) ellFirst ( pList ); while (pNode) { char buf[64]; ipAddrToA ( &pNode->addr.ia, buf, sizeof ( buf ) ); ::printf ( "%s\n", buf ); - pNode = (osiSockAddrNode *) ellNext ( &pNode->node ); // X aCC 749 + pNode = (osiSockAddrNode *) ellNext ( &pNode->node ); } } diff --git a/src/ca/client/msgForMultiplyDefinedPV.cpp b/src/ca/client/msgForMultiplyDefinedPV.cpp index 516bb63bb..ceb5b922e 100644 --- a/src/ca/client/msgForMultiplyDefinedPV.cpp +++ b/src/ca/client/msgForMultiplyDefinedPV.cpp @@ -73,7 +73,7 @@ void msgForMultiplyDefinedPV::operator delete ( void *pCadaver, } #endif -void * msgForMultiplyDefinedPV::operator new ( size_t ) // X aCC 361 +void * msgForMultiplyDefinedPV::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ca/client/msgForMultiplyDefinedPV.h b/src/ca/client/msgForMultiplyDefinedPV.h index 545adc815..a5f190e65 100644 --- a/src/ca/client/msgForMultiplyDefinedPV.h +++ b/src/ca/client/msgForMultiplyDefinedPV.h @@ -39,7 +39,7 @@ # define epicsExportSharedSymbols #endif -class callbackForMultiplyDefinedPV { // X aCC 655 +class callbackForMultiplyDefinedPV { public: virtual ~callbackForMultiplyDefinedPV () = 0; virtual void pvMultiplyDefinedNotify ( diff --git a/src/ca/client/nciu.cpp b/src/ca/client/nciu.cpp index c5ae941b2..452fb1549 100644 --- a/src/ca/client/nciu.cpp +++ b/src/ca/client/nciu.cpp @@ -94,7 +94,7 @@ void nciu::destroy ( this->cacCtx.destroyChannel ( guard, *this ); } -void * nciu::operator new ( size_t ) // X aCC 361 +void * nciu::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ca/client/nciu.h b/src/ca/client/nciu.h index de070dcea..f5aeca483 100644 --- a/src/ca/client/nciu.h +++ b/src/ca/client/nciu.h @@ -121,7 +121,7 @@ private: friend class disconnectGovernorTimer; }; -class privateInterfaceForIO { // X aCC 655 +class privateInterfaceForIO { public: virtual void ioCompletionNotify ( epicsGuard < epicsMutex > &, class baseNMIU & ) = 0; diff --git a/src/ca/client/netIO.h b/src/ca/client/netIO.h index 57273427a..75ebd6c04 100644 --- a/src/ca/client/netIO.h +++ b/src/ca/client/netIO.h @@ -42,7 +42,7 @@ class privateInterfaceForIO; -class baseNMIU : public tsDLNode < baseNMIU >, // X aCC 655 +class baseNMIU : public tsDLNode < baseNMIU >, public chronIntIdRes < baseNMIU > { public: virtual void destroy ( @@ -237,12 +237,12 @@ inline netSubscription * netSubscription::factory ( class privateInterfaceForIO & chan, unsigned type, arrayElementCount count, unsigned mask, cacStateNotify ¬ify ) { - return new ( freeList ) netSubscription ( chan, type, // X aCC 930 + return new ( freeList ) netSubscription ( chan, type, count, mask, notify ); } inline arrayElementCount netSubscription::getCount ( - epicsGuard < epicsMutex > & guard, bool allow_zero ) const // X aCC 361 + epicsGuard < epicsMutex > & guard, bool allow_zero ) const { //guard.assertIdenticalMutex ( this->mutex ); arrayElementCount nativeCount = this->privateChanForIO.nativeElementCount ( guard ); @@ -268,7 +268,7 @@ inline netReadNotifyIO * netReadNotifyIO::factory ( tsFreeList < class netReadNotifyIO, 1024, epicsMutexNOOP > & freeList, privateInterfaceForIO & ioComplNotifIntf, cacReadNotify & notify ) { - return new ( freeList ) netReadNotifyIO ( ioComplNotifIntf, notify ); // X aCC 930 + return new ( freeList ) netReadNotifyIO ( ioComplNotifIntf, notify ); } inline void * netReadNotifyIO::operator new ( size_t size, @@ -289,7 +289,7 @@ inline netWriteNotifyIO * netWriteNotifyIO::factory ( tsFreeList < class netWriteNotifyIO, 1024, epicsMutexNOOP > & freeList, privateInterfaceForIO & ioComplNotifyIntf, cacWriteNotify & notify ) { - return new ( freeList ) netWriteNotifyIO ( ioComplNotifyIntf, notify ); // X aCC 930 + return new ( freeList ) netWriteNotifyIO ( ioComplNotifyIntf, notify ); } inline void * netWriteNotifyIO::operator new ( size_t size, diff --git a/src/ca/client/netReadNotifyIO.cpp b/src/ca/client/netReadNotifyIO.cpp index 446b7175d..d8f893256 100644 --- a/src/ca/client/netReadNotifyIO.cpp +++ b/src/ca/client/netReadNotifyIO.cpp @@ -119,7 +119,7 @@ void netReadNotifyIO::forceSubscriptionUpdate ( { } -void * netReadNotifyIO::operator new ( size_t ) // X aCC 361 +void * netReadNotifyIO::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ca/client/netSubscription.cpp b/src/ca/client/netSubscription.cpp index 9a29ac2b6..b239595c7 100644 --- a/src/ca/client/netSubscription.cpp +++ b/src/ca/client/netSubscription.cpp @@ -170,7 +170,7 @@ void netSubscription::forceSubscriptionUpdate ( guard, chan, *this ); } -void * netSubscription::operator new ( size_t ) // X aCC 361 +void * netSubscription::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ca/client/netWriteNotifyIO.cpp b/src/ca/client/netWriteNotifyIO.cpp index 68d4992e7..912f67eb6 100644 --- a/src/ca/client/netWriteNotifyIO.cpp +++ b/src/ca/client/netWriteNotifyIO.cpp @@ -117,7 +117,7 @@ void netWriteNotifyIO::forceSubscriptionUpdate ( { } -void * netWriteNotifyIO::operator new ( size_t ) // X aCC 361 +void * netWriteNotifyIO::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ca/client/netiiu.h b/src/ca/client/netiiu.h index 99ea128f1..2caa3d0fa 100644 --- a/src/ca/client/netiiu.h +++ b/src/ca/client/netiiu.h @@ -35,7 +35,7 @@ union osiSockAddr; class cac; class nciu; -class netiiu { // X aCC 655 +class netiiu { public: virtual ~netiiu () = 0; virtual unsigned getHostName ( diff --git a/src/ca/client/oldChannelNotify.cpp b/src/ca/client/oldChannelNotify.cpp index 8865f8d63..9482ce52b 100644 --- a/src/ca/client/oldChannelNotify.cpp +++ b/src/ca/client/oldChannelNotify.cpp @@ -159,7 +159,7 @@ void oldChannelNotify::writeException ( __FILE__, __LINE__, *this, type, count, CA_OP_PUT ); } -void * oldChannelNotify::operator new ( size_t ) // X aCC 361 +void * oldChannelNotify::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly @@ -638,7 +638,7 @@ arrayElementCount epicsShareAPI ca_element_count ( chid pChan ) /* * ca_state () */ -enum channel_state epicsShareAPI ca_state ( chid pChan ) // X aCC 361 +enum channel_state epicsShareAPI ca_state ( chid pChan ) { epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () ); if ( pChan->io.connected ( guard ) ) { diff --git a/src/ca/client/putCallback.cpp b/src/ca/client/putCallback.cpp index bff1dd8a4..950ca8ee4 100644 --- a/src/ca/client/putCallback.cpp +++ b/src/ca/client/putCallback.cpp @@ -90,7 +90,7 @@ void putCallback::exception ( } } -void * putCallback::operator new ( size_t ) // X aCC 361 +void * putCallback::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ca/client/repeater.cpp b/src/ca/client/repeater.cpp index 64016aed6..1123b8a7f 100644 --- a/src/ca/client/repeater.cpp +++ b/src/ca/client/repeater.cpp @@ -178,7 +178,7 @@ bool repeaterClient::connect () return true; } -bool repeaterClient::sendConfirm () // X aCC 361 +bool repeaterClient::sendConfirm () { int status; @@ -204,7 +204,7 @@ bool repeaterClient::sendConfirm () // X aCC 361 } } -bool repeaterClient::sendMessage ( const void *pBuf, unsigned bufSize ) // X aCC 361 +bool repeaterClient::sendMessage ( const void *pBuf, unsigned bufSize ) { int status; @@ -245,7 +245,7 @@ repeaterClient::~repeaterClient () #endif } -void * repeaterClient::operator new ( size_t ) // X aCC 361 +void * repeaterClient::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly @@ -304,7 +304,7 @@ inline bool repeaterClient::identicalPort ( const osiSockAddr &fromIn ) return false; } -bool repeaterClient::verify () // X aCC 361 +bool repeaterClient::verify () { SOCKET tmpSock; bool success = makeSocket ( this->port (), false, & tmpSock ); diff --git a/src/ca/client/repeaterSubscribeTimer.cpp b/src/ca/client/repeaterSubscribeTimer.cpp index 337ff00ba..69362da5f 100644 --- a/src/ca/client/repeaterSubscribeTimer.cpp +++ b/src/ca/client/repeaterSubscribeTimer.cpp @@ -64,7 +64,7 @@ void repeaterSubscribeTimer::shutdown ( } epicsTimerNotify::expireStatus repeaterSubscribeTimer:: - expire ( const epicsTime & /* currentTime */ ) // X aCC 361 + expire ( const epicsTime & /* currentTime */ ) { static const unsigned nTriesToMsg = 50; if ( this->attempts > nTriesToMsg && ! this->once ) { diff --git a/src/ca/client/repeaterSubscribeTimer.h b/src/ca/client/repeaterSubscribeTimer.h index 0a23d16d3..52f146d6e 100644 --- a/src/ca/client/repeaterSubscribeTimer.h +++ b/src/ca/client/repeaterSubscribeTimer.h @@ -43,7 +43,7 @@ class epicsMutex; class cacContextNotify; -class repeaterTimerNotify { // X aCC 655 +class repeaterTimerNotify { public: virtual ~repeaterTimerNotify () = 0; virtual void repeaterRegistrationMessage ( diff --git a/src/ca/client/searchTimer.cpp b/src/ca/client/searchTimer.cpp index c7aa980ae..e5a8d1c54 100644 --- a/src/ca/client/searchTimer.cpp +++ b/src/ca/client/searchTimer.cpp @@ -124,7 +124,7 @@ void searchTimer::moveChannels ( // searchTimer::expire () // epicsTimerNotify::expireStatus searchTimer::expire ( - const epicsTime & currentTime ) // X aCC 361 + const epicsTime & currentTime ) { epicsGuard < epicsMutex > guard ( this->mutex ); diff --git a/src/ca/client/searchTimer.h b/src/ca/client/searchTimer.h index 2df980ded..7b9fe1717 100644 --- a/src/ca/client/searchTimer.h +++ b/src/ca/client/searchTimer.h @@ -43,7 +43,7 @@ #include "caProto.h" #include "netiiu.h" -class searchTimerNotify { // X aCC 655 +class searchTimerNotify { public: virtual ~searchTimerNotify () = 0; virtual void boostChannel ( diff --git a/src/ca/client/syncGroup.h b/src/ca/client/syncGroup.h index c41c9b5b8..0f2b07c46 100644 --- a/src/ca/client/syncGroup.h +++ b/src/ca/client/syncGroup.h @@ -49,7 +49,7 @@ static const unsigned CASG_MAGIC = 0xFAB4CAFE; // used to control access to CASG's recycle routines which // should only be indirectly invoked by CASG when its lock // is applied -class casgRecycle { // X aCC 655 +class casgRecycle { public: virtual void recycleSyncGroupWriteNotify ( epicsGuard < epicsMutex > &, class syncGroupWriteNotify & io ) = 0; diff --git a/src/ca/client/syncGroupReadNotify.cpp b/src/ca/client/syncGroupReadNotify.cpp index 11f90fe57..50c76b8f6 100644 --- a/src/ca/client/syncGroupReadNotify.cpp +++ b/src/ca/client/syncGroupReadNotify.cpp @@ -58,7 +58,7 @@ syncGroupReadNotify * syncGroupReadNotify::factory ( tsFreeList < class syncGroupReadNotify, 128, epicsMutexNOOP > & freeList, struct CASG & sg, chid chan, void * pValueIn ) { - return new ( freeList ) // X aCC 930 + return new ( freeList ) syncGroupReadNotify ( sg, chan, pValueIn ); } @@ -122,7 +122,7 @@ void syncGroupReadNotify::show ( } } -void * syncGroupReadNotify::operator new ( size_t ) // X aCC 361 +void * syncGroupReadNotify::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ca/client/syncGroupWriteNotify.cpp b/src/ca/client/syncGroupWriteNotify.cpp index 244d9d3bd..8f6505846 100644 --- a/src/ca/client/syncGroupWriteNotify.cpp +++ b/src/ca/client/syncGroupWriteNotify.cpp @@ -112,7 +112,7 @@ void syncGroupWriteNotify::show ( } } -void * syncGroupWriteNotify::operator new ( size_t ) // X aCC 361 +void * syncGroupWriteNotify::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ca/client/syncgrp.cpp b/src/ca/client/syncgrp.cpp index c76f6a194..9b65c4f57 100644 --- a/src/ca/client/syncgrp.cpp +++ b/src/ca/client/syncgrp.cpp @@ -23,7 +23,7 @@ /* * ca_sg_create() */ -extern "C" int epicsShareAPI ca_sg_create ( CA_SYNC_GID * pgid ) // X aCC 361 +extern "C" int epicsShareAPI ca_sg_create ( CA_SYNC_GID * pgid ) { ca_client_context * pcac; int caStatus; @@ -143,7 +143,7 @@ extern "C" int epicsShareAPI ca_sg_stat ( const CA_SYNC_GID gid ) /* * ca_sg_test */ -extern "C" int epicsShareAPI ca_sg_test ( const CA_SYNC_GID gid ) // X aCC 361 +extern "C" int epicsShareAPI ca_sg_test ( const CA_SYNC_GID gid ) { ca_client_context * pcac; int caStatus = fetchClientContext ( &pcac ); diff --git a/src/ca/client/tcpRecvWatchdog.cpp b/src/ca/client/tcpRecvWatchdog.cpp index 35e509a7c..72c92968b 100644 --- a/src/ca/client/tcpRecvWatchdog.cpp +++ b/src/ca/client/tcpRecvWatchdog.cpp @@ -45,7 +45,7 @@ tcpRecvWatchdog::~tcpRecvWatchdog () } epicsTimerNotify::expireStatus -tcpRecvWatchdog::expire ( const epicsTime & /* currentTime */ ) // X aCC 361 +tcpRecvWatchdog::expire ( const epicsTime & /* currentTime */ ) { epicsGuard < epicsMutex > guard ( this->mutex ); if ( this->shuttingDown ) { diff --git a/src/ca/client/tcpiiu.cpp b/src/ca/client/tcpiiu.cpp index 9cf9f6f4d..13c8df619 100644 --- a/src/ca/client/tcpiiu.cpp +++ b/src/ca/client/tcpiiu.cpp @@ -1135,7 +1135,7 @@ void tcpiiu::show ( unsigned level ) const } } -bool tcpiiu::setEchoRequestPending ( epicsGuard < epicsMutex > & guard ) // X aCC 361 +bool tcpiiu::setEchoRequestPending ( epicsGuard < epicsMutex > & guard ) { guard.assertIdenticalMutex ( this->mutex ); @@ -1280,7 +1280,7 @@ bool tcpiiu::processIncoming ( # endif } -void tcpiiu::hostNameSetRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 431 +void tcpiiu::hostNameSetRequest ( epicsGuard < epicsMutex > & guard ) { guard.assertIdenticalMutex ( this->mutex ); @@ -1310,7 +1310,7 @@ void tcpiiu::hostNameSetRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 4 /* * tcpiiu::userNameSetRequest () */ -void tcpiiu::userNameSetRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 431 +void tcpiiu::userNameSetRequest ( epicsGuard < epicsMutex > & guard ) { guard.assertIdenticalMutex ( this->mutex ); @@ -1338,7 +1338,7 @@ void tcpiiu::userNameSetRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 4 } void tcpiiu::disableFlowControlRequest ( - epicsGuard < epicsMutex > & guard ) // X aCC 431 + epicsGuard < epicsMutex > & guard ) { guard.assertIdenticalMutex ( this->mutex ); @@ -1354,7 +1354,7 @@ void tcpiiu::disableFlowControlRequest ( } void tcpiiu::enableFlowControlRequest ( - epicsGuard < epicsMutex > & guard ) // X aCC 431 + epicsGuard < epicsMutex > & guard ) { guard.assertIdenticalMutex ( this->mutex ); @@ -1369,7 +1369,7 @@ void tcpiiu::enableFlowControlRequest ( minder.commit (); } -void tcpiiu::versionMessage ( epicsGuard < epicsMutex > & guard, // X aCC 431 +void tcpiiu::versionMessage ( epicsGuard < epicsMutex > & guard, const cacChannel::priLev & priority ) { guard.assertIdenticalMutex ( this->mutex ); @@ -1389,7 +1389,7 @@ void tcpiiu::versionMessage ( epicsGuard < epicsMutex > & guard, // X aCC 431 minder.commit (); } -void tcpiiu::echoRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 431 +void tcpiiu::echoRequest ( epicsGuard < epicsMutex > & guard ) { guard.assertIdenticalMutex ( this->mutex ); @@ -1410,7 +1410,7 @@ void tcpiiu::echoRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 431 minder.commit (); } -void tcpiiu::writeRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431 +void tcpiiu::writeRequest ( epicsGuard < epicsMutex > & guard, nciu &chan, unsigned type, arrayElementCount nElem, const void *pValue ) { guard.assertIdenticalMutex ( this->mutex ); @@ -1425,7 +1425,7 @@ void tcpiiu::writeRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431 } -void tcpiiu::writeNotifyRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431 +void tcpiiu::writeNotifyRequest ( epicsGuard < epicsMutex > & guard, nciu &chan, netWriteNotifyIO &io, unsigned type, arrayElementCount nElem, const void *pValue ) { @@ -1444,7 +1444,7 @@ void tcpiiu::writeNotifyRequest ( epicsGuard < epicsMutex > & guard, // X aCC 43 minder.commit (); } -void tcpiiu::readNotifyRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431 +void tcpiiu::readNotifyRequest ( epicsGuard < epicsMutex > & guard, nciu & chan, netReadNotifyIO & io, unsigned dataType, arrayElementCount nElem ) { @@ -1477,7 +1477,7 @@ void tcpiiu::readNotifyRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431 } void tcpiiu::createChannelRequest ( - nciu & chan, epicsGuard < epicsMutex > & guard ) // X aCC 431 + nciu & chan, epicsGuard < epicsMutex > & guard ) { guard.assertIdenticalMutex ( this->mutex ); @@ -1525,7 +1525,7 @@ void tcpiiu::createChannelRequest ( minder.commit (); } -void tcpiiu::clearChannelRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431 +void tcpiiu::clearChannelRequest ( epicsGuard < epicsMutex > & guard, ca_uint32_t sid, ca_uint32_t cid ) { guard.assertIdenticalMutex ( this->mutex ); @@ -1547,7 +1547,7 @@ void tcpiiu::clearChannelRequest ( epicsGuard < epicsMutex > & guard, // X aCC 4 // is to try again the next time that we reconnect // void tcpiiu::subscriptionRequest ( - epicsGuard < epicsMutex > & guard, // X aCC 431 + epicsGuard < epicsMutex > & guard, nciu & chan, netSubscription & subscr ) { guard.assertIdenticalMutex ( this->mutex ); @@ -1599,7 +1599,7 @@ void tcpiiu::subscriptionRequest ( // is to try again the next time that we reconnect // void tcpiiu::subscriptionUpdateRequest ( - epicsGuard < epicsMutex > & guard, // X aCC 431 + epicsGuard < epicsMutex > & guard, nciu & chan, netSubscription & subscr ) { guard.assertIdenticalMutex ( this->mutex ); @@ -1634,7 +1634,7 @@ void tcpiiu::subscriptionUpdateRequest ( minder.commit (); } -void tcpiiu::subscriptionCancelRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431 +void tcpiiu::subscriptionCancelRequest ( epicsGuard < epicsMutex > & guard, nciu & chan, netSubscription & subscr ) { guard.assertIdenticalMutex ( this->mutex ); @@ -2052,7 +2052,7 @@ bool tcpiiu::bytesArePendingInOS () const return false; #else osiSockIoctl_t bytesPending = 0; /* shut up purifys yapping */ - int status = socket_ioctl ( this->sock, // X aCC 392 + int status = socket_ioctl ( this->sock, FIONREAD, & bytesPending ); if ( status >= 0 ) { if ( bytesPending > 0 ) { diff --git a/src/ca/client/test_event.cpp b/src/ca/client/test_event.cpp index c39375aef..17cfe2f47 100644 --- a/src/ca/client/test_event.cpp +++ b/src/ca/client/test_event.cpp @@ -78,7 +78,7 @@ extern "C" void epicsShareAPI ca_dump_dbr ( dbr_short_t *pvalue = (dbr_short_t *)pbuffer; for (i = 0; i < count; i++,pvalue++){ if(count!=1 && (i%10 == 0)) printf("\n"); - printf("%d ",* (short *)pvalue); // X aCC 392 + printf("%d ",* (short *)pvalue); } break; } @@ -96,7 +96,7 @@ extern "C" void epicsShareAPI ca_dump_dbr ( dbr_float_t *pvalue = (dbr_float_t *)pbuffer; for (i = 0; i < count; i++,pvalue++){ if(count!=1 && (i%10 == 0)) printf("\n"); - printf("%6.4f ",*(float *)pvalue); // X aCC 392 + printf("%6.4f ",*(float *)pvalue); } break; } diff --git a/src/ca/client/udpiiu.cpp b/src/ca/client/udpiiu.cpp index 4760583e9..e4e8bd31f 100644 --- a/src/ca/client/udpiiu.cpp +++ b/src/ca/client/udpiiu.cpp @@ -201,7 +201,7 @@ udpiiu::udpiiu ( memset ( (char *)&addr, 0 , sizeof (addr) ); addr.ia.sin_family = AF_INET; addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY ); - addr.ia.sin_port = htons ( PORT_ANY ); // X aCC 818 + addr.ia.sin_port = htons ( PORT_ANY ); status = bind (this->sock, &addr.sa, sizeof (addr) ); if ( status < 0 ) { char sockErrBuf[64]; @@ -471,7 +471,7 @@ void epicsShareAPI caRepeaterRegistrationMessage ( } memset ( (char *) &msg, 0, sizeof (msg) ); - AlignedWireRef < epicsUInt16 > ( msg.m_cmmd ) = REPEATER_REGISTER; // X aCC 818 + AlignedWireRef < epicsUInt16 > ( msg.m_cmmd ) = REPEATER_REGISTER; msg.m_available = saddr.ia.sin_addr.s_addr; /* diff --git a/src/ca/client/virtualCircuit.h b/src/ca/client/virtualCircuit.h index 3d3031f31..2af1615cd 100644 --- a/src/ca/client/virtualCircuit.h +++ b/src/ca/client/virtualCircuit.h @@ -372,7 +372,7 @@ inline bool tcpiiu::ca_v49_ok ( } inline bool tcpiiu::alive ( - epicsGuard < epicsMutex > & ) const // X aCC 361 + epicsGuard < epicsMutex > & ) const { return ( this->state == iiucs_connecting || this->state == iiucs_connected ); diff --git a/src/ca/legacy/gdd/aitConvert.h b/src/ca/legacy/gdd/aitConvert.h index 94bbe37f1..f75fdb1ba 100644 --- a/src/ca/legacy/gdd/aitConvert.h +++ b/src/ca/legacy/gdd/aitConvert.h @@ -114,15 +114,15 @@ inline void aitFromNetOrder32(aitUint32* dest,aitUint32* src) inline void aitToNetOrder64(aitUint64* dest, aitUint64* src) { aitUint32 ait_temp_var_; - ait_temp_var_=(aitUint32)htonl(src[1]); // X aCC 392 - dest[1]=(aitUint32)htonl(src[0]); // X aCC 392 + ait_temp_var_=(aitUint32)htonl(src[1]); + dest[1]=(aitUint32)htonl(src[0]); dest[0]=ait_temp_var_; } inline void aitFromNetOrder64(aitUint64* dest, aitUint64* src) { aitUint32 ait_temp_var_; - ait_temp_var_=(aitUint32)ntohl(src[1]); // X aCC 392 - dest[1]=(aitUint32)ntohl(src[0]); // X aCC 392 + ait_temp_var_=(aitUint32)ntohl(src[1]); + dest[1]=(aitUint32)ntohl(src[0]); dest[0]=ait_temp_var_; } diff --git a/src/ca/legacy/gdd/gddI.h b/src/ca/legacy/gdd/gddI.h index 53c82b4ba..09679343c 100644 --- a/src/ca/legacy/gdd/gddI.h +++ b/src/ca/legacy/gdd/gddI.h @@ -79,12 +79,12 @@ inline int gdd::isLocalDataFormat(void) const { return !(flags&GDD_NET_MASK); } inline int gdd::isNetworkDataFormat(void) const { return !isLocalDataFormat() || aitLocalNetworkDataFormatSame; } -inline void gdd::markConstant(void) { flags|=GDD_CONSTANT_MASK; } // X aCC 818 -inline void gdd::markFlat(void) { flags|=GDD_FLAT_MASK; } // X aCC 818 -inline void gdd::markManaged(void) { flags|=GDD_MANAGED_MASK; } // X aCC 818 -inline void gdd::markUnmanaged(void) { flags&=~GDD_MANAGED_MASK; } // X aCC 818 -inline void gdd::markLocalDataFormat(void) { flags&=~GDD_NET_MASK; } // X aCC 818 -inline void gdd::markNotLocalDataFormat(void) { flags|=GDD_NET_MASK; } // X aCC 818 +inline void gdd::markConstant(void) { flags|=GDD_CONSTANT_MASK; } +inline void gdd::markFlat(void) { flags|=GDD_FLAT_MASK; } +inline void gdd::markManaged(void) { flags|=GDD_MANAGED_MASK; } +inline void gdd::markUnmanaged(void) { flags&=~GDD_MANAGED_MASK; } +inline void gdd::markLocalDataFormat(void) { flags&=~GDD_NET_MASK; } +inline void gdd::markNotLocalDataFormat(void) { flags|=GDD_NET_MASK; } inline void gdd::getTimeStamp(struct timespec* const ts) const { time_stamp.get(*ts); } inline void gdd::setTimeStamp(const struct timespec* const ts) { time_stamp=*ts; } @@ -132,7 +132,7 @@ inline gddStatus gdd::noReferencing(void) gddAutoPrint("gdd::noReferencing()",gddErrorNotAllowed); rc=gddErrorNotAllowed; } - else flags|=GDD_NOREF_MASK; // X aCC 818 + else flags|=GDD_NOREF_MASK; return rc; } inline gddStatus gdd::reference(void) const @@ -148,7 +148,7 @@ inline gddStatus gdd::reference(void) const rc = gddErrorNotAllowed; } else if ( this->ref_cnt < 0xffffffff ) { - this->ref_cnt++; // X aCC 818 + this->ref_cnt++; } else { fprintf(stderr,"gdd reference count overflow!!\n"); @@ -399,10 +399,10 @@ inline void gdd::get(aitInt8* d) const if(primitiveType()==aitEnumString && dim==0) { aitString* str = (aitString*)dataAddress(); - strcpy((char*)d,str->string()); // X aCC 392 + strcpy((char*)d,str->string()); } else if(primitiveType()==aitEnumFixedString && dim==0) - strcpy((char*)d,data.FString->fixed_string); // X aCC 392 + strcpy((char*)d,data.FString->fixed_string); else aitConvert(aitEnumInt8,d,primitiveType(),dataPointer(), getDataSizeElements()); diff --git a/src/ca/legacy/gdd/gddUtilsI.h b/src/ca/legacy/gdd/gddUtilsI.h index 59f490b9c..5caec8414 100644 --- a/src/ca/legacy/gdd/gddUtilsI.h +++ b/src/ca/legacy/gdd/gddUtilsI.h @@ -30,7 +30,7 @@ inline aitIndex gddBounds::first(void) const { return start; } inline gddDestructor::gddDestructor(void) { ref_cnt=0; arg=NULL; } inline gddDestructor::gddDestructor(void* usr_arg) { ref_cnt=0; arg=usr_arg; } -inline void gddDestructor::reference(void) { ref_cnt++; } // X aCC 818 +inline void gddDestructor::reference(void) { ref_cnt++; } inline int gddDestructor::refCount(void) const { return ref_cnt; } #endif diff --git a/src/ca/legacy/gdd/smartGDDPointer.h b/src/ca/legacy/gdd/smartGDDPointer.h index ca835d503..3cbaff2f6 100644 --- a/src/ca/legacy/gdd/smartGDDPointer.h +++ b/src/ca/legacy/gdd/smartGDDPointer.h @@ -157,13 +157,13 @@ inline T & smartGDDPointerTemplate < T > :: operator * () const } template < class T > -inline bool smartGDDPointerTemplate < T > :: operator ! () const // X aCC 361 +inline bool smartGDDPointerTemplate < T > :: operator ! () const { return this->pValue ? false : true; } template < class T > -inline bool smartGDDPointerTemplate < T > :: valid () const // X aCC 361 +inline bool smartGDDPointerTemplate < T > :: valid () const { return this->pValue ? true : false; } diff --git a/src/ca/legacy/pcas/example/directoryService/directoryServer.h b/src/ca/legacy/pcas/example/directoryService/directoryServer.h index 01bc2dbb3..9315c6af7 100644 --- a/src/ca/legacy/pcas/example/directoryService/directoryServer.h +++ b/src/ca/legacy/pcas/example/directoryService/directoryServer.h @@ -74,7 +74,7 @@ private: // for this breaking out into a seperate class // from pvInfo) // -class pvEntry // X aCC 655 +class pvEntry : public stringId, public tsSLNode { public: pvEntry (const pvInfo &infoIn, directoryServer &casIn, diff --git a/src/ca/legacy/pcas/generic/caNetAddr.cc b/src/ca/legacy/pcas/generic/caNetAddr.cc index 94476d4da..24c977d0f 100644 --- a/src/ca/legacy/pcas/generic/caNetAddr.cc +++ b/src/ca/legacy/pcas/generic/caNetAddr.cc @@ -71,7 +71,7 @@ bool caNetAddr::isValid () const return this->type != casnaUDF; } -bool caNetAddr::operator == (const caNetAddr &rhs) const // X aCC 361 +bool caNetAddr::operator == (const caNetAddr &rhs) const { if ( this->type != rhs.type ) { return false; diff --git a/src/ca/legacy/pcas/generic/caServer.cc b/src/ca/legacy/pcas/generic/caServer.cc index fa4401ecd..a80e92962 100644 --- a/src/ca/legacy/pcas/generic/caServer.cc +++ b/src/ca/legacy/pcas/generic/caServer.cc @@ -65,7 +65,7 @@ pvAttachReturn caServer::pvAttach ( const casCtx &ctx, const char *pAliasName ) return this->createPV ( ctx, pAliasName ); } -casEventMask caServer::registerEvent (const char *pName) // X aCC 361 +casEventMask caServer::registerEvent (const char *pName) { if (this->pCAS) { return this->pCAS->registerEvent(pName); @@ -97,7 +97,7 @@ void caServer::setDebugLevel (unsigned level) } } -unsigned caServer::getDebugLevel () const // X aCC 361 +unsigned caServer::getDebugLevel () const { if (pCAS) { return this->pCAS->getDebugLevel(); @@ -108,7 +108,7 @@ unsigned caServer::getDebugLevel () const // X aCC 361 } } -casEventMask caServer::valueEventMask () const // X aCC 361 +casEventMask caServer::valueEventMask () const { if (pCAS) { return this->pCAS->valueEventMask(); @@ -119,7 +119,7 @@ casEventMask caServer::valueEventMask () const // X aCC 361 } } -casEventMask caServer::logEventMask () const // X aCC 361 +casEventMask caServer::logEventMask () const { if (pCAS) { return this->pCAS->logEventMask(); @@ -130,7 +130,7 @@ casEventMask caServer::logEventMask () const // X aCC 361 } } -casEventMask caServer::alarmEventMask () const // X aCC 361 +casEventMask caServer::alarmEventMask () const { if ( pCAS ) { return this->pCAS->alarmEventMask (); @@ -146,7 +146,7 @@ class epicsTimer & caServer::createTimer () return fileDescriptorManager.createTimer (); } -unsigned caServer::subscriptionEventsProcessed () const // X aCC 361 +unsigned caServer::subscriptionEventsProcessed () const { if ( pCAS ) { return this->pCAS->subscriptionEventsProcessed (); @@ -156,7 +156,7 @@ unsigned caServer::subscriptionEventsProcessed () const // X aCC 361 } } -unsigned caServer::subscriptionEventsPosted () const // X aCC 361 +unsigned caServer::subscriptionEventsPosted () const { if ( pCAS ) { return this->pCAS->subscriptionEventsPosted (); diff --git a/src/ca/legacy/pcas/generic/casChannel.cc b/src/ca/legacy/pcas/generic/casChannel.cc index 3ea176ca3..81351eb0d 100644 --- a/src/ca/legacy/pcas/generic/casChannel.cc +++ b/src/ca/legacy/pcas/generic/casChannel.cc @@ -37,7 +37,7 @@ void casChannel::destroyRequest () this->destroy (); } -casPV * casChannel::getPV () // X aCC 361 +casPV * casChannel::getPV () { if ( this->pChanI ) { casPVI & pvi = this->pChanI->getPVI (); diff --git a/src/ca/legacy/pcas/generic/casDGClient.cc b/src/ca/legacy/pcas/generic/casDGClient.cc index c87a7b6d8..4e7a23176 100644 --- a/src/ca/legacy/pcas/generic/casDGClient.cc +++ b/src/ca/legacy/pcas/generic/casDGClient.cc @@ -448,7 +448,7 @@ outBufClient::flushCondition casDGClient::xSend ( char *pBufIn, // // casDGClient::xRecv () // -inBufClient::fillCondition casDGClient::xRecv (char *pBufIn, bufSizeT nBytesToRecv, // X aCC 361 +inBufClient::fillCondition casDGClient::xRecv (char *pBufIn, bufSizeT nBytesToRecv, fillParameter parm, bufSizeT &nByesRecv) { const char *pAfter = pBufIn + nBytesToRecv; diff --git a/src/ca/legacy/pcas/generic/casMonEvent.cc b/src/ca/legacy/pcas/generic/casMonEvent.cc index d405b6cd9..064bb0fdb 100644 --- a/src/ca/legacy/pcas/generic/casMonEvent.cc +++ b/src/ca/legacy/pcas/generic/casMonEvent.cc @@ -57,7 +57,7 @@ void casMonEvent::operator delete ( void * pCadaver, } #endif -void * casMonEvent::operator new ( size_t ) // X aCC 361 +void * casMonEvent::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ca/legacy/pcas/generic/casMonitor.cc b/src/ca/legacy/pcas/generic/casMonitor.cc index 41d78396c..93a036648 100644 --- a/src/ca/legacy/pcas/generic/casMonitor.cc +++ b/src/ca/legacy/pcas/generic/casMonitor.cc @@ -77,7 +77,7 @@ void casMonitor::installNewEventLog ( this->overFlowEvent.swapValues ( *pLog ); eventLogQue.insertAfter ( *pLog, this->overFlowEvent ); assert ( this->nPend != UCHAR_MAX ); - this->nPend++; // X aCC 818 + this->nPend++; } else { // replace the old OVF value with the current one @@ -97,7 +97,7 @@ void casMonitor::installNewEventLog ( } pLog->assign ( event ); assert ( this->nPend != UCHAR_MAX ); - this->nPend++; // X aCC 818 + this->nPend++; } eventLogQue.add ( *pLog ); } @@ -117,7 +117,7 @@ caStatus casMonitor::executeEvent ( casCoreClient & client, client.getCAS().incrEventsProcessedCounter (); assert ( this->nPend != 0u ); - this->nPend--; // X aCC 818 + this->nPend--; // delete event object if it isnt a cache entry // saved in the call back object diff --git a/src/ca/legacy/pcas/generic/casMonitor.h b/src/ca/legacy/pcas/generic/casMonitor.h index 558f4db1a..82261a017 100644 --- a/src/ca/legacy/pcas/generic/casMonitor.h +++ b/src/ca/legacy/pcas/generic/casMonitor.h @@ -39,7 +39,7 @@ class casMonitor; class casClientMutex; -class casMonitorCallbackInterface { // X aCC 655 +class casMonitorCallbackInterface { public: virtual caStatus casMonitorCallBack ( epicsGuard < casClientMutex > &, casMonitor &, diff --git a/src/ca/legacy/pcas/generic/casPVI.cc b/src/ca/legacy/pcas/generic/casPVI.cc index b8f6a2fa1..5fcf6f033 100644 --- a/src/ca/legacy/pcas/generic/casPVI.cc +++ b/src/ca/legacy/pcas/generic/casPVI.cc @@ -317,7 +317,7 @@ casMonitor * casPVI::removeMonitor ( return pMon; } -caServer *casPVI::getExtServer () const // X aCC 361 +caServer *casPVI::getExtServer () const { epicsGuard < epicsMutex > guard ( this->mutex ); if ( this->pCAS ) { @@ -415,7 +415,7 @@ void casPVI::uninstallIO ( this->ioBlockedList::signal(); } -caStatus casPVI::bestDBRType ( unsigned & dbrType ) // X aCC 361 +caStatus casPVI::bestDBRType ( unsigned & dbrType ) { epicsGuard < epicsMutex > guard ( this->mutex ); aitEnum bestAIT = this->bestExternalType (); diff --git a/src/ca/legacy/pcas/generic/casStrmClient.cc b/src/ca/legacy/pcas/generic/casStrmClient.cc index 4ecb290b0..39a5ec7df 100644 --- a/src/ca/legacy/pcas/generic/casStrmClient.cc +++ b/src/ca/legacy/pcas/generic/casStrmClient.cc @@ -1629,7 +1629,7 @@ caStatus casStrmClient::createChanResponse ( if ( ! pvar.getPV()->pPVI ) { // @#$!* Tornado 2 Cygnus GNU compiler bugs # if ! defined (__GNUC__) || __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 92 ) - pvar.getPV()->pPVI = new ( std::nothrow ) // X aCC 930 + pvar.getPV()->pPVI = new ( std::nothrow ) casPVI ( *pvar.getPV() ); # else try { @@ -1678,7 +1678,7 @@ caStatus casStrmClient::createChanResponse ( if ( ! pChan->pChanI ) { // @#$!* Tornado 2 Cygnus GNU compiler bugs # if ! defined (__GNUC__) || __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 92 ) - pChan->pChanI = new ( std::nothrow ) // X aCC 930 + pChan->pChanI = new ( std::nothrow ) casChannelI ( * this, *pChan, * pvar.getPV()->pPVI, hdr.m_cid ); # else @@ -1848,7 +1848,7 @@ caStatus casStrmClient::privateCreateChanResponse ( assert ( hdr.m_cid == chan.getCID() ); status = this->out.copyInHeader ( CA_PROTO_CREATE_CHAN, 0, static_cast ( nativeTypeDBR ), - static_cast ( nativeCount ), // X aCC 392 + static_cast ( nativeCount ), chan.getCID(), chan.getSID(), 0 ); if ( status != S_cas_success ) { this->out.popCtx ( outctx ); @@ -2150,7 +2150,7 @@ void casStrmClient::casChannelDestroyFromInterfaceNotify ( } class channelDestroyEvent * pEvent = - new ( std::nothrow ) class channelDestroyEvent ( // X aCC 930 + new ( std::nothrow ) class channelDestroyEvent ( immediateUninstallNeeded ? & chan : 0, chan.getSID() ); if ( pEvent ) { diff --git a/src/ca/legacy/pcas/generic/casdef.h b/src/ca/legacy/pcas/generic/casdef.h index 72f0cb365..5d1e60981 100644 --- a/src/ca/legacy/pcas/generic/casdef.h +++ b/src/ca/legacy/pcas/generic/casdef.h @@ -113,7 +113,7 @@ class casPVI; class casCtx; class casChannel; -class epicsShareClass pvExistReturn { // X aCC 361 +class epicsShareClass pvExistReturn { public: // most server tools will use this pvExistReturn ( pvExistReturnEnum s = pverDoesNotExistHere ); diff --git a/src/ca/legacy/pcas/generic/chanIntfForPV.h b/src/ca/legacy/pcas/generic/chanIntfForPV.h index 48ca89bb3..10a2216a7 100644 --- a/src/ca/legacy/pcas/generic/chanIntfForPV.h +++ b/src/ca/legacy/pcas/generic/chanIntfForPV.h @@ -41,7 +41,7 @@ class casPVI; class casEventMask; class gdd; -class casChannelDestroyFromPV { // X aCC 655 +class casChannelDestroyFromPV { public: virtual void postDestroyEvent () = 0; protected: diff --git a/src/ca/legacy/pcas/generic/inBuf.cc b/src/ca/legacy/pcas/generic/inBuf.cc index bd3b0e0a4..f75a68df7 100644 --- a/src/ca/legacy/pcas/generic/inBuf.cc +++ b/src/ca/legacy/pcas/generic/inBuf.cc @@ -117,7 +117,7 @@ inBufClient::fillCondition inBuf::fill ( inBufClient::fillParameter parm ) // // inBuf::pushCtx () // -const inBufCtx inBuf::pushCtx ( bufSizeT headerSize, // X aCC 361 +const inBufCtx inBuf::pushCtx ( bufSizeT headerSize, bufSizeT bodySize ) { if ( headerSize + bodySize > ( this->bytesInBuffer - this->nextReadIndex ) || @@ -140,7 +140,7 @@ const inBufCtx inBuf::pushCtx ( bufSizeT headerSize, // X aCC 361 // // inBuf::popCtx () // -bufSizeT inBuf::popCtx ( const inBufCtx &ctx ) // X aCC 361 +bufSizeT inBuf::popCtx ( const inBufCtx &ctx ) { if ( ctx.stat==inBufCtx::pushCtxSuccess ) { bufSizeT bytesRemoved = this->nextReadIndex; diff --git a/src/ca/legacy/pcas/generic/inBuf.h b/src/ca/legacy/pcas/generic/inBuf.h index 066a38964..180fc5a6d 100644 --- a/src/ca/legacy/pcas/generic/inBuf.h +++ b/src/ca/legacy/pcas/generic/inBuf.h @@ -44,7 +44,7 @@ private: bufSizeT nextReadIndex; }; -class inBufClient { // X aCC 655 +class inBufClient { public: enum fillCondition { casFillNone, casFillProgress, casFillDisconnect }; diff --git a/src/ca/legacy/pcas/generic/outBuf.cc b/src/ca/legacy/pcas/generic/outBuf.cc index 54ba5eb16..a4f4d3eac 100644 --- a/src/ca/legacy/pcas/generic/outBuf.cc +++ b/src/ca/legacy/pcas/generic/outBuf.cc @@ -265,7 +265,7 @@ outBufClient::flushCondition outBuf :: flush () // // outBuf::pushCtx () // -const outBufCtx outBuf::pushCtx ( bufSizeT headerSize, // X aCC 361 +const outBufCtx outBuf::pushCtx ( bufSizeT headerSize, bufSizeT maxBodySize, void *&pHeader ) { @@ -292,7 +292,7 @@ const outBufCtx outBuf::pushCtx ( bufSizeT headerSize, // X aCC 361 // // outBuf::popCtx () // -bufSizeT outBuf::popCtx (const outBufCtx &ctx) // X aCC 361 +bufSizeT outBuf::popCtx (const outBufCtx &ctx) { if (ctx.stat==outBufCtx::pushCtxSuccess) { bufSizeT bytesAdded = this->stack; diff --git a/src/ca/legacy/pcas/generic/outBuf.h b/src/ca/legacy/pcas/generic/outBuf.h index dd1e62382..849964bf2 100644 --- a/src/ca/legacy/pcas/generic/outBuf.h +++ b/src/ca/legacy/pcas/generic/outBuf.h @@ -45,7 +45,7 @@ private: bufSizeT stack; }; -class outBufClient { // X aCC 655 +class outBufClient { public: enum flushCondition { flushNone = 0, diff --git a/src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc b/src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc index 3213d7521..5c5da03ff 100644 --- a/src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc +++ b/src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc @@ -167,7 +167,7 @@ void caServerIO::show (unsigned /* level */) const // // getToken() // -static char *getToken(const char **ppString, // X aCC 361 +static char *getToken(const char **ppString, char *pBuf, unsigned bufSIze) { const char *pToken; diff --git a/src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc b/src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc index 96add8a89..93c1636fb 100644 --- a/src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc +++ b/src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc @@ -297,7 +297,7 @@ void casDGIntfIO::xSetNonBlocking() { osiSockIoctl_t yes = true; - int status = socket_ioctl ( this->sock, FIONBIO, &yes ); // X aCC 392 + int status = socket_ioctl ( this->sock, FIONBIO, &yes ); if ( status < 0 ) { char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); @@ -307,7 +307,7 @@ void casDGIntfIO::xSetNonBlocking() if ( this->bcastRecvSock != INVALID_SOCKET ) { yes = true; - int status = socket_ioctl ( this->bcastRecvSock, // X aCC 392 + int status = socket_ioctl ( this->bcastRecvSock, FIONBIO, &yes ); if ( status < 0 ) { char sockErrBuf[64]; @@ -319,7 +319,7 @@ void casDGIntfIO::xSetNonBlocking() } inBufClient::fillCondition -casDGIntfIO::osdRecv ( char * pBufIn, bufSizeT size, // X aCC 361 +casDGIntfIO::osdRecv ( char * pBufIn, bufSizeT size, fillParameter parm, bufSizeT & actualSize, caNetAddr & fromOut ) { int status; @@ -366,7 +366,7 @@ casDGIntfIO::osdRecv ( char * pBufIn, bufSizeT size, // X aCC 361 } outBufClient::flushCondition -casDGIntfIO::osdSend ( const char * pBufIn, bufSizeT size, // X aCC 361 +casDGIntfIO::osdSend ( const char * pBufIn, bufSizeT size, const caNetAddr & to ) { int status; diff --git a/src/ca/legacy/pcas/io/bsdSocket/casIntfIO.cc b/src/ca/legacy/pcas/io/bsdSocket/casIntfIO.cc index 16cd908e3..41ce6de8d 100644 --- a/src/ca/legacy/pcas/io/bsdSocket/casIntfIO.cc +++ b/src/ca/legacy/pcas/io/bsdSocket/casIntfIO.cc @@ -198,7 +198,7 @@ void casIntfIO::setNonBlocking() int status; osiSockIoctl_t yes = true; - status = socket_ioctl(this->sock, FIONBIO, &yes); // X aCC 392 + status = socket_ioctl(this->sock, FIONBIO, &yes); if ( status < 0 ) { char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); diff --git a/src/ca/legacy/pcas/io/bsdSocket/casStreamIO.cc b/src/ca/legacy/pcas/io/bsdSocket/casStreamIO.cc index 8513f7bc2..556443dc7 100644 --- a/src/ca/legacy/pcas/io/bsdSocket/casStreamIO.cc +++ b/src/ca/legacy/pcas/io/bsdSocket/casStreamIO.cc @@ -168,7 +168,7 @@ outBufClient::flushCondition casStreamIO::osdSend ( const char *pInBuf, bufSizeT // casStreamIO::osdRecv() inBufClient::fillCondition -casStreamIO::osdRecv ( char * pInBuf, bufSizeT nBytes, // X aCC 361 +casStreamIO::osdRecv ( char * pInBuf, bufSizeT nBytes, bufSizeT & nBytesActual ) { int nchars; @@ -250,7 +250,7 @@ void casStreamIO::xSetNonBlocking() int status; osiSockIoctl_t yes = true; - status = socket_ioctl(this->sock, FIONBIO, &yes); // X aCC 392 + status = socket_ioctl(this->sock, FIONBIO, &yes); if (status>=0) { this->blockingFlag = xIsntBlocking; } diff --git a/src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp b/src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp index f40006a71..c01b7fd98 100644 --- a/src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp +++ b/src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp @@ -67,7 +67,7 @@ void ipIgnoreEntry::operator delete ( void * pCadaver, } #endif -void * ipIgnoreEntry::operator new ( size_t ) // X aCC 361 +void * ipIgnoreEntry::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ioc/db/dbCAC.h b/src/ioc/db/dbCAC.h index 3032023dc..1748b2823 100644 --- a/src/ioc/db/dbCAC.h +++ b/src/ioc/db/dbCAC.h @@ -62,7 +62,7 @@ class dbChannelIO; class dbPutNotifyBlocker; class dbSubscriptionIO; -class dbBaseIO // X aCC 655 +class dbBaseIO : public chronIntIdRes < dbBaseIO > { public: virtual dbSubscriptionIO * isSubscription () = 0; diff --git a/src/ioc/db/dbChannelIO.cpp b/src/ioc/db/dbChannelIO.cpp index c95778abe..21f92663c 100644 --- a/src/ioc/db/dbChannelIO.cpp +++ b/src/ioc/db/dbChannelIO.cpp @@ -204,7 +204,7 @@ void * dbChannelIO::operator new ( size_t size, return freeList.allocate ( size ); } -void * dbChannelIO::operator new ( size_t ) // X aCC 361 +void * dbChannelIO::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ioc/db/dbContext.cpp b/src/ioc/db/dbContext.cpp index 86ebf1997..4a14dc90b 100644 --- a/src/ioc/db/dbContext.cpp +++ b/src/ioc/db/dbContext.cpp @@ -83,7 +83,7 @@ dbContext::~dbContext () } } -cacChannel & dbContext::createChannel ( // X aCC 361 +cacChannel & dbContext::createChannel ( epicsGuard < epicsMutex > & guard, const char * pName, cacChannelNotify & notifyIn, cacChannel::priLev priority ) { diff --git a/src/ioc/db/dbPutNotifyBlocker.cpp b/src/ioc/db/dbPutNotifyBlocker.cpp index e91234b67..87bf88886 100644 --- a/src/ioc/db/dbPutNotifyBlocker.cpp +++ b/src/ioc/db/dbPutNotifyBlocker.cpp @@ -212,7 +212,7 @@ void * dbPutNotifyBlocker::operator new ( size_t size, return freeList.allocate ( size ); } -void * dbPutNotifyBlocker::operator new ( size_t ) // X aCC 361 +void * dbPutNotifyBlocker::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/ioc/db/dbSubscriptionIO.cpp b/src/ioc/db/dbSubscriptionIO.cpp index 4fd190d3f..99085dbde 100644 --- a/src/ioc/db/dbSubscriptionIO.cpp +++ b/src/ioc/db/dbSubscriptionIO.cpp @@ -94,7 +94,7 @@ void dbSubscriptionIO::channelDeleteException ( this->chan.pName(guard), this->type, this->count ); } -void * dbSubscriptionIO::operator new ( size_t ) // X aCC 361 +void * dbSubscriptionIO::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/libCom/cxxTemplates/resourceLib.h b/src/libCom/cxxTemplates/resourceLib.h index a6a943630..4c79f6cca 100644 --- a/src/libCom/cxxTemplates/resourceLib.h +++ b/src/libCom/cxxTemplates/resourceLib.h @@ -296,7 +296,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 ) { if ( this->pTable ) { // search list for idIn and remove the first match @@ -341,7 +341,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 { if ( this->pTable ) { tsSLList & list = this->pTable [ this->hash ( idIn ) ]; @@ -514,7 +514,7 @@ inline unsigned resTable::numEntriesInstalled () const } template -inline unsigned resTable::tableSize () const // X aCC 361 +inline unsigned resTable::tableSize () const { if ( this->pTable ) { return ( this->hashIxMask + 1 ) + this->nextSplitIndex; @@ -1010,7 +1010,7 @@ intId::intId (const T &idIn) // intId::operator == () // template -inline bool intId::operator == // X aCC 361 +inline bool intId::operator == (const intId &idIn) const { return this->id == idIn.id; @@ -1020,7 +1020,7 @@ inline bool intId::operator == // X aCC 361 // intId::getId () // template -inline const T intId::getId () const // X aCC 361 +inline const T intId::getId () const { return this->id; } @@ -1067,7 +1067,7 @@ inline resTableIndex integerHash ( unsigned MIN_INDEX_WIDTH, // intId::hash() // template -inline resTableIndex intId::hash () const // X aCC 361 +inline resTableIndex intId::hash () const { return integerHash ( MIN_INDEX_WIDTH, MAX_ID_WIDTH, this->id ); } diff --git a/src/libCom/fdmgr/fdmgr.cpp b/src/libCom/fdmgr/fdmgr.cpp index 2d9245bd3..54c0f809c 100644 --- a/src/libCom/fdmgr/fdmgr.cpp +++ b/src/libCom/fdmgr/fdmgr.cpp @@ -228,7 +228,7 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_timeout (fdctx *pfdctx, return 0; } -extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback ( // X aCC 361 +extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback ( fdctx *pfdctx, SOCKET fd, enum fdi_type fdi, pCallBackFDMgr pFunc, void *pParam) { oldFdmgr *pfdm = static_cast (pfdctx); @@ -270,7 +270,7 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback ( // X aCC 361 } } -extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_callback ( // X aCC 361 +extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_callback ( fdctx *pfdctx, SOCKET fd, enum fdi_type fdi) { oldFdmgr *pfdm = static_cast (pfdctx); diff --git a/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp b/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp index b3c216d04..8f79a063c 100644 --- a/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp +++ b/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp @@ -272,7 +272,7 @@ inline void ipAddrToAsciiTransactionPrivate::operator delete ( void * pTrans, ts } #endif -void * ipAddrToAsciiTransactionPrivate::operator new ( size_t ) // X aCC 361 +void * ipAddrToAsciiTransactionPrivate::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/libCom/misc/ipAddrToAsciiAsynchronous.h b/src/libCom/misc/ipAddrToAsciiAsynchronous.h index 1e7ef6619..95b853994 100644 --- a/src/libCom/misc/ipAddrToAsciiAsynchronous.h +++ b/src/libCom/misc/ipAddrToAsciiAsynchronous.h @@ -36,7 +36,7 @@ public: virtual ~ipAddrToAsciiCallBack () = 0; }; -class epicsShareClass ipAddrToAsciiTransaction { // X aCC 655 +class epicsShareClass ipAddrToAsciiTransaction { public: virtual void release () = 0; virtual void ipAddrToAscii ( const osiSockAddr &, ipAddrToAsciiCallBack & ) = 0; @@ -46,7 +46,7 @@ protected: virtual ~ipAddrToAsciiTransaction () = 0; }; -class epicsShareClass ipAddrToAsciiEngine { // X aCC 655 +class epicsShareClass ipAddrToAsciiEngine { public: virtual void release () = 0; virtual ipAddrToAsciiTransaction & createTransaction () = 0; diff --git a/src/libCom/osi/epicsMutex.cpp b/src/libCom/osi/epicsMutex.cpp index d2e421204..ba62c9109 100644 --- a/src/libCom/osi/epicsMutex.cpp +++ b/src/libCom/osi/epicsMutex.cpp @@ -239,7 +239,7 @@ void epicsMutex::lock () } } -bool epicsMutex::tryLock () // X aCC 361 +bool epicsMutex::tryLock () { epicsMutexLockStatus status = epicsMutexTryLock ( this->id ); if ( status == epicsMutexLockOK ) { diff --git a/src/libCom/osi/os/posix/osdTime.cpp b/src/libCom/osi/os/posix/osdTime.cpp index 62939a427..2f7dda287 100644 --- a/src/libCom/osi/os/posix/osdTime.cpp +++ b/src/libCom/osi/os/posix/osdTime.cpp @@ -60,7 +60,7 @@ static int timeRegister(void) static int done = timeRegister(); -int epicsTime_gmtime ( const time_t *pAnsiTime, // X aCC 361 +int epicsTime_gmtime ( const time_t *pAnsiTime, struct tm *pTM ) { struct tm * pRet = gmtime_r ( pAnsiTime, pTM ); @@ -72,7 +72,7 @@ int epicsTime_gmtime ( const time_t *pAnsiTime, // X aCC 361 } } -int epicsTime_localtime ( const time_t *clock, // X aCC 361 +int epicsTime_localtime ( const time_t *clock, struct tm *result ) { struct tm * pRet = localtime_r ( clock, result ); diff --git a/src/libCom/timer/epicsTimer.h b/src/libCom/timer/epicsTimer.h index 769174bcc..72270f273 100644 --- a/src/libCom/timer/epicsTimer.h +++ b/src/libCom/timer/epicsTimer.h @@ -47,7 +47,7 @@ public: virtual void show ( unsigned int level ) const; }; -class epicsShareClass epicsTimer { /* X aCC 655 */ +class epicsShareClass epicsTimer { public: /* calls cancel (see warning below) and then destroys the timer */ virtual void destroy () = 0; @@ -70,7 +70,7 @@ protected: virtual ~epicsTimer () = 0; /* protected => delete() must not be called */ }; -class epicsTimerQueue { /* X aCC 655 */ +class epicsTimerQueue { public: virtual epicsTimer & createTimer () = 0; virtual void show ( unsigned int level ) const = 0; @@ -78,7 +78,7 @@ protected: epicsShareFunc virtual ~epicsTimerQueue () = 0; }; -class epicsTimerQueueActive /* X aCC 655 */ +class epicsTimerQueueActive : public epicsTimerQueue { public: static epicsShareFunc epicsTimerQueueActive & allocate ( @@ -88,7 +88,7 @@ protected: epicsShareFunc virtual ~epicsTimerQueueActive () = 0; }; -class epicsTimerQueueNotify { /* X aCC 655 */ +class epicsTimerQueueNotify { public: /* called when a new timer is inserted into the queue and the */ /* delay to the next expire has changed */ @@ -100,7 +100,7 @@ protected: epicsShareFunc virtual ~epicsTimerQueueNotify () = 0; }; -class epicsTimerQueuePassive /* X aCC 655 */ +class epicsTimerQueuePassive : public epicsTimerQueue { public: static epicsShareFunc epicsTimerQueuePassive & create ( epicsTimerQueueNotify & ); diff --git a/src/libCom/timer/timer.cpp b/src/libCom/timer/timer.cpp index 788bf6d61..baab6aa16 100644 --- a/src/libCom/timer/timer.cpp +++ b/src/libCom/timer/timer.cpp @@ -221,7 +221,7 @@ void timer::show ( unsigned int level ) const } } -void * timer::operator new ( size_t ) // X aCC 361 +void * timer::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly @@ -239,7 +239,7 @@ void timer::operator delete ( void * ) __FILE__, __LINE__ ); } -void * epicsTimerForC::operator new ( size_t ) // X aCC 361 +void * epicsTimerForC::operator new ( size_t ) { // The HPUX compiler seems to require this even though no code // calls it directly diff --git a/src/libCom/timer/timerPrivate.h b/src/libCom/timer/timerPrivate.h index a5afc0df9..9283ae4ee 100644 --- a/src/libCom/timer/timerPrivate.h +++ b/src/libCom/timer/timerPrivate.h @@ -118,7 +118,7 @@ private: friend struct epicsTimerForC; }; -class timerQueueActiveMgrPrivate { // X aCC 655 +class timerQueueActiveMgrPrivate { public: timerQueueActiveMgrPrivate (); protected: diff --git a/src/std/softIoc/softMain.cpp b/src/std/softIoc/softMain.cpp index 3c847852d..a2b64eae8 100644 --- a/src/std/softIoc/softMain.cpp +++ b/src/std/softIoc/softMain.cpp @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) } softIoc_registerRecordDeviceDriver(pdbbase); - registryFunctionAdd("exit", (REGISTRYFUNCTION) exitSubroutine); // X aCC 331 + registryFunctionAdd("exit", (REGISTRYFUNCTION) exitSubroutine); while (argc>1 && **argv == '-') { switch ((*argv)[1]) { diff --git a/src/template/base/top/caServerApp/exPV.cc b/src/template/base/top/caServerApp/exPV.cc index bc88b15bb..af99c4e6a 100644 --- a/src/template/base/top/caServerApp/exPV.cc +++ b/src/template/base/top/caServerApp/exPV.cc @@ -107,7 +107,7 @@ caStatus exPV::update ( const gdd & valueIn ) // exScanTimer::expire () // epicsTimerNotify::expireStatus -exPV::expire ( const epicsTime & /*currentTime*/ ) // X aCC 361 +exPV::expire ( const epicsTime & /*currentTime*/ ) { this->scan(); if ( this->scanOn && this->getScanPeriod() > 0.0 ) { diff --git a/src/template/base/top/caServerApp/exServer.cc b/src/template/base/top/caServerApp/exServer.cc index cff290838..49ea802dc 100644 --- a/src/template/base/top/caServerApp/exServer.cc +++ b/src/template/base/top/caServerApp/exServer.cc @@ -167,7 +167,7 @@ pvExistReturn exServer::pvExistTest // // exServer::pvExistTest() // -pvExistReturn exServer::pvExistTest // X aCC 361 +pvExistReturn exServer::pvExistTest ( const casCtx& ctxIn, const char * pPVName ) { // @@ -214,7 +214,7 @@ pvExistReturn exServer::pvExistTest // X aCC 361 // // exServer::pvAttach() // -pvAttachReturn exServer::pvAttach // X aCC 361 +pvAttachReturn exServer::pvAttach (const casCtx &ctx, const char *pName) { // diff --git a/src/template/base/top/caServerApp/exServer.h b/src/template/base/top/caServerApp/exServer.h index 5fb6adaf7..59ba11309 100644 --- a/src/template/base/top/caServerApp/exServer.h +++ b/src/template/base/top/caServerApp/exServer.h @@ -103,7 +103,7 @@ private: // for this breaking out into a seperate class // from pvInfo) // -class pvEntry // X aCC 655 +class pvEntry : public stringId, public tsSLNode < pvEntry > { public: pvEntry ( pvInfo &infoIn, exServer & casIn, diff --git a/src/template/base/top/caServerApp/exVectorPV.cc b/src/template/base/top/caServerApp/exVectorPV.cc index da357831f..963b59082 100644 --- a/src/template/base/top/caServerApp/exVectorPV.cc +++ b/src/template/base/top/caServerApp/exVectorPV.cc @@ -45,7 +45,7 @@ unsigned exVectorPV::maxDimension() const // // exVectorPV::maxBound() // -aitIndex exVectorPV::maxBound (unsigned dimension) const // X aCC 361 +aitIndex exVectorPV::maxBound (unsigned dimension) const { if (dimension==0u) { return this->info.getElementCount();