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

Fix wxCRT_GetenvW WXDLLEXPORT. Use more efficient preincrement operator on iterators.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-07-28 17:07:52 +00:00
parent c1daf25293
commit b2dd2f28f3
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/wxcrt.cpp
View File

@@ -367,7 +367,7 @@ int wxCRT_ScanfW(const wchar_t *format, ...)
#else #else
int ret = vwscanf(format, argptr); int ret = vwscanf(format, argptr);
#endif #endif
va_end(argptr); va_end(argptr);
return ret; return ret;
@@ -841,7 +841,7 @@ extern "C" WXDLLEXPORT size_t wxCRT_StrlenW(const wchar_t *s)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifndef wxCRT_GetenvW #ifndef wxCRT_GetenvW
wchar_t* WXDLLEXPORT wxCRT_GetenvW(const wchar_t *name) WXDLLEXPORT wchar_t* wxCRT_GetenvW(const wchar_t *name)
{ {
// NB: buffer returned by getenv() is allowed to be overwritten next // NB: buffer returned by getenv() is allowed to be overwritten next
// time getenv() is called, so it is OK to use static string // time getenv() is called, so it is OK to use static string
@@ -891,7 +891,7 @@ wxCRT_StrtoullBase(const T* nptr, T** endptr, int base, T* sign)
wxString::const_iterator end = wxstr.end(); wxString::const_iterator end = wxstr.end();
// Skip spaces // Skip spaces
while ( i != end && wxIsspace(*i) ) i++; while ( i != end && wxIsspace(*i) ) ++i;
// Starts with sign? // Starts with sign?
*sign = wxT(' '); *sign = wxT(' ');
@@ -901,20 +901,20 @@ wxCRT_StrtoullBase(const T* nptr, T** endptr, int base, T* sign)
if ( c == wxT('+') || c == wxT('-') ) if ( c == wxT('+') || c == wxT('-') )
{ {
*sign = c; *sign = c;
i++; ++i;
} }
} }
// Starts with 0x? // Starts with 0x?
if ( i != end && *i == wxT('0') ) if ( i != end && *i == wxT('0') )
{ {
i++; ++i;
if ( i != end ) if ( i != end )
{ {
if ( *i == wxT('x') && (base == 16 || base == 0) ) if ( *i == wxT('x') && (base == 16 || base == 0) )
{ {
base = 16; base = 16;
i++; ++i;
} }
else else
{ {
@@ -925,13 +925,13 @@ wxCRT_StrtoullBase(const T* nptr, T** endptr, int base, T* sign)
} }
} }
else else
i--; --i;
} }
if ( base == 0 ) if ( base == 0 )
base = 10; base = 10;
for ( ; i != end; i++ ) for ( ; i != end; ++i )
{ {
unsigned int n; unsigned int n;