Warning fixes.

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index c638d436ec01b694091847680a5dd35decc55f7d..c95d6729e8859d4726c3c18b1ad84ed9c600c91b 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1,11 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        string.cpp
 // Purpose:     wxString class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        string.cpp
 // Purpose:     wxString class

-// Author:      Vadim Zeitlin
+// Author:      Vadim Zeitlin, Ryan Norton

 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

+//              (c) 2004 Ryan Norton <wxprojects@comcast.net>

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -42,6 +43,10 @@
 #include <string.h>
 #include <stdlib.h>
 
 #include <string.h>
 #include <stdlib.h>
 

+#ifndef __WXMSW__
+#include <errno.h>
+#endif
+

 #ifdef __SALFORDC__
   #include <clib.h>
 #endif
 #ifdef __SALFORDC__
   #include <clib.h>
 #endif


@@ -55,14 +60,9 @@
 // static class variables definition
 // ---------------------------------------------------------------------------
 
 // static class variables definition
 // ---------------------------------------------------------------------------
 

-#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
-// must define this static for VA or else you get multiply defined symbols
-// everywhere
-const unsigned int wxSTRING_MAXLEN = UINT_MAX - 100;
-#endif // Visual Age
-

 #if !wxUSE_STL
 #if !wxUSE_STL

-  const size_t wxStringBase::npos = wxSTRING_MAXLEN;
+  //According to STL _must_ be a -1 size_t
+  const size_t wxStringBase::npos = (size_t) -1;

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -208,7 +208,7 @@ void wxStringBase::InitWith(const wxChar *psz, size_t nPos, size_t nLength)
       wxFAIL_MSG( _T("out of memory in wxStringBase::InitWith") );
       return;
     }
       wxFAIL_MSG( _T("out of memory in wxStringBase::InitWith") );
       return;
     }

-    wxMemcpy(m_pchData, psz + nPos, nLength);
+    wxTmemcpy(m_pchData, psz + nPos, nLength);

   }
 }
 
   }
 }
 


@@ -273,7 +273,7 @@ bool wxStringBase::CopyBeforeWrite()
       // allocation failures are handled by the caller
       return false;
     }
       // 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
   }
 
   wxASSERT( !GetStringData()->IsShared() );  // we must be the only owner


@@ -316,13 +316,15 @@ bool wxStringBase::AllocBeforeWrite(size_t nLen)
       pData->nAllocLength = nLen;
       m_pchData = pData->data();
     }
       pData->nAllocLength = nLen;
       m_pchData = pData->data();
     }

-
-    // now we have enough space, just update the string length
-    pData->nDataLength = nLen;

   }
 
   wxASSERT( !GetStringData()->IsShared() );  // we must be the only owner
 
   }
 
   wxASSERT( !GetStringData()->IsShared() );  // we must be the only owner
 

+  // it doesn't really matter what the string length is as it's going to be
+  // overwritten later but, for extra safety, set it to 0 for now as we may
+  // have some junk in m_pchData
+  GetStringData()->nDataLength = 0;
+

   return true;
 }
 
   return true;
 }
 


@@ -330,7 +332,7 @@ wxStringBase& wxStringBase::append(size_t n, wxChar ch)
 {
     size_type len = length();
 
 {
     size_type len = length();
 

-    if ( !CopyBeforeWrite() || !Alloc(len + n) ) {
+    if ( !Alloc(len + n) || !CopyBeforeWrite() ) {

       wxFAIL_MSG( _T("out of memory in wxStringBase::append") );
     }
     GetStringData()->nDataLength = len + n;
       wxFAIL_MSG( _T("out of memory in wxStringBase::append") );
     }
     GetStringData()->nDataLength = len + n;


@@ -384,7 +386,9 @@ bool wxStringBase::Alloc(size_t nLen)
         // allocation failure handled by caller
         return false;
       }
         // allocation failure handled by caller
         return false;
       }

