potok/tinyxml2
1
0
Fork 0
Code Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'netcan-master'

Browse Source
This commit is contained in:
Lee Thomason
2020-06-13 17:35:35 -07:00
parent bfbcc0333d 18468b8cc4
commit 98ca9146b4
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tinyxml2.cpp
View File

@@ -608,17 +608,17 @@ void XMLUtil::ToStr( uint64_t v, char* buffer, int bufferSize )
TIXML_SNPRINTF(buffer, bufferSize, "%llu", (long long)v); TIXML_SNPRINTF(buffer, bufferSize, "%llu", (long long)v);
} }
bool XMLUtil::ToInt( const char* str, int* value ) bool XMLUtil::ToInt(const char* str, int* value)
{ {
if ( TIXML_SSCANF( str, "%d", value ) == 1 ) { if (TIXML_SSCANF(str, IsPrefixHex(str) ? "%x" : "%d", value) == 1) {
return true; return true;
} }
return false; return false;
} }
bool XMLUtil::ToUnsigned( const char* str, unsigned *value ) bool XMLUtil::ToUnsigned(const char* str, unsigned* value)
{ {
if ( TIXML_SSCANF( str, "%u", value ) == 1 ) { if (TIXML_SSCANF(str, IsPrefixHex(str) ? "%x" : "%u", value) == 1) {
return true; return true;
} }
return false; return false;
@@ -671,7 +671,7 @@ bool XMLUtil::ToDouble( const char* str, double* value )
bool XMLUtil::ToInt64(const char* str, int64_t* value) bool XMLUtil::ToInt64(const char* str, int64_t* value)
{ {
long long v = 0; // horrible syntax trick to make the compiler happy about %lld long long v = 0; // horrible syntax trick to make the compiler happy about %lld
if (TIXML_SSCANF(str, "%lld", &v) == 1) { if (TIXML_SSCANF(str, IsPrefixHex(str) ? "%llx" : "%lld", &v) == 1) {
*value = static_cast<int64_t>(v); *value = static_cast<int64_t>(v);
return true; return true;
} }
@@ -681,7 +681,7 @@ bool XMLUtil::ToInt64(const char* str, int64_t* value)
bool XMLUtil::ToUnsigned64(const char* str, uint64_t* value) { bool XMLUtil::ToUnsigned64(const char* str, uint64_t* value) {
unsigned long long v = 0; // horrible syntax trick to make the compiler happy about %llu unsigned long long v = 0; // horrible syntax trick to make the compiler happy about %llu
if(TIXML_SSCANF(str, "%llu", &v) == 1) { if(TIXML_SSCANF(str, IsPrefixHex(str) ? "%llx" : "%llu", &v) == 1) {
*value = (uint64_t)v; *value = (uint64_t)v;
return true; return true;
} }

7
tinyxml2.h
View File

@@ -590,6 +590,11 @@ public:
|| ch == '-'; || ch == '-';
} }
inline static bool IsPrefixHex( const char* p) {
p = SkipWhiteSpace(p, 0);
return p && *p == '0' && ( *(p + 1) == 'x' || *(p + 1) == 'X');
}
inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX ) { inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX ) {
if ( p == q ) { if ( p == q ) {
return true; return true;
@@ -1478,7 +1483,7 @@ public:
XMLAttribute* a = FindOrCreateAttribute(name); XMLAttribute* a = FindOrCreateAttribute(name);
a->SetAttribute(value); a->SetAttribute(value);
} }
/// Sets the named attribute to value. /// Sets the named attribute to value.
void SetAttribute( const char* name, bool value ) { void SetAttribute( const char* name, bool value ) {
XMLAttribute* a = FindOrCreateAttribute( name ); XMLAttribute* a = FindOrCreateAttribute( name );

18
xmltest.cpp
View File

@@ -1674,6 +1674,24 @@ int main( int argc, const char ** argv )
XMLTest("FloatText()) test", true, test6); XMLTest("FloatText()) test", true, test6);
} }
{
// hex value test
const char* xml = "<point> <IntText> 0x2020</IntText> <UnsignedText>0X2020</UnsignedText> \
<Int64Text> 0x1234</Int64Text></point>";
XMLDocument doc;
doc.Parse(xml);
const XMLElement* pointElement = doc.RootElement();
int test1 = pointElement->FirstChildElement("IntText")->IntText();
XMLTest("IntText() hex value test", 0x2020, test1);
unsigned test2 = pointElement->FirstChildElement("UnsignedText")->UnsignedText();
XMLTest("UnsignedText() hex value test", static_cast<unsigned>(0x2020), test2);
int64_t test3 = pointElement->FirstChildElement("Int64Text")->Int64Text();
XMLTest("Int64Text() hex value test", static_cast<int64_t>(0x1234), test3);
}
{ {
//API:ShallowEqual() test //API:ShallowEqual() test
const char* xml = "<playlist id = 'playlist'>" const char* xml = "<playlist id = 'playlist'>"