#endif
#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#include "wx/string.h"
+ #include "wx/defs.h"
+ #include "wx/string.h"
+ #include "wx/intl.h"
#endif
#include <ctype.h>
// 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
// 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
~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"),
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 ) {
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));
}
}
// allocate enough memory for nLen characters
-void wxString::Alloc(uint nLen)
+void wxString::Alloc(size_t nLen)
{
wxStringData *pData = GetStringData();
if ( pData->nAllocLength <= 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));
}
}
// get the pointer to writable buffer of (at least) nLen bytes
-char *wxString::GetWriteBuf(uint nLen)
+char *wxString::GetWriteBuf(size_t nLen)
{
AllocBeforeWrite(nLen);
{
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
}
/*
}
// 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;
return TRUE;
// are there any other metacharacters in the mask?
- uint uiLenMask;
+ size_t uiLenMask;
const char *pEndMask = strpbrk(pszMask, "*?");
if ( pEndMask != NULL ) {
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;
}
{
m_nSize =
m_nCount = 0;
- m_pItems = NULL;
+ m_pItems = (char **) NULL;
}
// copy ctor
{
m_nSize =
m_nCount = 0;
- m_pItems = NULL;
+ m_pItems = (char **) NULL;
*this = src;
}
// assignment operator
wxArrayString& wxArrayString::operator=(const wxArrayString& src)
{
- Clear();
+ if ( m_nSize > 0 )
+ Clear();
- m_nSize = 0;
if ( src.m_nCount > ARRAY_DEFAULT_INITIAL_SIZE )
Alloc(src.m_nCount);
// 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 )
{
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;
}
}
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;
}
{
wxASSERT( str.GetStringData()->IsValid() );
- wxCHECK_RET( nIndex <= m_nCount, "bad index in wxArrayString::Insert" );
+ wxCHECK_RET( nIndex <= m_nCount, ("bad index in wxArrayString::Insert") );
Grow();
// removes item from array (by index)
void wxArrayString::Remove(size_t nIndex)
{
- wxCHECK_RET( nIndex <= m_nCount, "bad index in wxArrayString::Remove" );
+ wxCHECK_RET( nIndex <= m_nCount, _("bad index in wxArrayString::Remove") );
// release our lock
Item(nIndex).GetStringData()->Unlock();
int iIndex = Index(sz);
wxCHECK_RET( iIndex != NOT_FOUND,
- "removing inexistent element in wxArrayString::Remove" );
+ _("removing inexistent element in wxArrayString::Remove") );
- Remove((size_t)iIndex);
+ Remove(iIndex);
}
// sort array elements using passed comparaison function
projects / wxWidgets.git / blobdiff