-      memcpy(m_pchData, pData->data(), nOldLen*sizeof(wxChar));
+      // +1 to copy the terminator, too
+      memcpy(m_pchData, pData->data(), (nOldLen+1)*sizeof(wxChar));
+      GetStringData()->nDataLength = nOldLen;

     }
     else {
       nLen += EXTRA_ALLOC;
     }
     else {
       nLen += EXTRA_ALLOC;


@@ -449,7 +453,7 @@ wxStringBase& wxStringBase::insert(size_t nPos, const wxChar *sz, size_t n)
   if ( n == npos ) n = wxStrlen(sz);
   if ( n == 0 ) return *this;
 
   if ( n == npos ) n = wxStrlen(sz);
   if ( n == 0 ) return *this;
 

-  if ( !CopyBeforeWrite() || !Alloc(length() + n) ) {
+  if ( !Alloc(length() + n) || !CopyBeforeWrite() ) {

     wxFAIL_MSG( _T("out of memory in wxStringBase::insert") );
   }
 
     wxFAIL_MSG( _T("out of memory in wxStringBase::insert") );
   }
 


@@ -475,7 +479,7 @@ size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const
   wxASSERT( nStart <= length() );
 
   //anchor
   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);
 
                                             str.c_str()[0],
                                             length() - nStart);
 


@@ -483,10 +487,16 @@ size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const
       return npos;
 
   while(p - c_str() + str.length() <= length() &&
       return npos;
 
   while(p - c_str() + str.length() <= length() &&

-        wxMemcmp(p, str.c_str(), str.length()) )
+        wxTmemcmp(p, str.c_str(), str.length()) )

   {
   {

+      //Previosly passed as the first argument to wxTmemchr,
+      //but C/C++ standard does not specify evaluation order
+      //of arguments to functions -
+      //http://embedded.com/showArticle.jhtml?articleID=9900607
+      ++p;
+

       //anchor again
       //anchor again

-      p = (const wxChar*)wxMemchr(++p,
+      p = (const wxChar*)wxTmemchr(p,

                                   str.c_str()[0],
                                   length() - (p - c_str()));
 
                                   str.c_str()[0],
                                   length() - (p - c_str()));
 


@@ -506,7 +516,7 @@ size_t wxStringBase::find(wxChar ch, size_t nStart) const
 {
   wxASSERT( nStart <= length() );
 
 {
   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();
 }
 
   return p == NULL ? npos : p - c_str();
 }


@@ -533,7 +543,7 @@ size_t wxStringBase::rfind(const wxStringBase& str, size_t nStart) const
         const wxChar *cursor = c_str() + top;
         do
         {
         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();
                         str.length()) == 0 )
             {
                 return cursor - c_str();


@@ -580,7 +590,7 @@ size_t wxStringBase::find_first_of(const wxChar* sz, size_t nStart) const
     size_t i;
     for(i = nStart; i < this->length(); ++i)
     {
     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;
     }
 
             break;
     }
 


@@ -612,7 +622,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 )
     {
 
     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();
     }
 
             return p - c_str();
     }
 


@@ -641,7 +651,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)
     {
     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;
     }
 
             break;
     }
 


@@ -685,7 +695,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 )
     {
 
     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();
     }
 
              return p - c_str();
     }
 


@@ -915,20 +925,17 @@ static inline int wxDoCmp(const wxChar* s1, size_t l1,
                           const wxChar* s2, size_t l2)
 {
     if( l1 == l2 )
                           const wxChar* s2, size_t l2)
 {
     if( l1 == l2 )

-        return wxMemcmp(s1, s2, l1);
+        return wxTmemcmp(s1, s2, l1);

     else if( l1 < l2 )
     {
     else if( l1 < l2 )
     {

-        int ret = wxMemcmp(s1, s2, l1);
+        int ret = wxTmemcmp(s1, s2, l1);

         return ret == 0 ? -1 : ret;
     }
         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;
     }
         return ret == 0 ? +1 : ret;
     }

-
-    wxFAIL;   // must never get there
-    return 0; // quiet compilers

 }
 
 int STRINGCLASS::compare(const wxStringBase& str) const
 }
 
 int STRINGCLASS::compare(const wxStringBase& str) const


