X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a5a83677555023d476401bab5809a1107222c74..dcf40a56e7b09fc5472edc1d4471e7954c0da40d:/src/common/string.cpp diff --git a/src/common/string.cpp b/src/common/string.cpp index e52392bf89..054074c259 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -32,9 +32,9 @@ #endif #ifndef WX_PRECOMP -#include "wx/defs.h" -#include "wx/string.h" -#include + #include "wx/defs.h" + #include "wx/string.h" + #include "wx/intl.h" #endif #include @@ -47,7 +47,8 @@ // allocating extra space for each string consumes more memory but speeds up // the concatenation operations (nLen is the current string's length) -#define EXTRA_ALLOC 16 +// NB: EXTRA_ALLOC must be >= 0! +#define EXTRA_ALLOC (19 - nLen % 16) // --------------------------------------------------------------------------- // static class variables definition @@ -61,13 +62,17 @@ // static data // ---------------------------------------------------------------------------- -// for an empty string, GetStringData() will return this address -static int g_strEmpty[] = { -1, // ref count (locked) - 0, // current length - 0, // allocated memory - 0 }; // string data +// for an empty string, GetStringData() will return this address: this +// structure has the same layout as wxStringData and it's data() method will +// return the empty string (dummy pointer) +static const struct +{ + wxStringData data; + char dummy; +} g_strEmpty = { {-1, 0, 0}, '\0' }; + // empty C style string: points to 'string data' byte of g_strEmpty -extern const char *g_szNul = (const char *)(&g_strEmpty[3]); +extern const char *g_szNul = &g_strEmpty.dummy; // ---------------------------------------------------------------------------- // global functions @@ -134,10 +139,10 @@ NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str)) ~Averager() { printf("wxString: average %s = %f\n", m_sz, ((float)m_nTotal)/m_nCount); } - void Add(uint n) { m_nTotal += n; m_nCount++; } + void Add(size_t n) { m_nTotal += n; m_nCount++; } private: - uint m_nCount, m_nTotal; + size_t m_nCount, m_nTotal; const char *m_sz; } g_averageLength("allocation size"), g_averageSummandLength("summand length"), @@ -211,7 +216,7 @@ wxString::wxString(const void *pStart, const void *pEnd) wxString::wxString(const wchar_t *pwz) { // first get necessary size - size_t nLen = wcstombs(NULL, pwz, 0); + size_t nLen = wcstombs((char *) NULL, pwz, 0); // empty? if ( nLen != 0 ) { @@ -254,7 +259,7 @@ void wxString::CopyBeforeWrite() if ( pData->IsShared() ) { pData->Unlock(); // memory not freed because shared - uint nLen = pData->nDataLength; + size_t nLen = pData->nDataLength; AllocBuffer(nLen); memcpy(m_pchData, pData->data(), nLen*sizeof(char)); } @@ -279,7 +284,7 @@ void wxString::AllocBeforeWrite(size_t nLen) } // allocate enough memory for nLen characters -void wxString::Alloc(uint nLen) +void wxString::Alloc(size_t nLen) { wxStringData *pData = GetStringData(); if ( pData->nAllocLength <= nLen ) { @@ -296,7 +301,7 @@ void wxString::Alloc(uint nLen) } else if ( pData->IsShared() ) { pData->Unlock(); // memory not freed because shared - uint nOldLen = pData->nDataLength; + size_t nOldLen = pData->nDataLength; AllocBuffer(nLen); memcpy(m_pchData, pData->data(), nOldLen*sizeof(char)); } @@ -337,7 +342,7 @@ void wxString::Shrink() } // get the pointer to writable buffer of (at least) nLen bytes -char *wxString::GetWriteBuf(uint nLen) +char *wxString::GetWriteBuf(size_t nLen) { AllocBeforeWrite(nLen); @@ -436,43 +441,44 @@ void wxString::ConcatSelf(int nSrcLen, const char *pszSrcData) { STATISTICS_ADD(SummandLength, nSrcLen); - // concatenating an empty string is a NOP, but it happens quite rarely, - // so we don't waste our time checking for it - // if ( nSrcLen > 0 ) - wxStringData *pData = GetStringData(); - uint nLen = pData->nDataLength; - uint nNewLen = nLen + nSrcLen; - - // alloc new buffer if current is too small - if ( pData->IsShared() ) { - STATISTICS_ADD(ConcatHit, 0); - - // we have to allocate another buffer - wxStringData* pOldData = GetStringData(); - AllocBuffer(nNewLen); - memcpy(m_pchData, pOldData->data(), nLen*sizeof(char)); - pOldData->Unlock(); - } - else if ( nNewLen > pData->nAllocLength ) { - STATISTICS_ADD(ConcatHit, 0); + // concatenating an empty string is a NOP + if ( nSrcLen > 0 ) { + wxStringData *pData = GetStringData(); + size_t nLen = pData->nDataLength; + size_t nNewLen = nLen + nSrcLen; + + // alloc new buffer if current is too small + if ( pData->IsShared() ) { + STATISTICS_ADD(ConcatHit, 0); + + // we have to allocate another buffer + wxStringData* pOldData = GetStringData(); + AllocBuffer(nNewLen); + memcpy(m_pchData, pOldData->data(), nLen*sizeof(char)); + pOldData->Unlock(); + } + else if ( nNewLen > pData->nAllocLength ) { + STATISTICS_ADD(ConcatHit, 0); - // we have to grow the buffer - Alloc(nNewLen); - } - else { - STATISTICS_ADD(ConcatHit, 1); + // we have to grow the buffer + Alloc(nNewLen); + } + else { + STATISTICS_ADD(ConcatHit, 1); - // the buffer is already big enough - } + // the buffer is already big enough + } - // should be enough space - wxASSERT( nNewLen <= GetStringData()->nAllocLength ); + // should be enough space + wxASSERT( nNewLen <= GetStringData()->nAllocLength ); - // fast concatenation - all is done in our buffer - memcpy(m_pchData + nLen, pszSrcData, nSrcLen*sizeof(char)); + // fast concatenation - all is done in our buffer + memcpy(m_pchData + nLen, pszSrcData, nSrcLen*sizeof(char)); - m_pchData[nNewLen] = '\0'; // put terminating '\0' - GetStringData()->nDataLength = nNewLen; // and fix the length + m_pchData[nNewLen] = '\0'; // put terminating '\0' + GetStringData()->nDataLength = nNewLen; // and fix the length + } + //else: the string to append was empty } /* @@ -647,11 +653,11 @@ wxString wxString::After(char ch) const } // replace first (or all) occurences of some substring with another one -uint wxString::Replace(const char *szOld, const char *szNew, bool bReplaceAll) +size_t wxString::Replace(const char *szOld, const char *szNew, bool bReplaceAll) { - uint uiCount = 0; // count of replacements made + size_t uiCount = 0; // count of replacements made - uint uiOldLen = Strlen(szOld); + size_t uiOldLen = Strlen(szOld); wxString strTemp; const char *pCurrent = m_pchData; @@ -885,7 +891,7 @@ bool wxString::Matches(const char *pszMask) const return TRUE; // are there any other metacharacters in the mask? - uint uiLenMask; + size_t uiLenMask; const char *pEndMask = strpbrk(pszMask, "*?"); if ( pEndMask != NULL ) { @@ -929,13 +935,15 @@ wxString& wxString::insert(size_t nPos, const wxString& str) wxASSERT( str.GetStringData()->IsValid() ); wxASSERT( nPos <= Len() ); - wxString strTmp; - char *pc = strTmp.GetWriteBuf(Len() + str.Len()); - strncpy(pc, c_str(), nPos); - strcpy(pc + nPos, str); - strcpy(pc + nPos + str.Len(), c_str() + nPos); - strTmp.UngetWriteBuf(); - *this = strTmp; + if ( !str.IsEmpty() ) { + wxString strTmp; + char *pc = strTmp.GetWriteBuf(Len() + str.Len()); + strncpy(pc, c_str(), nPos); + strcpy(pc + nPos, str); + strcpy(pc + nPos + str.Len(), c_str() + nPos); + strTmp.UngetWriteBuf(); + *this = strTmp; + } return *this; } @@ -1074,7 +1082,7 @@ wxArrayString::wxArrayString() { m_nSize = m_nCount = 0; - m_pItems = NULL; + m_pItems = (char **) NULL; } // copy ctor @@ -1082,7 +1090,7 @@ wxArrayString::wxArrayString(const wxArrayString& src) { m_nSize = m_nCount = 0; - m_pItems = NULL; + m_pItems = (char **) NULL; *this = src; } @@ -1098,7 +1106,7 @@ wxArrayString& wxArrayString::operator=(const wxArrayString& src) // we can't just copy the pointers here because otherwise we would share // the strings with another array - for ( uint n = 0; n < src.m_nCount; n++ ) + for ( size_t n = 0; n < src.m_nCount; n++ ) Add(src[n]); if ( m_nCount != 0 ) @@ -1196,7 +1204,7 @@ int wxArrayString::Index(const char *sz, bool bCase, bool bFromEnd) const { if ( bFromEnd ) { if ( m_nCount > 0 ) { - uint ui = m_nCount; + size_t ui = m_nCount; do { if ( STRING(m_pItems[--ui])->IsSameAs(sz, bCase) ) return ui; @@ -1205,7 +1213,7 @@ int wxArrayString::Index(const char *sz, bool bCase, bool bFromEnd) const } } else { - for( uint ui = 0; ui < m_nCount; ui++ ) { + for( size_t ui = 0; ui < m_nCount; ui++ ) { if( STRING(m_pItems[ui])->IsSameAs(sz, bCase) ) return ui; } @@ -1265,7 +1273,7 @@ void wxArrayString::Remove(const char *sz) wxCHECK_RET( iIndex != NOT_FOUND, _("removing inexistent element in wxArrayString::Remove") ); - Remove((size_t)iIndex); + Remove(iIndex); } // sort array elements using passed comparaison function