AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed broken and global GetLine() function from wx/protocol/protocol.h; there's already wxProtocol::ReadLine() that actually works

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2007-07-13 21:30:36 +00:00
parent a2bd84a532
commit 6a4cbac17a
3 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changes.txt
View File

@ -77,6 +77,9 @@ Changes in behaviour which may result in compilation errors
- Removed insecure wxGets() and wxTmpnam() functions.
- Removed global GetLine() function from wx/protocol/protocol.h, use
wxProtocol::ReadLine() instead.
Deprecated methods and their replacements
-----------------------------------------

4
include/wx/protocol/protocol.h
View File

@ -81,10 +81,6 @@ private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxProtocol)
};
#if wxUSE_SOCKETS
wxProtocolError WXDLLIMPEXP_NET GetLine(wxSocketBase *sock, wxString& result);
#endif
// ----------------------------------------------------------------------------
// macros for protocol classes
// ----------------------------------------------------------------------------

39
src/common/protocol.cpp
View File

@ -171,45 +171,6 @@ wxProtocolError wxProtocol::ReadLine(wxString& result)
return ReadLine(this, result);
}
// old function which only chops '\n' and not '\r\n'
wxProtocolError GetLine(wxSocketBase *sock, wxString& result)
{
#define PROTO_BSIZE 2048
size_t avail, size;
char tmp_buf[PROTO_BSIZE], tmp_str[PROTO_BSIZE];
char *ret;
bool found;
avail = sock->Read(tmp_buf, PROTO_BSIZE).LastCount();
if (sock->Error() || avail == 0)
return wxPROTO_NETERR;
memcpy(tmp_str, tmp_buf, avail);
// Not implemented on all systems
// ret = (char *)memccpy(tmp_str, tmp_buf, '\n', avail);
found = false;
for (ret=tmp_str;ret < (tmp_str+avail); ret++)
if (*ret == '\n')
{
found = true;
break;
}
if (!found)
return wxPROTO_PROTERR;
*ret = 0;
result = wxString::FromAscii( tmp_str );
result = result.Left(result.length()-1);
size = ret-tmp_str+1;
sock->Unread(&tmp_buf[size], avail-size);
return wxPROTO_NOERR;
#undef PROTO_BSIZE
}
#endif // wxUSE_SOCKETS
#endif // wxUSE_PROTOCOL