Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix for Borland

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-09-19 13:17:02 +00:00
parent ef335a4fa8
commit 684dface9a
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/protocol.cpp
View File

@@ -98,10 +98,11 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
result.clear(); result.clear();
wxCharBuffer buf(LINE_BUF); wxCharBuffer buf(LINE_BUF);
char *pBuf = buf.data();
while ( sock->WaitForRead() ) while ( sock->WaitForRead() )
{ {
// peek at the socket to see if there is a CRLF // peek at the socket to see if there is a CRLF
sock->Peek(buf.data(), LINE_BUF); sock->Peek(pBuf, LINE_BUF);
size_t nRead = sock->LastCount(); size_t nRead = sock->LastCount();
if ( !nRead && sock->Error() ) if ( !nRead && sock->Error() )
@@ -110,13 +111,13 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
// look for "\r\n" paying attention to a special case: "\r\n" could // look for "\r\n" paying attention to a special case: "\r\n" could
// have been split by buffer boundary, so check also for \r at the end // have been split by buffer boundary, so check also for \r at the end
// of the last chunk and \n at the beginning of this one // of the last chunk and \n at the beginning of this one
buf.data()[nRead] = '\0'; pBuf[nRead] = '\0';
const char *eol = strchr(buf, '\n'); const char *eol = strchr(pBuf, '\n');
// if we found '\n', is there a '\r' as well? // if we found '\n', is there a '\r' as well?
if ( eol ) if ( eol )
{ {
if ( eol == buf.data() ) if ( eol == pBuf )
{ {
// check for case of "\r\n" being split // check for case of "\r\n" being split
if ( result.empty() || result.Last() != _T('\r') ) if ( result.empty() || result.Last() != _T('\r') )
@@ -132,7 +133,7 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
else // '\n' in the middle of the buffer else // '\n' in the middle of the buffer
{ {
// in any case, read everything up to and including '\n' // in any case, read everything up to and including '\n'
nRead = eol - buf + 1; nRead = eol - pBuf + 1;
if ( eol[-1] != '\r' ) if ( eol[-1] != '\r' )
{ {
@@ -142,12 +143,12 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
} }
} }
sock->Read(buf.data(), nRead); sock->Read(pBuf, nRead);
if ( sock->LastCount() != nRead ) if ( sock->LastCount() != nRead )
return wxPROTO_NETERR; return wxPROTO_NETERR;
buf.data()[nRead] = '\0'; pBuf[nRead] = '\0';
result += wxString::FromAscii(buf); result += wxString::FromAscii(pBuf);
if ( eol ) if ( eol )
{ {