@@ -1027,45 +1034,21 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
     // anything to do?
     if ( (nLen != 0) && (nLen != (size_t)-1) )
     {
     // anything to do?
     if ( (nLen != 0) && (nLen != (size_t)-1) )
     {

-        //Get length of converted string
-        size_t dwConvLen = conv.MB2WC(NULL, psz, 0, nLen);
-
-        //if valid, do the conversion
-        if (dwConvLen != (size_t) -1)
-        {
-            //Get internal buffer
-            wxStringBufferLength internalBuffer(*this, dwConvLen + 1);
+        //Convert string
+        size_t nRealSize;
+        wxWCharBuffer theBuffer = conv.cMB2WC(psz, nLen, &nRealSize);

 
 

-            //Do the actual conversion & Set the length of the buffer
-            internalBuffer.SetLength(
-                   conv.MB2WC(internalBuffer, psz, dwConvLen + 1, nLen)
-                                    );
-        }
+        //Copy
+        if (nRealSize)
+            assign( theBuffer.data() , nRealSize - 1 );

     }
 }
 
 //Convert wxString in Unicode mode to a multi-byte string
 const wxCharBuffer wxString::mb_str(wxMBConv& conv) const
 {
     }
 }
 
 //Convert wxString in Unicode mode to a multi-byte string
 const wxCharBuffer wxString::mb_str(wxMBConv& conv) const
 {

-    //Get length of converted string
-    size_t dwConvLen = conv.WC2MB(NULL, (*this).c_str(), 0, length());
-
-    //if valid, do the conversion
-    if (dwConvLen != (size_t) -1)
-    {
-        //Create good buffer
-        wxCharBuffer buffer(dwConvLen + 1);
-
-        //Do the actual conversion
-        conv.WC2MB(buffer.data(), (*this).c_str(), dwConvLen + 1, length());
-
-        return buffer;
-    }
-
-    //create bogus buffer
-    wxCharBuffer buffer(1);
-    buffer.data()[0u] = 0;
-    return buffer;
+    size_t dwOutSize;
+    return conv.cWC2MB(c_str(), length(), &dwOutSize);

 }
 
 #else // ANSI
 }
 
 #else // ANSI


@@ -1107,20 +1090,13 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength)
     // anything to do?
     if ( (nLen != 0) && (nLen != (size_t)-1) )
     {
     // anything to do?
     if ( (nLen != 0) && (nLen != (size_t)-1) )
     {

-        //Get length of converted string
-        size_t dwConvLen = conv.WC2MB(NULL, pwz, 0, nLen);
+        //Convert string
+        size_t nRealSize;
+        wxCharBuffer theBuffer = conv.cWC2MB(pwz, nLen, &nRealSize);

 
 

-        //if valid, do the conversion
-        if (dwConvLen != (size_t) -1)
-        {
-            //Get internal buffer
-            wxStringBufferLength internalBuffer(*this, dwConvLen + 1);
-
-            //Do the actual conversion & Set the length of the buffer
-            internalBuffer.SetLength(
-                   conv.WC2MB(internalBuffer, pwz, dwConvLen + 1, nLen)
-                                    );
-        }
+        //Copy
+        if (nRealSize)
+            assign( theBuffer.data() , nRealSize - 1 );

     }
 }
 
     }
 }
 


@@ -1128,25 +1104,8 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength)
 //mode is not enabled and wxUSE_WCHAR_T is enabled
 const wxWCharBuffer wxString::wc_str(wxMBConv& conv) const
 {
 //mode is not enabled and wxUSE_WCHAR_T is enabled
 const wxWCharBuffer wxString::wc_str(wxMBConv& conv) const
 {

-    //Get length of converted string
-    size_t dwConvLen = conv.MB2WC(NULL, (*this).c_str(), 0, length());
-
-    //if valid, do the conversion
-    if (dwConvLen != (size_t) -1)
-    {
-        //Create good buffer
-        wxWCharBuffer buffer(dwConvLen + 1);
-
-        //Do the actual conversion
-        conv.MB2WC(buffer.data(), (*this).c_str(), dwConvLen + 1, length());
-
-        return buffer;
-    }
-
-    //create bogus buffer
-    wxWCharBuffer buffer(1);
-    buffer.data()[0u] = 0;
-    return buffer;
+    size_t dwOutSize;
+    return conv.cMB2WC(c_str(), length(), &dwOutSize);

 }
 
 #endif // wxUSE_WCHAR_T
 }
 
 #endif // wxUSE_WCHAR_T


@@ -1274,7 +1233,7 @@ wxString operator+(const wxString& str, const wxChar *psz)
   if ( !s.Alloc(wxStrlen(psz) + str.Len()) ) {
     wxFAIL_MSG( _T("out of memory in wxString::operator+") );
   }
   if ( !s.Alloc(wxStrlen(psz) + str.Len()) ) {
     wxFAIL_MSG( _T("out of memory in wxString::operator+") );
   }

-  s = str;
+  s += str;

   s += psz;
 
   return s;
   s += psz;
 
   return s;


