From 1906067aac950580164c43e8dae5bd5a7c998288 Mon Sep 17 00:00:00 2001
From: orbitcowboy <orbitcowboy@web.de>
Date: Tue, 13 Feb 2018 10:41:15 +0100
Subject: [PATCH] cli:platforms: Fixed wrong loading of platform info.

---
 lib/platform.cpp   | 41 ++++++++++++++++++++---------------------
 platforms/avr8.xml |  1 -
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/lib/platform.cpp b/lib/platform.cpp
index 50d627044..7865970c2 100644
--- a/lib/platform.cpp
+++ b/lib/platform.cpp
@@ -195,26 +195,26 @@ bool cppcheck::Platform::platformFile(const char exename[], const std::string &f
             char_bit = std::atoi(node->GetText());
         else if (std::strcmp(node->Name(), "sizeof") == 0) {
             for (const tinyxml2::XMLElement *sz = node->FirstChildElement(); sz; sz = sz->NextSiblingElement()) {
-                if (std::strcmp(node->Name(), "short") == 0)
-                    sizeof_short = std::atoi(node->GetText());
-                else if (std::strcmp(node->Name(), "int") == 0)
-                    sizeof_int = std::atoi(node->GetText());
-                else if (std::strcmp(node->Name(), "long") == 0)
-                    sizeof_long = std::atoi(node->GetText());
-                else if (std::strcmp(node->Name(), "long-long") == 0)
-                    sizeof_long_long = std::atoi(node->GetText());
-                else if (std::strcmp(node->Name(), "float") == 0)
-                    sizeof_float = std::atoi(node->GetText());
-                else if (std::strcmp(node->Name(), "double") == 0)
-                    sizeof_double = std::atoi(node->GetText());
-                else if (std::strcmp(node->Name(), "long-double") == 0)
-                    sizeof_long_double = std::atoi(node->GetText());
-                else if (std::strcmp(node->Name(), "pointer") == 0)
-                    sizeof_pointer = std::atoi(node->GetText());
-                else if (std::strcmp(node->Name(), "size_t") == 0)
-                    sizeof_size_t = std::atoi(node->GetText());
-                else if (std::strcmp(node->Name(), "wchar_t") == 0)
-                    sizeof_wchar_t = std::atoi(node->GetText());
+                if (std::strcmp(sz->Name(), "short") == 0)
+                    sizeof_short = std::atoi(sz->GetText());
+                else if (std::strcmp(sz->Name(), "int") == 0)
+                    sizeof_int = std::atoi(sz->GetText());
+                else if (std::strcmp(sz->Name(), "long") == 0)
+                    sizeof_long = std::atoi(sz->GetText());
+                else if (std::strcmp(sz->Name(), "long-long") == 0)
+                    sizeof_long_long = std::atoi(sz->GetText());
+                else if (std::strcmp(sz->Name(), "float") == 0)
+                    sizeof_float = std::atoi(sz->GetText());
+                else if (std::strcmp(sz->Name(), "double") == 0)
+                    sizeof_double = std::atoi(sz->GetText());
+                else if (std::strcmp(sz->Name(), "long-double") == 0)
+                    sizeof_long_double = std::atoi(sz->GetText());
+                else if (std::strcmp(sz->Name(), "pointer") == 0)
+                    sizeof_pointer = std::atoi(sz->GetText());
+                else if (std::strcmp(sz->Name(), "size_t") == 0)
+                    sizeof_size_t = std::atoi(sz->GetText());
+                else if (std::strcmp(sz->Name(), "wchar_t") == 0)
+                    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;
 
     platformType = PlatformFile;
-
     return true;
 }
diff --git a/platforms/avr8.xml b/platforms/avr8.xml
index 73eac30f6..448bfd139 100644
--- a/platforms/avr8.xml
+++ b/platforms/avr8.xml
@@ -3,7 +3,6 @@
   <char_bit>8</char_bit>
   <default-sign>unsigned</default-sign>
   <sizeof>
-	<bool>1</bool>
     <short>2</short>
     <int>2</int>
     <long>4</long>