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

Inline widen_ascii to get rid of an extra strlen call

Browse Source 
Also since this function is only used once and is not defined in regular mode
to avoid warnings this simplifies code a bit.
This commit is contained in:
Arseny Kapoulkine 2015-09-20 00:46:09 -07:00
parent 9c539f92ab
commit 25cce38f50
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/pugixml.cpp
View File

@ -221,15 +221,6 @@ PUGI__NS_BEGIN
return static_cast<size_t>(end - s); return static_cast<size_t>(end - s);
#endif #endif
} }
#ifdef PUGIXML_WCHAR_MODE
// Convert string to wide string, assuming all symbols are ASCII
PUGI__FN void widen_ascii(wchar_t* dest, const char* source)
{
for (const char* i = source; *i; ++i) *dest++ = *i;
*dest = 0;
}
#endif
PUGI__NS_END PUGI__NS_END
// auto_ptr-like object for exception recovery // auto_ptr-like object for exception recovery
@ -4563,13 +4554,15 @@ PUGI__NS_BEGIN
// set value with conversion functions // set value with conversion functions
template <typename String, typename Header> template <typename String, typename Header>
PUGI__FN bool set_value_buffer(String& dest, Header& header, uintptr_t header_mask, char (&buf)[128]) PUGI__FN bool set_value_ascii(String& dest, Header& header, uintptr_t header_mask, char (&buf)[128])
{ {
#ifdef PUGIXML_WCHAR_MODE #ifdef PUGIXML_WCHAR_MODE
char_t wbuf[128]; char_t wbuf[128];
impl::widen_ascii(wbuf, buf);
return strcpy_insitu(dest, header, header_mask, wbuf, strlength(wbuf)); size_t offset = 0;
for (; buf[offset]; ++offset) wbuf[offset] = buf[offset];
return strcpy_insitu(dest, header, header_mask, wbuf, offset);
#else #else
return strcpy_insitu(dest, header, header_mask, buf, strlength(buf)); return strcpy_insitu(dest, header, header_mask, buf, strlength(buf));
#endif #endif
@ -4601,7 +4594,7 @@ PUGI__NS_BEGIN
char buf[128]; char buf[128];
sprintf(buf, "%.9g", value); sprintf(buf, "%.9g", value);
return set_value_buffer(dest, header, header_mask, buf); return set_value_ascii(dest, header, header_mask, buf);
} }
template <typename String, typename Header> template <typename String, typename Header>
@ -4610,7 +4603,7 @@ PUGI__NS_BEGIN
char buf[128]; char buf[128];
sprintf(buf, "%.17g", value); sprintf(buf, "%.17g", value);
return set_value_buffer(dest, header, header_mask, buf); return set_value_ascii(dest, header, header_mask, buf);
} }
template <typename String, typename Header> template <typename String, typename Header>