From: Ryan Norton <wxprojects@comcast.net>
Date: Sun, 21 Nov 2004 17:44:40 +0000 (+0000)
Subject: wxMemxxx --> wxTmemxxx, get rid of wxdocmpxxx impossible case
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2c09fb3b8b492e6cdfd003a6d8f441aa255f2045

wxMemxxx --> wxTmemxxx, get rid of wxdocmpxxx impossible case


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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 6888208fec..82abd84a45 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -1115,7 +1115,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
         #include <string.h> //for mem funcs
         
         //implement our own wmem variants
-        inline wxChar* wxMemchr(const wxChar* s, wxChar c, size_t l)
+        inline wxChar* wxTmemchr(const wxChar* s, wxChar c, size_t l)
         {
             for(;l && *s != c;--l, ++s) {}
 
@@ -1124,7 +1124,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
             return NULL;
         }
 
-        inline int wxMemcmp(const wxChar* sz1, const wxChar* sz2, size_t len)
+        inline int wxTmemcmp(const wxChar* sz1, const wxChar* sz2, size_t len)
         {
             for(; *sz1 == *sz2 && len; --len, ++sz1, ++sz2) {}
 
@@ -1134,17 +1134,17 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
                 return 0;
         }
 
-        inline wxChar* wxMemcpy(wxChar* szOut, const wxChar* szIn, size_t len)
+        inline wxChar* wxTmemcpy(wxChar* szOut, const wxChar* szIn, size_t len)
         {
             return (wxChar*) memcpy(szOut, szIn, len * sizeof(wxChar));
         }
 
-        inline wxChar* wxMemmove(wxChar* szOut, const wxChar* szIn, size_t len)
+        inline wxChar* wxTmemmove(wxChar* szOut, const wxChar* szIn, size_t len)
         {
             return (wxChar*) memmove(szOut, szIn, len * sizeof(wxChar));
         }
 
-        inline wxChar* wxMemset(wxChar* szOut, const wxChar cIn, size_t len)
+        inline wxChar* wxTmemset(wxChar* szOut, const wxChar cIn, size_t len)
         {
             wxChar* szRet = szOut;
 
@@ -1155,11 +1155,11 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
         }
 
     #else //!wxUSE_UNICODE
-    #   define wxMemchr memchr
-    #   define wxMemcmp memcmp
-    #   define wxMemcpy memcpy
-    #   define wxMemmove memmove
-    #   define wxMemset memset
+    #   define wxTmemchr memchr
+    #   define wxTmemcmp memcmp
+    #   define wxTmemcpy memcpy
+    #   define wxTmemmove memmove
+    #   define wxTmemset memset
     #endif
 
 #endif /*__cplusplus*/
diff --git a/src/common/string.cpp b/src/common/string.cpp
index 1c8fadcb69..316e042182 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -209,7 +209,7 @@ void wxStringBase::InitWith(const wxChar *psz, size_t nPos, size_t nLength)
       wxFAIL_MSG( _T("out of memory in wxStringBase::InitWith") );
       return;
     }
-    wxMemcpy(m_pchData, psz + nPos, nLength);
+    wxTmemcpy(m_pchData, psz + nPos, nLength);
   }
 }
 
@@ -274,7 +274,7 @@ bool wxStringBase::CopyBeforeWrite()
       // allocation failures are handled by the caller
       return false;
     }
-    wxMemcpy(m_pchData, pData->data(), nLen);
+    wxTmemcpy(m_pchData, pData->data(), nLen);
   }
 
   wxASSERT( !GetStringData()->IsShared() );  // we must be the only owner
@@ -476,7 +476,7 @@ size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const
   wxASSERT( nStart <= length() );
 
   //anchor