@@ -1322,7 +1281,7 @@ static inline int wxDoCmpNoCase(const wxChar* s1, size_t l1,
             if(wxTolower(s1[i]) != wxTolower(s2[i]))
                 break;
         }
             if(wxTolower(s1[i]) != wxTolower(s2[i]))
                 break;
         }

-        return i == l1 ? 0 : s1[i] < s2[i] ? -1 : 1;
+        return i == l1 ? 0 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1;

     }
     else if( l1 < l2 )
     {
     }
     else if( l1 < l2 )
     {


@@ -1331,20 +1290,17 @@ static inline int wxDoCmpNoCase(const wxChar* s1, size_t l1,
             if(wxTolower(s1[i]) != wxTolower(s2[i]))
                 break;
         }
             if(wxTolower(s1[i]) != wxTolower(s2[i]))
                 break;
         }

-        return i == l1 ? -1 : s1[i] < s2[i] ? -1 : 1;
+        return i == l1 ? -1 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1;

     }
     }

-    else if( l1 > l2 )
+    else

     {
         for(i = 0; i < l2; ++i)
         {
             if(wxTolower(s1[i]) != wxTolower(s2[i]))
                 break;
         }
     {
         for(i = 0; i < l2; ++i)
         {
             if(wxTolower(s1[i]) != wxTolower(s2[i]))
                 break;
         }

-        return i == l2 ? 1 : s1[i] < s2[i] ? -1 : 1;
+        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
 }
 
 int wxString::CmpNoCase(const wxString& s) const


@@ -1407,12 +1363,13 @@ const wxCharBuffer wxString::ToAscii() const
     // this will allocate enough space for the terminating NUL too
     wxCharBuffer buffer(length());
 
     // this will allocate enough space for the terminating NUL too
     wxCharBuffer buffer(length());
 

-    signed char *dest = (signed char *)buffer.data();
+
+    char *dest = buffer.data();

 
     const wchar_t *pwc = c_str();
     for ( ;; )
     {
 
     const wchar_t *pwc = c_str();
     for ( ;; )
     {

-        *dest++ = *pwc > SCHAR_MAX ? wxT('_') : *pwc;
+        *dest++ = (char)(*pwc > SCHAR_MAX ? wxT('_') : *pwc);

 
         // the output string can't have embedded NULs anyhow, so we can safely
         // stop at first of them even if we do have any
 
         // the output string can't have embedded NULs anyhow, so we can safely
         // stop at first of them even if we do have any


@@ -1686,7 +1643,7 @@ inline int wxSafeIsspace(wxChar ch) { return (ch < 127) && wxIsspace(ch); }
 wxString& wxString::Trim(bool bFromRight)
 {
   // first check if we're going to modify the string at all
 wxString& wxString::Trim(bool bFromRight)
 {
   // first check if we're going to modify the string at all

-  if ( !IsEmpty() &&
+  if ( !empty() &&

        (
         (bFromRight && wxSafeIsspace(GetChar(Len() - 1))) ||
         (!bFromRight && wxSafeIsspace(GetChar(0u)))
        (
         (bFromRight && wxSafeIsspace(GetChar(Len() - 1))) ||
         (!bFromRight && wxSafeIsspace(GetChar(0u)))


@@ -1882,7 +1839,14 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
         // vsnprintf() may return either -1 (traditional Unix behaviour) or the
         // total number of characters which would have been written if the
         // buffer were large enough
         // vsnprintf() may return either -1 (traditional Unix behaviour) or the
         // total number of characters which would have been written if the
         // buffer were large enough

-        if ( len >= 0 && len <= size )
+        // also, it may return an errno may be something like EILSEQ,
+        // in which case we need to break out
+        if ( (len >= 0 && len <= size)
+        // No EOVERFLOW on Windows nor Palm 6.0 nor OpenVMS
+#if !defined(__WXMSW__) && !defined(__WXPALMOS__) && !defined( __VMS )
+            || errno != EOVERFLOW
+#endif
+            )

         {
             // ok, there was enough space
             break;
         {
             // ok, there was enough space
             break;


@@ -2252,6 +2216,11 @@ wxString* wxArrayString::GetStringArray() const
     return array;
 }
 
     return array;
 }
 

+void wxArrayString::Remove(size_t nIndex, size_t nRemove)
+{
+    RemoveAt(nIndex, nRemove);
+}
+

 #endif // WXWIN_COMPATIBILITY_2_4
 
 // searches the array for an item (forward or backwards)
 #endif // WXWIN_COMPATIBILITY_2_4
 
 // searches the array for an item (forward or backwards)