Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup - added whitespace around operators, some blank lines, fixed comment typos, renamed out-in vars to outBuff-inBuff

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-04-05 18:02:26 +00:00
parent 20002db0f8
commit d32a507d02
1 changed files with 179 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
src/common/strconv.cpp
View File

@@ -203,8 +203,8 @@ wxMBConv::ToWChar(wchar_t *dst, size_t dstLen,
size_t lenChunk = MB2WC(NULL, src, 0);
if ( lenChunk == 0 )
{
// nothing left in the input string, conversion succeeded; but
// still account for the trailing NULL
// nothing left in the input string, conversion succeeded;
// but still account for the trailing NULL
dstWritten++;
break;
}
@@ -229,7 +229,7 @@ wxMBConv::ToWChar(wchar_t *dst, size_t dstLen,
if ( !srcEnd )
{
// we convert the entire string in this cas, as we suppose that the
// we convert the entire string in this case, as we suppose that the
// string is NUL-terminated and so srcEnd is not used at all
break;
}
@@ -310,10 +310,10 @@ wxMBConv::FromWChar(char *dst, size_t dstLen,
return dstWritten;
}
size_t wxMBConv::MB2WC(wchar_t *out, const char *in, size_t outLen) const
size_t wxMBConv::MB2WC(wchar_t *outBuff, const char *inBuff, size_t outLen) const
{
size_t rc = ToWChar(out, outLen, in);
if ( rc != wxCONV_FAILED )
size_t rc = ToWChar(outBuff, outLen, inBuff);
if ( rc != (size_t)wxCONV_FAILED )
{
// ToWChar() returns the buffer length, i.e. including the trailing
// NUL, while this method doesn't take it into account
@@ -323,10 +323,10 @@ size_t wxMBConv::MB2WC(wchar_t *out, const char *in, size_t outLen) const
return rc;
}
size_t wxMBConv::WC2MB(char *out, const wchar_t *in, size_t outLen) const
size_t wxMBConv::WC2MB(char *outBuff, const wchar_t *inBuff, size_t outLen) const
{
size_t rc = FromWChar(out, outLen, in);
if ( rc != wxCONV_FAILED )
size_t rc = FromWChar(outBuff, outLen, inBuff);
if ( rc != (size_t)wxCONV_FAILED )
{
rc -= GetMBNulLen();
}
@@ -345,7 +345,7 @@ const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
{
// calculate the length of the buffer needed first
const size_t nLen = MB2WC(NULL, psz, 0);
if ( nLen != wxCONV_FAILED )
if ( nLen != (size_t)wxCONV_FAILED )
{
// now do the actual conversion
wxWCharBuffer buf(nLen /* +1 added implicitly */);
@@ -364,7 +364,7 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
if ( pwz )
{
const size_t nLen = WC2MB(NULL, pwz, 0);
if ( nLen != wxCONV_FAILED )
if ( nLen != (size_t)wxCONV_FAILED )
{
// extra space for trailing NUL(s)
static const size_t extraLen = GetMaxMBNulLen();
@@ -379,13 +379,13 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
}
const wxWCharBuffer
wxMBConv::cMB2WC(const char *in, size_t inLen, size_t *outLen) const
wxMBConv::cMB2WC(const char *inBuff, size_t inLen, size_t *outLen) const
{
const size_t dstLen = ToWChar(NULL, 0, in, inLen);
if ( dstLen != wxCONV_FAILED )
const size_t dstLen = ToWChar(NULL, 0, inBuff, inLen);
if ( dstLen != (size_t)wxCONV_FAILED )
{
wxWCharBuffer wbuf(dstLen - 1);
if ( ToWChar(wbuf.data(), dstLen, in, inLen) )
if ( ToWChar(wbuf.data(), dstLen, inBuff, inLen) )
{
if ( outLen )
*outLen = dstLen - 1;
@@ -400,16 +400,17 @@ wxMBConv::cMB2WC(const char *in, size_t inLen, size_t *outLen) const
}
const wxCharBuffer
wxMBConv::cWC2MB(const wchar_t *in, size_t inLen, size_t *outLen) const
wxMBConv::cWC2MB(const wchar_t *inBuff, size_t inLen, size_t *outLen) const
{
const size_t dstLen = FromWChar(NULL, 0, in, inLen);
if ( dstLen != wxCONV_FAILED )
const size_t dstLen = FromWChar(NULL, 0, inBuff, inLen);
if ( dstLen != (size_t)wxCONV_FAILED )
{
wxCharBuffer buf(dstLen - 1);
if ( FromWChar(buf.data(), dstLen, in, inLen) )
if ( FromWChar(buf.data(), dstLen, inBuff, inLen) )
{
if ( outLen )
*outLen = dstLen - 1;
return buf;
}
}
@@ -611,6 +612,7 @@ size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
// plain ASCII char
if (buf)
*buf++ = (char)cc;
len++;
}
#ifndef WC_UTF16
@@ -655,13 +657,16 @@ size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
len++;
}
}
if (buf)
*buf++ = '-';
len++;
}
}
if (buf && (len < n))
*buf = 0;
return len;
}
@@ -689,6 +694,7 @@ size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
unsigned cnt;
for (cnt = 0; fc & 0x80; cnt++)
fc <<= 1;
if (!cnt)
{
// plain ASCII char
@@ -726,6 +732,7 @@ size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
invalid = true;
break;
}
psz++;
res = (res << 6) | (cc & 0x3f);
}
@@ -798,6 +805,7 @@ size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
*buf++ = (wchar_t)( L'0' + (on % 0100) / 010 );
*buf++ = (wchar_t)( L'0' + on % 010 );
}
opsz++;
len += 4;
}
@@ -809,8 +817,10 @@ size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
}
}
}
if (buf && (len < n))
*buf = 0;
return len;
}
@@ -826,6 +836,7 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
while (*psz && ((!buf) || (len < n)))
{
wxUint32 cc;
#ifdef WC_UTF16
// cast is ok for WC_UTF16
size_t pa = decode_utf16((const wxUint16 *)psz, cc);
@@ -866,7 +877,10 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
else
{
unsigned cnt;
for (cnt = 0; cc > utf8_max[cnt]; cnt++) {}
for (cnt = 0; cc > utf8_max[cnt]; cnt++)
{
}
if (!cnt)
{
// plain ASCII char
@@ -922,7 +936,9 @@ size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) con
psz += sizeof(wxUint16);
}
if (buf && len<n) *buf=0;
if (buf && len < n)
*buf = 0;
return len;
}
@@ -940,10 +956,13 @@ size_t wxMBConvUTF16straight::WC2MB(char *buf, const wchar_t *psz, size_t n) con
*(wxUint16*)buf = *psz;
buf += sizeof(wxUint16);
}
len += sizeof(wxUint16);
psz++;
}
if (buf && len<=n-sizeof(wxUint16)) *(wxUint16*)buf=0;
if (buf && len <= n - sizeof(wxUint16))
*(wxUint16*)buf = 0;
return len;
}
@@ -987,6 +1006,7 @@ size_t wxMBConvUTF16swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
*buf++ = ((char*)psz)[1];
*buf++ = ((char*)psz)[0];
}
len += 2;
psz++;
}
@@ -1021,7 +1041,9 @@ size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) con
len++;
psz += pa * sizeof(wxUint16);
}
if (buf && len<n) *buf=0;
if (buf && len < n)
*buf = 0;
return len;
}
@@ -1054,7 +1076,9 @@ size_t wxMBConvUTF16straight::WC2MB(char *buf, const wchar_t *psz, size_t n) con
len += pa*sizeof(wxUint16);
psz++;
}
if (buf && len<=n-sizeof(wxUint16)) *(wxUint16*)buf=0;
if (buf && len <= n - sizeof(wxUint16))
*(wxUint16*)buf = 0;
return len;
}
@@ -1069,8 +1093,11 @@ size_t wxMBConvUTF16swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
wxUint32 cc;
char tmp[4];
tmp[0]=psz[1]; tmp[1]=psz[0];
tmp[2]=psz[3]; tmp[3]=psz[2];
tmp[0] = psz[1];
tmp[1] = psz[0];
tmp[2] = psz[3];
tmp[3] = psz[2];
size_t pa = decode_utf16((wxUint16*)tmp, cc);
if (pa == (size_t)-1)
@@ -1082,7 +1109,9 @@ size_t wxMBConvUTF16swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
len++;
psz += pa * sizeof(wxUint16);
}
if (buf && len<n) *buf=0;
if (buf && len < n)
*buf = 0;
return len;
}
@@ -1115,7 +1144,9 @@ size_t wxMBConvUTF16swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
len += pa * sizeof(wxUint16);
psz++;
}
if (buf && len<=n-sizeof(wxUint16)) *(wxUint16*)buf=0;
if (buf && len <= n - sizeof(wxUint16))
*(wxUint16*)buf = 0;
return len;
}
@@ -1161,10 +1192,13 @@ size_t wxMBConvUTF32straight::MB2WC(wchar_t *buf, const char *psz, size_t n) con
if (pa > 1)
*buf++ = cc[1];
}
len += pa;
psz += sizeof(wxUint32);
}
if (buf && len<n) *buf=0;
if (buf && len < n)
*buf = 0;
return len;
}
@@ -1189,6 +1223,7 @@ size_t wxMBConvUTF32straight::WC2MB(char *buf, const wchar_t *psz, size_t n) con
*(wxUint32*)buf = cc;
buf += sizeof(wxUint32);
}
len += sizeof(wxUint32);
psz += pa;
}
@@ -1200,7 +1235,6 @@ size_t wxMBConvUTF32straight::WC2MB(char *buf, const wchar_t *psz, size_t n) con
}
// swap 32bit MB to 16bit String
size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
@@ -1209,9 +1243,10 @@ size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
while (*(wxUint32*)psz && (!buf || len < n))
{
char tmp[4];
tmp[0] = psz[3]; tmp[1] = psz[2];
tmp[2] = psz[1]; tmp[3] = psz[0];
tmp[0] = psz[3];
tmp[1] = psz[2];
tmp[2] = psz[1];
tmp[3] = psz[0];
wxUint16 cc[2];
@@ -1225,6 +1260,7 @@ size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
if (pa > 1)
*buf++ = cc[1];
}
len += pa;
psz += sizeof(wxUint32);
}
@@ -1257,6 +1293,7 @@ size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
*buf++ = cc[1];
*buf++ = cc[0];
}
len += sizeof(wxUint32);
psz += pa;
}
@@ -1329,6 +1366,7 @@ size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
((char *)buf)[3] = psz[0];
buf++;
}
len++;
psz += sizeof(wxUint32);
}
@@ -1354,6 +1392,7 @@ size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
*buf++ = ((char *)psz)[1];
*buf++ = ((char *)psz)[0];
}
len += sizeof(wxUint32);
psz++;
}
@@ -1435,6 +1474,7 @@ protected:
// the other direction
iconv_t m2w,
w2m;
#if wxUSE_THREADS
// guards access to m2w and w2m objects
wxMutex m_iconvMutex;
@@ -1467,6 +1507,7 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_iconv( const wxChar* name )
delete result;
return 0;
}
return result;
}
@@ -1635,7 +1676,6 @@ size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
wxMutexLocker lock(wxConstCast(this, wxMBConv_iconv)->m_iconvMutex);
#endif // wxUSE_THREADS
size_t outbuf = n * SIZEOF_WCHAR_T;
size_t res, cres;
// VS: Use these instead of psz, buf because iconv() modifies its arguments:
@@ -1667,7 +1707,9 @@ size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
// to calculate destination buffer requirement
wchar_t tbuf[8];
res = 0;
do {
do
{
bufPtr = tbuf;
outbuf = 8 * SIZEOF_WCHAR_T;
@@ -1676,7 +1718,8 @@ size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
(char**)&bufPtr, &outbuf );
res += 8 - (outbuf / SIZEOF_WCHAR_T);
} while ((cres==(size_t)-1) && (errno==E2BIG));
}
while ((cres == (size_t)-1) && (errno == E2BIG));
}
if (ICONV_FAILED(cres, inbuf))
@@ -1711,6 +1754,7 @@ size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
tmpbuf = (wchar_t *)malloc(inbuf + SIZEOF_WCHAR_T);
for ( size_t i = 0; i < inlen; i++ )
tmpbuf[n] = WC_BSWAP(psz[i]);
tmpbuf[inlen] = L'\0';
psz = tmpbuf;
}
@@ -1734,13 +1778,16 @@ size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
// to calculate destination buffer requirement
char tbuf[16];
res = 0;
do {
buf = tbuf; outbuf = 16;
do
{
buf = tbuf;
outbuf = 16;
cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
res += 16 - outbuf;
} while ((cres==(size_t)-1) && (errno==E2BIG));
}
while ((cres == (size_t)-1) && (errno == E2BIG));
}
if (ms_wcNeedsSwap)
@@ -1772,15 +1819,15 @@ size_t wxMBConv_iconv::GetMBNulLen() const
char buf[8]; // should be enough for NUL in any encoding
size_t inLen = sizeof(wchar_t),
outLen = WXSIZEOF(buf);
char *in = (char *)wnul;
char *out = buf;
if ( iconv(w2m, ICONV_CHAR_CAST(&in), &inLen, &out, &outLen) == (size_t)-1 )
char *inBuff = (char *)wnul;
char *outBuff = buf;
if ( iconv(w2m, ICONV_CHAR_CAST(&inBuff), &inLen, &outBuff, &outLen) == (size_t)-1 )
{
self->m_minMBCharWidth = (size_t)-1;
}
else // ok
{
self->m_minMBCharWidth = out - buf;
self->m_minMBCharWidth = outBuff - buf;
}
}
@@ -2009,7 +2056,8 @@ public:
{
default:
wxLogDebug(_T("Unexpected NUL length %d"), len);
// fall through
self->m_minMBCharWidth = (size_t)-1;
break;
case 0:
self->m_minMBCharWidth = (size_t)-1;
@@ -2049,8 +2097,9 @@ private:
break;
default:
// unknown, be conseravtive by default
// unknown, be conservative by default
s_isWin98Or2k = 0;
break;
}
wxASSERT_MSG( s_isWin98Or2k != -1, _T("should be set above") );
@@ -2103,8 +2152,8 @@ private:
#if defined(__WXCOCOA__)
// RN: There is no UTF-32 support in either Core Foundation or
// Cocoa. Strangely enough, internally Core Foundation uses
// RN: There is no UTF-32 support in either Core Foundation or Cocoa.
// Strangely enough, internally Core Foundation uses
// UTF 32 internally quite a bit - its just not public (yet).
#include <CoreFoundation/CFString.h>
@@ -2113,12 +2162,13 @@ private:
CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
{
CFStringEncoding enc = kCFStringEncodingInvalidId ;
if ( encoding == wxFONTENCODING_DEFAULT )
switch (encoding)
{
case wxFONTENCODING_DEFAULT :
enc = CFStringGetSystemEncoding();
}
else switch( encoding)
{
break ;
case wxFONTENCODING_ISO8859_1 :
enc = kCFStringEncodingISOLatin1 ;
break ;
@@ -2360,10 +2410,12 @@ CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
// case wxFONTENCODING_MACKEYBOARD :
// enc = kCFStringEncodingMacKeyboardGlyphs ;
// break ;
default :
// because gcc is picky
break ;
} ;
}
return enc ;
}
@@ -2584,7 +2636,9 @@ public:
n = wxMax( 32 , byteInLen ) ;
tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T) ;
}
ByteCount byteBufferLen = n * sizeof( UniChar ) ;
#if SIZEOF_WCHAR_T == 4
ubuf = (UniChar*) malloc( byteBufferLen + 2 ) ;
#else
@@ -2602,6 +2656,7 @@ public:
#else
res = byteOutLen / sizeof( UniChar ) ;
#endif
if ( buf == NULL )
free(tbuf) ;
@@ -2628,6 +2683,7 @@ public:
ByteCount byteBufferLen = n ;
UniChar* ubuf = NULL ;
#if SIZEOF_WCHAR_T == 4
wxMBConvUTF16 converter ;
size_t unicharlen = converter.WC2MB( NULL , psz , 0 ) ;
@@ -2637,11 +2693,15 @@ public:
#else
ubuf = (UniChar*) psz ;
#endif
status = TECConvertText(m_WC2MB_converter, (ConstTextPtr) ubuf , byteInLen, &byteInLen,
status = TECConvertText(
m_WC2MB_converter, (ConstTextPtr) ubuf, byteInLen, &byteInLen,
(TextPtr) (buf ? buf : tbuf), byteBufferLen, &byteOutLen);
#if SIZEOF_WCHAR_T == 4
free( ubuf ) ;
#endif
if ( buf == NULL )
free(tbuf) ;
@@ -2781,6 +2841,7 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_wxwin( const wxChar* name )
delete result;
return 0;
}
return result;
}
@@ -2976,13 +3037,13 @@ wxMBConv *wxCSConv::DoCreate() const
#endif
}
#endif // wxHAVE_WIN32_MB2WC
#if defined(__WXMAC__)
{
// leave UTF16 and UTF32 to the built-ins of wx
if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ||
( m_encoding >= wxFONTENCODING_MACMIN && m_encoding <= wxFONTENCODING_MACMAX ) ) )
{
#if wxUSE_FONTMAP
wxMBConv_mac *conv = m_name ? new wxMBConv_mac(m_name)
: new wxMBConv_mac(m_encoding);
@@ -2996,17 +3057,18 @@ wxMBConv *wxCSConv::DoCreate() const
}
}
#endif
#if defined(__WXCOCOA__)
{
if ( m_name || ( m_encoding <= wxFONTENCODING_UTF16 ) )
{
#if wxUSE_FONTMAP
wxMBConv_cocoa *conv = m_name ? new wxMBConv_cocoa(m_name)
: new wxMBConv_cocoa(m_encoding);
#else
wxMBConv_cocoa *conv = new wxMBConv_cocoa(m_encoding);
#endif
if ( conv->IsOk() )
return conv;
@@ -3048,7 +3110,7 @@ wxMBConv *wxCSConv::DoCreate() const
default:
// nothing to do but put here to suppress gcc warnings
;
break;
}
// step (3)
@@ -3083,6 +3145,7 @@ wxMBConv *wxCSConv::DoCreate() const
wxString::Format(_("encoding %s"), m_encoding).c_str()
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
);
alreadyLoggingError = false;
}
@@ -3143,6 +3206,7 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
if (psz[c] > 0xFF)
return (size_t)-1;
buf[c] = (char)psz[c];
}
}