Compare and assign wxChars to wxChar instead char local variable.

[wxWidgets.git] / src / common / protocol.cpp

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 82179840587f6b9e22c2c6cbc667de1edf838f0a..e1933a2e200344393077fbeaef7668ff9b60c4eb 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -45,8 +45,12 @@ wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
 {
     m_cinfo = info;
     m_needhost = need_host1;
 {
     m_cinfo = info;
     m_needhost = need_host1;

+#if wxUSE_URL

     next = wxURL::ms_protocols;
     wxURL::ms_protocols = this;
     next = wxURL::ms_protocols;
     wxURL::ms_protocols = this;

+#else
+    next = NULL;
+#endif

 }
 
 /////////////////////////////////////////////////////////////////
 }
 
 /////////////////////////////////////////////////////////////////


@@ -74,16 +78,16 @@ bool wxProtocol::Reconnect()
     if (!GetPeer(addr))
     {
         Close();
     if (!GetPeer(addr))
     {
         Close();

-        return FALSE;
+        return false;

     }
 
     if (!Close())
     }
 
     if (!Close())

-        return FALSE;
-        
+        return false;
+

     if (!Connect(addr))
     if (!Connect(addr))

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -98,10 +102,11 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
     result.clear();
 
     wxCharBuffer buf(LINE_BUF);
     result.clear();
 
     wxCharBuffer buf(LINE_BUF);

+    char *pBuf = buf.data();

     while ( sock->WaitForRead() )
     {
         // peek at the socket to see if there is a CRLF
     while ( sock->WaitForRead() )
     {
         // 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();
         if ( !nRead && sock->Error() )
 
         size_t nRead = sock->LastCount();
         if ( !nRead && sock->Error() )


@@ -110,13 +115,13 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
         // 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
         // of the last chunk and \n at the beginning of this one
         // 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
         // of the last chunk and \n at the beginning of this one

-        buf.data()[nRead] = '\0';
-        const char *eol = strchr(buf, '\n');
+        pBuf[nRead] = '\0';
+        const char *eol = strchr(pBuf, '\n');

 
         // if we found '\n', is there a '\r' as well?
         if ( eol )
         {
 
         // if we found '\n', is there a '\r' as well?
         if ( eol )
         {

-            if ( eol == buf.data() )
+            if ( eol == pBuf )

             {
                 // check for case of "\r\n" being split
                 if ( result.empty() || result.Last() != _T('\r') )
             {
                 // check for case of "\r\n" being split
                 if ( result.empty() || result.Last() != _T('\r') )


@@ -132,7 +137,7 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
             else // '\n' in the middle of the buffer
             {
                 // in any case, read everything up to and including '\n'
             else // '\n' in the middle of the buffer
             {
                 // 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 +147,12 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
             }
         }
 
             }
         }
 

-        sock->Read(buf.data(), nRead);
+        sock->Read(pBuf, nRead);

         if ( sock->LastCount() != nRead )
             return wxPROTO_NETERR;
 
         if ( sock->LastCount() != nRead )
             return wxPROTO_NETERR;
 

-        buf.data()[nRead] = '\0';
-        result += wxString::FromAscii(buf);
+        pBuf[nRead] = '\0';
+        result += wxString::FromAscii(pBuf);

 
         if ( eol )
         {
 
         if ( eol )
         {


@@ -183,17 +188,17 @@ wxProtocolError GetLine(wxSocketBase *sock, wxString& result)
 
     // Not implemented on all systems
     // ret = (char *)memccpy(tmp_str, tmp_buf, '\n', avail);
 
     // Not implemented on all systems
     // ret = (char *)memccpy(tmp_str, tmp_buf, '\n', avail);

-    found = FALSE;
+    found = false;

     for (ret=tmp_str;ret < (tmp_str+avail); ret++)
     for (ret=tmp_str;ret < (tmp_str+avail); ret++)

-        if (*ret == '\n') 
+        if (*ret == '\n')

         {
         {

-            found = TRUE;
+            found = true;

             break;
         }
 
     if (!found)
         return wxPROTO_PROTERR;
             break;
         }
 
     if (!found)
         return wxPROTO_PROTERR;

-        
+

     *ret = 0;
 
     result = wxString::FromAscii( tmp_str );
     *ret = 0;
 
     result = wxString::FromAscii( tmp_str );


@@ -201,7 +206,7 @@ wxProtocolError GetLine(wxSocketBase *sock, wxString& result)
 
     size = ret-tmp_str+1;
     sock->Unread(&tmp_buf[size], avail-size);
 
     size = ret-tmp_str+1;
     sock->Unread(&tmp_buf[size], avail-size);

-  
+

     return wxPROTO_NOERR;
 #undef PROTO_BSIZE
 }
     return wxPROTO_NOERR;
 #undef PROTO_BSIZE
 }