-  const wxChar* p = (const wxChar*)wxMemchr(c_str() + nStart,
+  const wxChar* p = (const wxChar*)wxTmemchr(c_str() + nStart,
                                             str.c_str()[0],
                                             length() - nStart);
 
@@ -484,10 +484,10 @@ size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const
       return npos;
 
   while(p - c_str() + str.length() <= length() &&
-        wxMemcmp(p, str.c_str(), str.length()) )
+        wxTmemcmp(p, str.c_str(), str.length()) )
   {
       //anchor again
-      p = (const wxChar*)wxMemchr(++p,
+      p = (const wxChar*)wxTmemchr(++p,
                                   str.c_str()[0],
                                   length() - (p - c_str()));
 
@@ -507,7 +507,7 @@ size_t wxStringBase::find(wxChar ch, size_t nStart) const
 {
   wxASSERT( nStart <= length() );
 
-  const wxChar *p = (const wxChar*)wxMemchr(c_str() + nStart, ch, length() - nStart);
+  const wxChar *p = (const wxChar*)wxTmemchr(c_str() + nStart, ch, length() - nStart);
 
   return p == NULL ? npos : p - c_str();
 }
@@ -534,7 +534,7 @@ size_t wxStringBase::rfind(const wxStringBase& str, size_t nStart) const
         const wxChar *cursor = c_str() + top;
         do
         {
-            if ( wxMemcmp(cursor, str.c_str(),
+            if ( wxTmemcmp(cursor, str.c_str(),
                         str.length()) == 0 )
             {
                 return cursor - c_str();
@@ -581,7 +581,7 @@ size_t wxStringBase::find_first_of(const wxChar* sz, size_t nStart) const
     size_t i;
     for(i = nStart; i < this->length(); ++i)
     {
-        if (wxMemchr(sz, *(c_str() + i), len))
+        if (wxTmemchr(sz, *(c_str() + i), len))
             break;
     }
 
@@ -613,7 +613,7 @@ size_t wxStringBase::find_last_of(const wxChar* sz, size_t nStart) const
 
     for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
     {
-        if ( wxMemchr(sz, *p, len) )
+        if ( wxTmemchr(sz, *p, len) )
             return p - c_str();
     }
 
@@ -642,7 +642,7 @@ size_t wxStringBase::find_first_not_of(const wxChar* sz, size_t nStart) const
     size_t i;
     for(i = nStart; i < this->length(); ++i)
     {
-        if (!wxMemchr(sz, *(c_str() + i), len))
+        if (!wxTmemchr(sz, *(c_str() + i), len))
             break;
     }
 
@@ -686,7 +686,7 @@ size_t wxStringBase::find_last_not_of(const wxChar* sz, size_t nStart) const
 
     for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
     {
-        if ( !wxMemchr(sz, *p,len) )
+        if ( !wxTmemchr(sz, *p,len) )
              return p - c_str();
     }
 
@@ -916,20 +916,17 @@ static inline int wxDoCmp(const wxChar* s1, size_t l1,
                           const wxChar* s2, size_t l2)
 {
     if( l1 == l2 )
-        return wxMemcmp(s1, s2, l1);
+        return wxTmemcmp(s1, s2, l1);
     else if( l1 < l2 )
     {
-        int ret = wxMemcmp(s1, s2, l1);
+        int ret = wxTmemcmp(s1, s2, l1);
         return ret == 0 ? -1 : ret;
     }
-    else if( l1 > l2 )
+    else
     {
-        int ret = wxMemcmp(s1, s2, l2);
+        int ret = wxTmemcmp(s1, s2, l2);
         return ret == 0 ? +1 : ret;
     }
-
-    wxFAIL;   // must never get there
-    return 0; // quiet compilers
 }
 
 int STRINGCLASS::compare(const wxStringBase& str) const
@@ -1286,7 +1283,7 @@ static inline int wxDoCmpNoCase(const wxChar* s1, size_t l1,
         }
         return i == l1 ? -1 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1;
     }
-    else if( l1 > l2 )
+    else
     {
         for(i = 0; i < l2; ++i)
         {
@@ -1295,9 +1292,6 @@ static inline int wxDoCmpNoCase(const wxChar* s1, size_t l1,
         }
         return i == l2 ? 1 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1;
     }
-
-    wxFAIL;   // must never get there
-    return 0; // quiet compilers
 }
 
 int wxString::CmpNoCase(const wxString& s) const
diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index e1878f78c4..f7351a56ac 100644
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -474,7 +474,7 @@ const wxChar* wxURI::ParseServer(const wxChar* uri)
             m_hostType = wxURI_IPV6ADDRESS;
 
             wxStringBufferLength theBuffer(m_server, uri - uricopy);
-            wxMemcpy(theBuffer, uricopy, uri-uricopy);
+            wxTmemcpy(theBuffer, uricopy, uri-uricopy);
             theBuffer.SetLength(uri-uricopy);
         }
         else
@@ -488,7 +488,7 @@ const wxChar* wxURI::ParseServer(const wxChar* uri)
                 m_hostType = wxURI_IPVFUTURE;
 
                 wxStringBufferLength theBuffer(m_server, uri - uricopy);
-                wxMemcpy(theBuffer, uricopy, uri-uricopy);
+                wxTmemcpy(theBuffer, uricopy, uri-uricopy);
                 theBuffer.SetLength(uri-uricopy);
             }
             else
@@ -502,7 +502,7 @@ const wxChar* wxURI::ParseServer(const wxChar* uri)
             m_hostType = wxURI_IPV4ADDRESS;
 
             wxStringBufferLength theBuffer(m_server, uri - uricopy);
-            wxMemcpy(theBuffer, uricopy, uri-uricopy);
+            wxTmemcpy(theBuffer, uricopy, uri-uricopy);
             theBuffer.SetLength(uri-uricopy);
         }
         else
@@ -596,7 +596,7 @@ const wxChar* wxURI::ParsePath(const wxChar* uri, bool bReference, bool bNormali
         {
             wxStringBufferLength theBuffer(m_path, m_path.length() + 1);
 #if wxUSE_STL
-            wxMemcpy(theBuffer, m_path.c_str(), m_path.length()+1);
+            wxTmemcpy(theBuffer, m_path.c_str(), m_path.length()+1);
 #endif
             Normalize(theBuffer, true);
             theBuffer.SetLength(wxStrlen(theBuffer));
@@ -636,7 +636,7 @@ const wxChar* wxURI::ParsePath(const wxChar* uri, bool bReference, bool bNormali
             {
                 wxStringBufferLength theBuffer(m_path, m_path.length() + 1);
 #if wxUSE_STL
-                wxMemcpy(theBuffer, m_path.c_str(), m_path.length()+1);
+                wxTmemcpy(theBuffer, m_path.c_str(), m_path.length()+1);
 #endif
                 Normalize(theBuffer);
                 theBuffer.SetLength(wxStrlen(theBuffer));
diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index 19414f05d5..a17c815519 100644
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -197,7 +197,7 @@ void StringTestCase::Conversion()
         CPPUNIT_ASSERT( memcmp(theBuffer.data(), "The\0String", 11) == 0 );
 
         wxString szTheString2("The\0String", wxConvLocal, 10);
-        CPPUNIT_ASSERT( wxMemcmp(szTheString2.c_str(), L"The\0String", 11) == 0 );
+        CPPUNIT_ASSERT( wxTmemcmp(szTheString2.c_str(), L"The\0String", 11) == 0 );
 #else
         wxString szTheString(wxT("TheString"));
         szTheString.insert(3, 1, '\0');