This commit is contained in:
Jeff Hill
2003-04-16 20:57:56 +00:00
parent 1ee13af2a8
commit 93d163ba83
2 changed files with 2 additions and 5 deletions
+1 -4
View File
@@ -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 "
+1 -1
View File
@@ -102,7 +102,7 @@ private:
//
inline bufSizeT inBuf::bytesPresent () const
{
return this->bytesInBuffer-this->nextReadIndex;
return this->bytesInBuffer - this->nextReadIndex;
}
//