Nits

Author: olabetskyi

lib/checkio.cpp

@@ -1938,6 +1938,7 @@ void CheckIO::invalidPrintfArgTypeError_float(const Token* tok, nonneg int numFo
 
 Severity CheckIO::getSeverity(const CheckIO::ArgumentInfo *argInfo)
 {
+    //TODO: It causes issues if we use fixed range types like int32_t etc so we should rewrite this to handle those types properly
     return (argInfo && argInfo->typeToken && !argInfo->typeToken->originalName().empty()) ? Severity::portability : Severity::warning;
 }
 

lib/symboldatabase.cpp

@@ -8237,13 +8237,15 @@ bool ValueType::fromLibraryType(const std::string &typestr, const Settings &sett
         else
             type = ValueType::Type::UNKNOWN_INT;
         sign = (podtype->sign == 'u') ? ValueType::UNSIGNED : ValueType::SIGNED;
-        originalTypeName = typestr;
+        if (originalTypeName.empty())
+            originalTypeName = typestr;
         return true;
     }
     if (podtype && podtype->stdtype == Library::PodType::Type::NO) {
         type = ValueType::Type::POD;
         sign = ValueType::UNKNOWN_SIGN;
-        originalTypeName = typestr;
+        if (originalTypeName.empty())
+            originalTypeName = typestr;
         return true;
     }
 
@@ -8269,7 +8271,8 @@ bool ValueType::fromLibraryType(const std::string &typestr, const Settings &sett
             pointer = 2;
         if (platformType->mConstPtr)
             constness = 1;
-        originalTypeName = typestr;
+        if (originalTypeName.empty())
+            originalTypeName = typestr;
         return true;
     }
     if (!podtype && (typestr == "size_t" || typestr == "std::size_t")) {
@@ -8283,7 +8286,6 @@ bool ValueType::fromLibraryType(const std::string &typestr, const Settings &sett
             type = ValueType::Type::INT;
         else
             type = ValueType::Type::UNKNOWN_INT;
-        originalTypeName = typestr;
         return true;
     }
 

test/testio.cpp

@@ -2915,14 +2915,16 @@ class TestIO : public TestFixture {
                       "[test.cpp:3]: (warning) %Lf in format string (no. 5) requires 'long double' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %p in format string (no. 6) requires an address but the argument type is 'signed int'.\n", errout_str());
 
+        // We should revisit the logic behind portability checks here.
         check("struct Fred { int32_t i; } f;\n"
               "struct Fred & bar() { };\n"
-              "void foo() { printf(\"%d %ld %u %lu %f %Lf\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) %ld in format string (no. 2) requires 'long' but the argument type is 'signed int'.\n"
-                      "[test.cpp:3]: (warning) %u in format string (no. 3) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:3]: (warning) %lu in format string (no. 4) requires 'unsigned long' but the argument type is 'signed int'.\n"
-                      "[test.cpp:3]: (warning) %f in format string (no. 5) requires 'double' but the argument type is 'signed int'.\n"
-                      "[test.cpp:3]: (warning) %Lf in format string (no. 6) requires 'long double' but the argument type is 'signed int'.\n",
+              "void foo() { printf(\"%d %ld %u %lu %f %Lf\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }",
+              dinit(CheckOptions, $.portability = true));
+        ASSERT_EQUALS("[test.cpp:3]: (portability) %ld in format string (no. 2) requires 'long' but the argument type is 'int32_t {aka signed int}'.\n"
+                      "[test.cpp:3]: (portability) %u in format string (no. 3) requires 'unsigned int' but the argument type is 'int32_t {aka signed int}'.\n"
+                      "[test.cpp:3]: (portability) %lu in format string (no. 4) requires 'unsigned long' but the argument type is 'int32_t {aka signed int}'.\n"
+                      "[test.cpp:3]: (portability) %f in format string (no. 5) requires 'double' but the argument type is 'int32_t {aka signed int}'.\n"
+                      "[test.cpp:3]: (portability) %Lf in format string (no. 6) requires 'long double' but the argument type is 'int32_t {aka signed int}'.\n",
                       errout_str());
 
         // #4984