External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only include wchar.h in PUGIXML_WCHAR_MODE; use a custom implementation of wcslen in case there is no wide character support.

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@942 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine@gmail.com 2012-12-07 08:11:23 +00:00
parent 30549910db
commit 389d1c2893
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/pugixml.cpp
View File

@ -20,7 +20,10 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <wchar.h>
#ifdef PUGIXML_WCHAR_MODE
# include <wchar.h>
#endif
#ifndef PUGIXML_NO_XPATH #ifndef PUGIXML_NO_XPATH
# include <math.h> # include <math.h>
@ -196,6 +199,20 @@ PUGI__NS_BEGIN
return lhs[count] == 0; return lhs[count] == 0;
} }
// Get length of wide string, even if CRT lacks wide character support
PUGI__FN size_t strlength_wide(const wchar_t* s)
{
assert(s);
#ifdef PUGIXML_WCHAR_MODE
return wcslen(s);
#else
const wchar_t* end = s;
while (*end) end++;
return static_cast<size_t>(end - s);
#endif
}
#ifdef PUGIXML_WCHAR_MODE #ifdef PUGIXML_WCHAR_MODE
// Convert string to wide string, assuming all symbols are ASCII // Convert string to wide string, assuming all symbols are ASCII
PUGI__FN void widen_ascii(wchar_t* dest, const char* source) PUGI__FN void widen_ascii(wchar_t* dest, const char* source)
@ -3610,7 +3627,7 @@ PUGI__NS_BEGIN
assert(str); assert(str);
// first pass: get length in utf8 characters // first pass: get length in utf8 characters
size_t length = wcslen(str); size_t length = strlength_wide(str);
size_t size = as_utf8_begin(str, length); size_t size = as_utf8_begin(str, length);
// allocate resulting string // allocate resulting string
@ -5394,7 +5411,7 @@ namespace pugi
{ {
assert(str); assert(str);
return impl::as_utf8_impl(str, wcslen(str)); return impl::as_utf8_impl(str, impl::strlength_wide(str));
} }
PUGI__FN std::string PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t>& str) PUGI__FN std::string PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t>& str)