removed broken and global GetLine() function from wx/protocol/protocol.h; there's...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 246d4bea77df0ecde373e3716c48d1280764fb1b..eb941842dcdaa0e41577ef25c611ab4e610335f7 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -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
 -----------------------------------------

diff --git a/include/wx/protocol/protocol.h b/include/wx/protocol/protocol.h
index fa6d7ee2fc54093fdf9fb01b1546f3f8867750b9..a6012c5c9e615e2ff8044424c9df977050b51678 100644 (file)
--- a/include/wx/protocol/protocol.h
+++ b/include/wx/protocol/protocol.h
@@ -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
 // ----------------------------------------------------------------------------

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 7f1ba9d358f0d6a900091286215afdb9ee5eb8c5..75981c5bb3751060337be443245b5c49a4fb7269 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -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