walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

cli:platforms: Fixed wrong loading of platform info.

This commit is contained in:
orbitcowboy 2018-02-13 10:41:15 +01:00
parent 22db3d77f7
commit 1906067aac
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/platform.cpp
View File

@ -195,26 +195,26 @@ bool cppcheck::Platform::platformFile(const char exename[], const std::string &f
char_bit = std::atoi(node->GetText()); char_bit = std::atoi(node->GetText());
else if (std::strcmp(node->Name(), "sizeof") == 0) { else if (std::strcmp(node->Name(), "sizeof") == 0) {
for (const tinyxml2::XMLElement *sz = node->FirstChildElement(); sz; sz = sz->NextSiblingElement()) { for (const tinyxml2::XMLElement *sz = node->FirstChildElement(); sz; sz = sz->NextSiblingElement()) {
if (std::strcmp(node->Name(), "short") == 0) if (std::strcmp(sz->Name(), "short") == 0)
sizeof_short = std::atoi(node->GetText()); sizeof_short = std::atoi(sz->GetText());
else if (std::strcmp(node->Name(), "int") == 0) else if (std::strcmp(sz->Name(), "int") == 0)
sizeof_int = std::atoi(node->GetText()); sizeof_int = std::atoi(sz->GetText());
else if (std::strcmp(node->Name(), "long") == 0) else if (std::strcmp(sz->Name(), "long") == 0)
sizeof_long = std::atoi(node->GetText()); sizeof_long = std::atoi(sz->GetText());
else if (std::strcmp(node->Name(), "long-long") == 0) else if (std::strcmp(sz->Name(), "long-long") == 0)
sizeof_long_long = std::atoi(node->GetText()); sizeof_long_long = std::atoi(sz->GetText());
else if (std::strcmp(node->Name(), "float") == 0) else if (std::strcmp(sz->Name(), "float") == 0)
sizeof_float = std::atoi(node->GetText()); sizeof_float = std::atoi(sz->GetText());
else if (std::strcmp(node->Name(), "double") == 0) else if (std::strcmp(sz->Name(), "double") == 0)
sizeof_double = std::atoi(node->GetText()); sizeof_double = std::atoi(sz->GetText());
else if (std::strcmp(node->Name(), "long-double") == 0) else if (std::strcmp(sz->Name(), "long-double") == 0)
sizeof_long_double = std::atoi(node->GetText()); sizeof_long_double = std::atoi(sz->GetText());
else if (std::strcmp(node->Name(), "pointer") == 0) else if (std::strcmp(sz->Name(), "pointer") == 0)
sizeof_pointer = std::atoi(node->GetText()); sizeof_pointer = std::atoi(sz->GetText());
else if (std::strcmp(node->Name(), "size_t") == 0) else if (std::strcmp(sz->Name(), "size_t") == 0)
sizeof_size_t = std::atoi(node->GetText()); sizeof_size_t = std::atoi(sz->GetText());
else if (std::strcmp(node->Name(), "wchar_t") == 0) else if (std::strcmp(sz->Name(), "wchar_t") == 0)
sizeof_wchar_t = std::atoi(node->GetText()); sizeof_wchar_t = std::atoi(sz->GetText());
} }
} }
} }
@ -225,6 +225,5 @@ bool cppcheck::Platform::platformFile(const char exename[], const std::string &f
long_long_bit = char_bit * sizeof_long_long; long_long_bit = char_bit * sizeof_long_long;
platformType = PlatformFile; platformType = PlatformFile;
return true; return true;
} }

1
platforms/avr8.xml
View File

@ -3,7 +3,6 @@
<char_bit>8</char_bit> <char_bit>8</char_bit>
<default-sign>unsigned</default-sign> <default-sign>unsigned</default-sign>
<sizeof> <sizeof>
<bool>1</bool>
<short>2</short> <short>2</short>
<int>2</int> <int>2</int>
<long>4</long> <long>4</long>