From 81c5576eb458abad8d1c3500fef25f8f234127b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Sat, 25 Dec 2010 08:43:52 +0100
Subject: [PATCH] Misused scope objects: Don't use this check if the checked
 file is a pure C file. Ticket: #2352

---
 lib/checkother.cpp |  8 ++++++++
 test/testother.cpp | 24 ++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index 31c337e85..0030cd9be 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -2517,6 +2517,14 @@ bool CheckOther::isIdentifierObjectType(const Token * const tok)
 
 void CheckOther::checkMisusedScopedObject()
 {
+    // Skip this check for .c files
+    {
+        const std::string fname = _tokenizer->getFiles()->at(0);
+        const std::string ext = fname.substr(fname.rfind("."));
+        if (ext == ".c" || ext == ".C")
+            return;
+    }
+
     SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
 
     std::list<SymbolDatabase::SpaceInfo *>::iterator i;
diff --git a/test/testother.cpp b/test/testother.cpp
index 52110521e..bec5f925e 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -87,6 +87,7 @@ private:
         TEST_CASE(testMisusedScopeObjectDoesNotPickFunctor);
         TEST_CASE(testMisusedScopeObjectDoesNotPickLocalClassConstructors);
         TEST_CASE(testMisusedScopeObjectDoesNotPickUsedObject);
+        TEST_CASE(testMisusedScopeObjectDoesNotPickPureC);
         TEST_CASE(trac2071);
         TEST_CASE(trac2084);
 
@@ -94,7 +95,7 @@ private:
         TEST_CASE(incorrectLogicOperator);
     }
 
-    void check(const char code[])
+    void check(const char code[], const char *filename = NULL)
     {
         // Clear the error buffer..
         errout.str("");
@@ -105,7 +106,7 @@ private:
         // Tokenize..
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
-        tokenizer.tokenize(istr, "test.cpp");
+        tokenizer.tokenize(istr, filename ? filename : "test.cpp");
 
         // Check..
         CheckOther checkOther(&tokenizer, &settings, this);
@@ -1303,6 +1304,25 @@ private:
         ASSERT_EQUALS("", errout.str());
     }
 
+    void testMisusedScopeObjectDoesNotPickPureC()
+    {
+        // Ticket #2352
+        const char code[] = "struct cb_watch_bool {\n"
+                            "    int a;\n"
+                            "};\n"
+                            "\n"
+                            "void f()\n"
+                            "{\n"
+                            "    cb_watch_bool();\n"
+                            "}\n";
+
+        check(code, "test.cpp");
+        ASSERT_EQUALS("[test.cpp:7]: (error) instance of \"cb_watch_bool\" object destroyed immediately\n", errout.str());
+
+        check(code, "test.c");
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void trac2084()
     {
         check("#include <signal.h>\n"