diff --git a/src/cas/generic/casStrmClient.cc b/src/cas/generic/casStrmClient.cc index f640a9daf..5742e1240 100644 --- a/src/cas/generic/casStrmClient.cc +++ b/src/cas/generic/casStrmClient.cc @@ -174,7 +174,6 @@ caStatus casStrmClient::processMsg () msgTmp.m_cid = epicsNTOH32 ( smallHdr.m_cid ); msgTmp.m_available = epicsNTOH32 ( smallHdr.m_available ); - msgSize = hdrSize + payloadSize; if ( bytesLeft < msgSize ) { if ( msgSize > this->in.bufferSize() ) { @@ -199,7 +198,6 @@ caStatus casStrmClient::processMsg () caServerI::dumpMsg ( this->pHostName, this->pUserName, & msgTmp, rawMP + hdrSize, 0 ); } - } // @@ -224,7 +222,6 @@ caStatus casStrmClient::processMsg () if ( status ) { break; } - this->in.removeMsg ( msgSize ); } } @@ -243,7 +240,7 @@ caStatus casStrmClient::processMsg () except.what () ); status = S_cas_internal; } - catch (...) { + catch ( ... ) { status = this->sendErr ( guard, this->ctx.getMsg(), invalidResID, ECA_INTERNAL, "unexpected C++ exception in server " diff --git a/src/cas/generic/inBuf.h b/src/cas/generic/inBuf.h index 50df7c932..dfc1f66eb 100644 --- a/src/cas/generic/inBuf.h +++ b/src/cas/generic/inBuf.h @@ -102,7 +102,7 @@ private: // inline bufSizeT inBuf::bytesPresent () const { - return this->bytesInBuffer-this->nextReadIndex; + return this->bytesInBuffer - this->nextReadIndex; } //