diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp index 38f4ebe73..b0849e6c9 100644 --- a/src/ca/cac.cpp +++ b/src/ca/cac.cpp @@ -756,8 +756,7 @@ bool cac::lookupChannelAndTransferToTCP ( unsigned cid, unsigned sid, if ( ! piiu ) { try { piiu = new tcpiiu ( *this, this->connTMO, *this->pTimerQueue, - addr, minorVersionNumber, *pBHE, this->ipToAEngine, - this->enablePreemptiveCallback ); + addr, minorVersionNumber, *pBHE, this->ipToAEngine ); if ( ! piiu ) { return true; } @@ -1584,7 +1583,7 @@ void cac::vSignal ( int ca_status, const char *pfilenm, ca_message ( ca_status ) ); if ( pFormat ) { - this->printf ( "Context: \"" ); + this->printf ( " Context: \"" ); this->vPrintf ( pFormat, args ); this->printf ( "\"\n" ); } diff --git a/src/ca/virtualCircuit.h b/src/ca/virtualCircuit.h index d245640d3..068f2f5e4 100644 --- a/src/ca/virtualCircuit.h +++ b/src/ca/virtualCircuit.h @@ -83,7 +83,7 @@ private: this->wire.forcedShutdown (); throw std::bad_alloc (); } - unsigned nNew = pComBuf->copyIn ( &pVal[nCopied], nElem - nCopied ); + unsigned nNew = pComBuf->copyIn ( &pVal[nCopied], nElem - nCopied ); nCopied += nNew; this->nBytesPending += nNew * sizeof ( T ); this->bufs.add ( *pComBuf ); @@ -215,8 +215,7 @@ public: tcpiiu ( cac &cac, double connectionTimeout, epicsTimerQueue &timerQueue, const osiSockAddr &addrIn, unsigned minorVersion, class bhe &bhe, - ipAddrToAsciiEngine & engineIn, - bool preemptiveCallbackEnable ); + ipAddrToAsciiEngine & engineIn ); ~tcpiiu (); void connect (); void destroy (); @@ -276,7 +275,6 @@ private: bool sockCloseCompleted; bool earlyFlush; bool recvProcessPostponedFlush; - bool preemptiveCallbackEnable; void processIncoming ();