diff --git a/modules/ca/src/client/cac.h b/modules/ca/src/client/cac.h index 8fcb7c563..79dcbaa9b 100644 --- a/modules/ca/src/client/cac.h +++ b/modules/ca/src/client/cac.h @@ -203,7 +203,6 @@ public: void destroyIIU ( tcpiiu & iiu ); const char * pLocalHostName (); - const resTable < tcpiiu, caServerID > & getServerTable(); private: epicsSingleton < localHostName > :: reference _refLocalHostName; @@ -425,10 +424,4 @@ inline double cac :: return this->connTMO; } -inline const resTable < tcpiiu, caServerID > & cac :: - getServerTable() -{ - return this->serverTable; -} - #endif // ifndef INC_cac_H diff --git a/modules/ca/src/client/cacChannel.cpp b/modules/ca/src/client/cacChannel.cpp index a76d6e957..33345967c 100644 --- a/modules/ca/src/client/cacChannel.cpp +++ b/modules/ca/src/client/cacChannel.cpp @@ -129,13 +129,6 @@ unsigned cacChannel::getHostName ( return 0u; } -unsigned cacChannel::getHostMinorProtocol ( - epicsGuard < epicsMutex > &) const throw () -{ - epicsThreadOnce ( & cacChannelIdOnce, cacChannelSetup, 0); - return 0u; -} - // the default is to assume that it is a locally hosted channel const char * cacChannel::pHostName ( epicsGuard < epicsMutex > & ) const throw () diff --git a/modules/ca/src/client/cacIO.h b/modules/ca/src/client/cacIO.h index 777155047..760d8dd72 100644 --- a/modules/ca/src/client/cacIO.h +++ b/modules/ca/src/client/cacIO.h @@ -246,8 +246,7 @@ public: // !! deprecated, avoid use !! virtual const char * pHostName ( epicsGuard < epicsMutex > & guard ) const throw (); - virtual unsigned getHostMinorProtocol ( - epicsGuard < epicsMutex > &) const throw () ; + // exceptions class badString {}; class badType {}; diff --git a/modules/ca/src/client/cadef.h b/modules/ca/src/client/cadef.h index 5c60a06f7..e7ab45cbe 100644 --- a/modules/ca/src/client/cadef.h +++ b/modules/ca/src/client/cadef.h @@ -1460,17 +1460,6 @@ LIBCA_API const char * epicsStdCall ca_host_name (chid channel); LIBCA_API unsigned epicsStdCall ca_get_host_name ( chid pChan, char *pBuf, unsigned bufLength ); -/** \brief Return the minor protocol version number used by the host to - * which a channel is cuurently connected. - * - * \param[in] pChan channel identifier - * \returns The minor protocol version number. - * If the channel is disconnected CA_UKN_MINOR_VERSION is returned. - */ -LIBCA_API unsigned epicsStdCall ca_host_minor_protocol (chid pChan); - -#define HAS_CA_HOST_MINOR_PROTOCOL - /** \brief Call their function with their argument whenever * a new fd is added or removed. * diff --git a/modules/ca/src/client/nciu.cpp b/modules/ca/src/client/nciu.cpp index fc5d3cb4c..a862cb228 100644 --- a/modules/ca/src/client/nciu.cpp +++ b/modules/ca/src/client/nciu.cpp @@ -410,13 +410,6 @@ const char * nciu::pHostName ( return this->piiu->pHostName ( guard ); } -unsigned nciu::getHostMinorProtocol ( - epicsGuard < epicsMutex > & guard) const throw () -{ - return this->piiu->getHostMinorProtocol ( - guard ); -} - bool nciu::ca_v42_ok ( epicsGuard < epicsMutex > & guard ) const { diff --git a/modules/ca/src/client/nciu.h b/modules/ca/src/client/nciu.h index 7e94fe1b8..d909aa917 100644 --- a/modules/ca/src/client/nciu.h +++ b/modules/ca/src/client/nciu.h @@ -183,8 +183,6 @@ public: unsigned getHostName ( epicsGuard < epicsMutex > &, char * pBuf, unsigned bufLen ) const throw (); - unsigned getHostMinorProtocol ( - epicsGuard < epicsMutex > &) const throw (); void writeException ( epicsGuard < epicsMutex > &, epicsGuard < epicsMutex > &, int status, const char *pContext, unsigned type, arrayElementCount count ); diff --git a/modules/ca/src/client/netiiu.cpp b/modules/ca/src/client/netiiu.cpp index 04a5fb524..c73732af6 100644 --- a/modules/ca/src/client/netiiu.cpp +++ b/modules/ca/src/client/netiiu.cpp @@ -116,12 +116,6 @@ const char * netiiu::pHostName ( return pHostNameNetIIU; } -unsigned netiiu::getHostMinorProtocol ( - epicsGuard < epicsMutex > & ) const throw () -{ - return CA_UKN_MINOR_VERSION; -} - osiSockAddr netiiu::getNetworkAddress ( epicsGuard < epicsMutex > & ) const { diff --git a/modules/ca/src/client/netiiu.h b/modules/ca/src/client/netiiu.h index d21ed8428..298337bd3 100644 --- a/modules/ca/src/client/netiiu.h +++ b/modules/ca/src/client/netiiu.h @@ -43,8 +43,6 @@ public: unsigned bufLength ) const throw () = 0; virtual const char * pHostName ( epicsGuard < epicsMutex > & ) const throw () = 0; - virtual unsigned getHostMinorProtocol ( - epicsGuard < epicsMutex > & ) const throw (); virtual bool ca_v41_ok ( epicsGuard < epicsMutex > & ) const = 0; virtual bool ca_v42_ok ( diff --git a/modules/ca/src/client/oldAccess.h b/modules/ca/src/client/oldAccess.h index 3e8edb914..2c39d2768 100644 --- a/modules/ca/src/client/oldAccess.h +++ b/modules/ca/src/client/oldAccess.h @@ -64,8 +64,6 @@ public: chid pChan, char * pBuf, unsigned bufLength ); friend const char * epicsStdCall ca_host_name ( chid pChan ); - friend unsigned epicsStdCall ca_host_minor_protocol ( - chid pChan ); friend const char * epicsStdCall ca_name ( chid pChan ); friend void epicsStdCall ca_set_puser ( diff --git a/modules/ca/src/client/oldChannelNotify.cpp b/modules/ca/src/client/oldChannelNotify.cpp index 0a3512827..71688c94c 100644 --- a/modules/ca/src/client/oldChannelNotify.cpp +++ b/modules/ca/src/client/oldChannelNotify.cpp @@ -193,16 +193,6 @@ const char * epicsStdCall ca_host_name ( return pChan->io.pHostName ( guard ); } -/* - * ca_host_minorProtocol () - */ -unsigned epicsStdCall ca_host_minor_protocol ( - chid pChan ) -{ - epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () ); - return pChan->io.getHostMinorProtocol( guard ); -} - /* * ca_set_puser () */ diff --git a/modules/ca/src/client/tcpiiu.cpp b/modules/ca/src/client/tcpiiu.cpp index b8ebaac32..30f6fad17 100644 --- a/modules/ca/src/client/tcpiiu.cpp +++ b/modules/ca/src/client/tcpiiu.cpp @@ -1804,13 +1804,6 @@ const char * tcpiiu::pHostName ( return this->hostNameCacheInstance.pointer (); } -unsigned tcpiiu::getHostMinorProtocol ( - epicsGuard < epicsMutex > & guard) const throw () -{ - guard.assertIdenticalMutex ( this->mutex ); - return this->minorProtocolVersion; -} - void tcpiiu::disconnectAllChannels ( epicsGuard < epicsMutex > & cbGuard, epicsGuard < epicsMutex > & guard, diff --git a/modules/ca/src/client/udpiiu.cpp b/modules/ca/src/client/udpiiu.cpp index bfe3d628e..d36e2c5b4 100644 --- a/modules/ca/src/client/udpiiu.cpp +++ b/modules/ca/src/client/udpiiu.cpp @@ -1342,12 +1342,6 @@ const char * udpiiu::pHostName ( return netiiu::pHostName ( cacGuard ); } -unsigned udpiiu::getHostMinorProtocol ( - epicsGuard < epicsMutex > & cacGuard ) const throw () -{ - return netiiu::getHostMinorProtocol ( cacGuard ); -} - bool udpiiu::ca_v42_ok ( epicsGuard < epicsMutex > & cacGuard ) const { diff --git a/modules/ca/src/client/udpiiu.h b/modules/ca/src/client/udpiiu.h index abc3fa757..aba79be5d 100644 --- a/modules/ca/src/client/udpiiu.h +++ b/modules/ca/src/client/udpiiu.h @@ -239,9 +239,7 @@ private: unsigned bufLength ) const throw (); const char * pHostName ( epicsGuard < epicsMutex > & ) const throw (); - unsigned getHostMinorProtocol ( - epicsGuard < epicsMutex > & ) const throw (); - bool ca_v41_ok ( + bool ca_v41_ok ( epicsGuard < epicsMutex > & ) const; bool ca_v42_ok ( epicsGuard < epicsMutex > & ) const; diff --git a/modules/ca/src/client/virtualCircuit.h b/modules/ca/src/client/virtualCircuit.h index 0f43ea95e..42af12f5f 100644 --- a/modules/ca/src/client/virtualCircuit.h +++ b/modules/ca/src/client/virtualCircuit.h @@ -168,8 +168,6 @@ public: unsigned getHostName ( epicsGuard < epicsMutex > &, char *pBuf, unsigned bufLength ) const throw (); - unsigned getHostMinorProtocol ( - epicsGuard < epicsMutex > &) const throw (); bool alive ( epicsGuard < epicsMutex > & ) const; bool connecting (