From 4f1c37d71f800500cd4e719fb2d61631d5c56336 Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Fri, 2 Jun 2023 11:47:33 +0200
Subject: [PATCH 1/5] Fix #9104 reopened Improve check: missing virtual
 destructor

---
 cfg/std.cfg            |  2 +-
 lib/library.cpp        |  2 +-
 test/testclass.cpp     | 21 +++++++++++++++++++++
 test/testfunctions.cpp |  2 +-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/cfg/std.cfg b/cfg/std.cfg
index 9760afb7c1f..43e59ab4ed4 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -6707,7 +6707,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <use-retval/>
     <noreturn>false</noreturn>
   </function>
-  <function name="std::list::begin,std::list::end,std::forward_list::begin,std::forward_list::end,std::queue::begin,std::queue::end,std::vector::begin,std::vector::end,std::array::begin,std::array::end,std::string::begin,std::string::end,std::wstring::begin,std::wstring::end,std::string_view::begin,std::string_view::end,std::wstring_view::begin,std::wstring_view::end">
+  <function name="std::list::begin,std::list::end,std::forward_list::begin,std::forward_list::end,std::queue::begin,std::queue::end,std::deque::begin,std::deque::end,std::vector::begin,std::vector::end,std::array::begin,std::array::end,std::string::begin,std::string::end,std::wstring::begin,std::wstring::end,std::string_view::begin,std::string_view::end,std::wstring_view::begin,std::wstring_view::end,std::span::begin,std::span::end,std::set::begin,std::set::end,std::unordered_set::begin,std::unordered_set::end,std::map::begin,std::map::end,std::unordered_map::begin,std::unordered_map::end">
     <use-retval/>
     <noreturn>false</noreturn>
   </function>
diff --git a/lib/library.cpp b/lib/library.cpp
index 028945a02a3..60754cad87b 100644
--- a/lib/library.cpp
+++ b/lib/library.cpp
@@ -1250,7 +1250,7 @@ bool Library::matchArguments(const Token *ftok, const std::string &functionName)
     const int callargs = numberOfArgumentsWithoutAst(ftok);
     const std::unordered_map<std::string, Function>::const_iterator it = functions.find(functionName);
     if (it == functions.cend())
-        return (callargs == 0);
+        return false;
     int args = 0;
     int firstOptionalArg = -1;
     for (const std::pair<const int, Library::ArgumentChecks> & argCheck : it->second.argumentChecks) {
diff --git a/test/testclass.cpp b/test/testclass.cpp
index 6c12a4998a7..7be1486d675 100644
--- a/test/testclass.cpp
+++ b/test/testclass.cpp
@@ -2630,6 +2630,27 @@ class TestClass : public TestFixture {
                                "    delete p;\n"
                                "}");
         ASSERT_EQUALS("[test.cpp:7]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor.\n", errout.str());
+
+        checkVirtualDestructor("using namespace std;\n"
+                               "struct A\n"
+                               "{\n"
+                               "    A()  { cout << \"A is constructing\\n\"; }\n"
+                               "    ~A() { cout << \"A is destructing\\n\"; }\n"
+                               "};\n"
+                               " \n"
+                               "struct Base {};\n"
+                               " \n"
+                               "struct Derived : Base\n"
+                               "{\n"
+                               "    A a;\n"
+                               "};\n"
+                               " \n"
+                               "int main(void)\n"
+                               "{\n"
+                               "    Base* p = new Derived();\n"
+                               "    delete p;\n"
+                               "}");
+        ASSERT_EQUALS("[test.cpp:8]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor.\n", errout.str());
     }
 
     void virtualDestructor3() {
diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
index 427194eacfe..d6475518199 100644
--- a/test/testfunctions.cpp
+++ b/test/testfunctions.cpp
@@ -1823,7 +1823,7 @@ class TestFunctions : public TestFixture {
         check("void f() {\n"
               "    lib_func();"
               "}", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:2]: (information) --check-library: There is no matching configuration for function lib_func()\n", errout.str());
 
         check("void f(void* v) {\n"
               "    lib_func(v);"

From 9f30f58f7ab50f393af8260e3a9b1ad4eb349145 Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Fri, 2 Jun 2023 12:27:45 +0200
Subject: [PATCH 2/5] Add support for missing container members

---
 cfg/std.cfg      | 16 ++++++++++++----
 test/cfg/std.cpp |  3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/cfg/std.cfg b/cfg/std.cfg
index 43e59ab4ed4..e49db0da29e 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -6609,7 +6609,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- bool empty() const; // until C++11 -->
   <!-- constexpr bool empty() const noexcept; // since C++11 until C++20 -->
   <!-- [[nodiscard]] constexpr bool empty() const noexcept; // since C++20 -->
-  <function name="std::array::empty,std::deque::empty,std::list::empty,std::forward_list::empty,std::map::empty,std::unordered_map::empty,std::queue::empty,std::set::empty,std::unordered_set::empty,std::stack::empty,std::string::empty,std::wstring::empty,std::basic_string::empty,std::vector::empty">
+  <function name="std::array::empty,std::deque::empty,std::list::empty,std::forward_list::empty,std::map::empty,std::unordered_map::empty,std::queue::empty,std::set::empty,std::unordered_set::empty,std::stack::empty,std::string::empty,std::wstring::empty,std::basic_string::empty,std::vector::empty,std::span::empty">
     <use-retval/>
     <const/>
     <returnValue type="bool"/>
@@ -6682,7 +6682,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
-  <function name="std::deque::size,std::deque::max_size,std::list::size,std::list::max_size,std::map::size,std::map::max_size,std::unordered_map::size,std::unordered_map::max_size,std::queue::size,std::set::size,std::set::max_size,std::unordered_set::size,std::unordered_set::max_size,std::stack::size,std::string::size,std::wstring::size,std::vector::size,std::vector::capacity,std::vector::max_size,std::array::size,std::array::max_size">
+  <function name="std::deque::size,std::deque::max_size,std::list::size,std::list::max_size,std::map::size,std::map::max_size,std::unordered_map::size,std::unordered_map::max_size,std::queue::size,std::set::size,std::set::max_size,std::unordered_set::size,std::unordered_set::max_size,std::stack::size,std::string::size,std::wstring::size,std::vector::size,std::vector::capacity,std::vector::max_size,std::array::size,std::array::max_size,std::span::size">
     <use-retval/>
     <const/>
     <returnValue type="std::size_t"/>
@@ -6703,11 +6703,19 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
-  <function name="std::list::back,std::list::front,std::forward_list::front,std::queue::back,std::queue::front,std::vector::back,std::vector::front,std::array::front,std::array::back,std::string::front,std::string::back,std::wstring::front,std::wstring::back,std::string_view::front,std::string_view::back,std::wstring_view::front,std::wstring_view::back">
+  <function name="std::list::back,std::list::front,std::forward_list::front,std::queue::back,std::queue::front,std::deque::back,std::deque::front,std::vector::back,std::vector::front,std::array::front,std::array::back,std::string::front,std::string::back,std::wstring::front,std::wstring::back,std::string_view::front,std::string_view::back,std::wstring_view::front,std::wstring_view::back,std::span::back,std::span::front">
     <use-retval/>
     <noreturn>false</noreturn>
   </function>
-  <function name="std::list::begin,std::list::end,std::forward_list::begin,std::forward_list::end,std::queue::begin,std::queue::end,std::deque::begin,std::deque::end,std::vector::begin,std::vector::end,std::array::begin,std::array::end,std::string::begin,std::string::end,std::wstring::begin,std::wstring::end,std::string_view::begin,std::string_view::end,std::wstring_view::begin,std::wstring_view::end,std::span::begin,std::span::end,std::set::begin,std::set::end,std::unordered_set::begin,std::unordered_set::end,std::map::begin,std::map::end,std::unordered_map::begin,std::unordered_map::end">
+  <function name="std::list::begin,std::list::end,std::forward_list::begin,std::forward_list::end,std::deque::begin,std::deque::end,std::vector::begin,std::vector::end,std::array::begin,std::array::end,std::string::begin,std::string::end,std::wstring::begin,std::wstring::end,std::string_view::begin,std::string_view::end,std::wstring_view::begin,std::wstring_view::end,std::span::begin,std::span::end,std::set::begin,std::set::end,std::unordered_set::begin,std::unordered_set::end,std::map::begin,std::map::end,std::unordered_map::begin,std::unordered_map::end">
+    <use-retval/>
+    <noreturn>false</noreturn>
+  </function>
+  <function name="std::list::cbegin,std::list::cend,std::forward_list::cbegin,std::forward_list::cend,std::deque::cbegin,std::deque::cend,std::vector::cbegin,std::vector::cend,std::array::cbegin,std::array::cend,std::string::cbegin,std::string::cend,std::wstring::cbegin,std::wstring::cend,std::string_view::cbegin,std::string_view::cend,std::wstring_view::cbegin,std::wstring_view::cend,std::span::cbegin,std::span::cend,std::set::cbegin,std::set::cend,std::unordered_set::cbegin,std::unordered_set::cend,std::map::cbegin,std::map::cend,std::unordered_map::cbegin,std::unordered_map::cend">
+    <use-retval/>
+    <noreturn>false</noreturn>
+  </function>
+  <function name="std::list::rbegin,std::list::rend,std::deque::rbegin,std::deque::rend,std::vector::rbegin,std::vector::rend,std::array::rbegin,std::array::rend,std::string::rbegin,std::string::rend,std::wstring::rbegin,std::wstring::rend,std::string_view::rbegin,std::string_view::rend,std::wstring_view::rbegin,std::wstring_view::rend,std::span::rbegin,std::span::rend,std::set::rbegin,std::set::rend,std::map::rbegin,std::map::rend">
     <use-retval/>
     <noreturn>false</noreturn>
   </function>
diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
index 7b8e6b02b84..5fcd61ed713 100644
--- a/test/cfg/std.cpp
+++ b/test/cfg/std.cpp
@@ -4634,10 +4634,11 @@ void stdspan()
     // cppcheck-suppress unreadVariable
     std::span spn2 = spn;
 
+    //cppcheck-suppress ignoredReturnValue
     spn.begin();
+    //cppcheck-suppress ignoredReturnValue
     spn.end();
     spn.rbegin();
-    spn.end();
 
     spn.front();
     spn.back();

From 89b9fe615c0acb97f81b7a0a6180f3101cdd32f7 Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Fri, 2 Jun 2023 12:53:46 +0200
Subject: [PATCH 3/5] Add more stuff

---
 cfg/std.cfg      | 20 +++++++++++++++++++-
 test/cfg/std.cpp |  5 +++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/cfg/std.cfg b/cfg/std.cfg
index e49db0da29e..9dc5e02315a 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -6682,7 +6682,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
-  <function name="std::deque::size,std::deque::max_size,std::list::size,std::list::max_size,std::map::size,std::map::max_size,std::unordered_map::size,std::unordered_map::max_size,std::queue::size,std::set::size,std::set::max_size,std::unordered_set::size,std::unordered_set::max_size,std::stack::size,std::string::size,std::wstring::size,std::vector::size,std::vector::capacity,std::vector::max_size,std::array::size,std::array::max_size,std::span::size">
+  <function name="std::deque::size,std::deque::max_size,std::list::size,std::list::max_size,std::map::size,std::map::max_size,std::unordered_map::size,std::unordered_map::max_size,std::queue::size,std::set::size,std::set::max_size,std::unordered_set::size,std::unordered_set::max_size,std::stack::size,std::string::size,std::wstring::size,std::vector::size,std::vector::capacity,std::vector::max_size,std::array::size,std::array::max_size,std::span::size,std::span::size_bytes">
     <use-retval/>
     <const/>
     <returnValue type="std::size_t"/>
@@ -6719,6 +6719,10 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <use-retval/>
     <noreturn>false</noreturn>
   </function>
+  <function name="std::list::crbegin,std::list::crend,std::deque::crbegin,std::deque::crend,std::vector::crbegin,std::vector::crend,std::array::crbegin,std::array::crend,std::string::crbegin,std::string::crend,std::wstring::crbegin,std::wstring::crend,std::string_view::crbegin,std::string_view::crend,std::wstring_view::crbegin,std::wstring_view::crend,std::span::crbegin,std::span::crend,std::set::crbegin,std::set::crend,std::map::crbegin,std::map::crend">
+    <use-retval/>
+    <noreturn>false</noreturn>
+  </function>
   <function name="std::vector::at,std::array::at,std::string::at,std::wstring::at,std::string_view::at,std::wstring_view::at">
     <use-retval/>
     <noreturn>false</noreturn>
@@ -6764,6 +6768,14 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
+  <!-- T* std::vector<T,Allocator>::data() noexcept; -->
+  <!-- const T* std::vector<T,Allocator>::data() const noexcept; -->
+  <function name="std::array::data,std::vector::data,std::span::data">
+    <use-retval/>
+    <const/>
+    <returnValue type="void *"/>
+    <noreturn>false</noreturn>
+  </function>
   <!-- https://en.cppreference.com/w/cpp/container/deque/swap -->
   <!-- void std::deque::swap( deque& other ); -->
   <!-- https://en.cppreference.com/w/cpp/container/list/swap -->
@@ -7360,6 +7372,12 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
       <not-uninit/>
     </arg>
   </function>
+  <!-- void std::ifstream::close(); -->
+  <function name="std::ifstream::close">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="void"/>
+  </function>
   <!-- void std::fstream::open(const char* filename, ios_base::openmode mode = ios_base::in | ios_base::out); -->
   <!-- void std::fstream::open(const std::string& filename, ios_base::openmode mode = ios_base::in | ios_base::out); -->
   <function name="std::fstream::open">
diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
index 5fcd61ed713..fca7be269ab 100644
--- a/test/cfg/std.cpp
+++ b/test/cfg/std.cpp
@@ -4638,15 +4638,20 @@ void stdspan()
     spn.begin();
     //cppcheck-suppress ignoredReturnValue
     spn.end();
+    //cppcheck-suppress ignoredReturnValue
     spn.rbegin();
 
+    //cppcheck-suppress ignoredReturnValue
     spn.front();
+    //cppcheck-suppress ignoredReturnValue
     spn.back();
     //cppcheck-suppress constStatement
     spn[0];
     spn.data();
+    //cppcheck-suppress ignoredReturnValue
     spn.size();
     spn.size_bytes();
+    //cppcheck-suppress ignoredReturnValue
     spn.empty();
     //cppcheck-suppress ignoredReturnValue
     spn.first(2);

From 9d749b3c0c4395fc249aeeca28ec31b6ed11c50d Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Fri, 2 Jun 2023 13:03:10 +0200
Subject: [PATCH 4/5] Improve qt.cfg

---
 cfg/qt.cfg  | 15 +++++++++++++--
 cfg/std.cfg |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index b6aa70ea7a7..0cd395ffc8b 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -885,11 +885,21 @@
     <use-retval/>
     <const/>
   </function>
+  <!-- iterator QVector::..() -->
+  <function name="QVector::begin,QVector::end,QVector::cbegin,QVector::cend,QVector::constBegin,QVector::constEnd,QVector::rbegin,QVector::rend,QVector::crbegin,QVector::crend">
+    <noreturn>false</noreturn>
+    <use-retval/>
+  </function>
   <!-- iterator QList::..() -->
   <function name="QList::begin,QList::end,QList::cbegin,QList::cend,QList::constBegin,QList::constEnd,QList::rbegin,QList::rend,QList::crbegin,QList::crend">
     <noreturn>false</noreturn>
     <use-retval/>
   </function>
+  <!-- iterator QLinkedList::..() -->
+  <function name="QLinkedList::begin,QLinkedList::end,QLinkedList::cbegin,QLinkedList::cend,QLinkedList::constBegin,QLinkedList::constEnd,QLinkedList::rbegin,QLinkedList::rend,QLinkedList::crbegin,QLinkedList::crend">
+    <noreturn>false</noreturn>
+    <use-retval/>
+  </function>
   <!-- iterator QString::..() -->
   <function name="QString::begin,QString::end,QString::cbegin,QString::cend,QString::constBegin,QString::constEnd,QString::rbegin,QString::rend,QString::crbegin,QString::crend">
     <noreturn>false</noreturn>
@@ -935,7 +945,7 @@
     </arg>
   </function>
   <!-- void QString::clear() -->
-  <function name="QList::clear,QString::clear">
+  <function name="QList::clear,QLinkedList::clear,QString::clear">
     <noreturn>false</noreturn>
   </function>
   <!-- int QString::compare(const QString &s1, const QString &s2, Qt::CaseSensitivity cs = Qt::CaseSensitive) //static -->
@@ -1132,7 +1142,8 @@
   <!-- int QStringList::count() const -->
   <!-- int QStringList::length() const -->
   <!-- int QStringList::size() const -->
-  <function name="QList::count,QList::length,QList::size,QString::count,QString::length,QString::size,QStringList::count,QStringList::length,QStringList::size">
+  <!-- int QByteArray::size() const -->
+  <function name="QList::count,QList::length,QList::size,QString::count,QString::length,QString::size,QStringList::count,QStringList::length,QStringList::size,QByteArray::size,QByteArray::length,QByteArray::count">
     <noreturn>false</noreturn>
     <use-retval/>
     <returnValue type="signed int"/>
diff --git a/cfg/std.cfg b/cfg/std.cfg
index 9dc5e02315a..96dce98b728 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -8396,7 +8396,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
   </function>
     <!-- void std::string::shrink_to_fit(void) ; (since C++11) -->
     <!-- void std::wstring::shrink_to_fit(void) ; (since C++11) -->
-  <function name="std::string::shrink_to_fit,std::wstring::shrink_to_fit">
+  <function name="std::string::shrink_to_fit,std::wstring::shrink_to_fit,std::vector::shrink_to_fit">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>

From e7b1709cbaf6db445bcd614ceb2f226dcd75b0cf Mon Sep 17 00:00:00 2001
From: chrchr <christian.riesch@live.com>
Date: Fri, 2 Jun 2023 14:47:28 +0200
Subject: [PATCH 5/5] Improve wxwidgets.cfg, qt.cfg

---
 cfg/qt.cfg         | 13 ++++++++++++-
 cfg/wxwidgets.cfg  | 20 ++++++++++++++++++--
 test/cfg/openssl.c |  1 +
 test/cfg/qt.cpp    |  1 +
 test/cfg/std.cpp   |  3 +++
 5 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index 0cd395ffc8b..b7c29297ddc 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -910,6 +910,11 @@
     <noreturn>false</noreturn>
     <use-retval/>
   </function>
+  <!-- iterator QStack::..() -->
+  <function name="QStack::begin,QStack::end,QStack::cbegin,QStack::cend,QStack::constBegin,QStack::constEnd,QStack::rbegin,QStack::rend,QStack::crbegin,QStack::crend">
+    <noreturn>false</noreturn>
+    <use-retval/>
+  </function>
   <!-- QStandardItem *QStandardItem::child(int row, int column = 0) const -->
   <function name="QStandardItem::child">
     <noreturn>false</noreturn>
@@ -4086,10 +4091,16 @@
   </function>
   <!-- T *QVector::data() -->
   <!-- const T *QVector::data() const -->
-  <function name="QVector::data,QStack::data">
+  <function name="QVector::data,QStack::data,QByteArray::data">
     <noreturn>false</noreturn>
     <use-retval/>
   </function>
+  <!-- const T *QVector::constData() const -->
+  <function name="QVector::constData,QStack::constData,QByteArray::constData">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <const/>
+  </function>
   <!-- bool QVector::empty() const -->
   <function name="QVector::empty,QStack::empty">
     <noreturn>false</noreturn>
diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index 3723bd360e1..b8f825088d2 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -5485,7 +5485,7 @@
   <!-- http://docs.wxwidgets.org/trunk/classwx_string.html#ab20a87ca731a52c36ec674dae2213ad8 -->
   <!-- size_t wxString::Len () const -->
   <!-- size_t wxString::length () const -->
-  <function name="wxString::Len,wxString::length">
+  <function name="wxString::Len,wxString::length,wxString::size">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <const/>
@@ -8953,6 +8953,22 @@
       <not-bool/>
     </arg>
   </function>
+  <!-- void wxString::Clear () -->
+  <function name="wxString::Clear">
+    <noreturn>false</noreturn>
+    <returnValue type="void"/>
+  </function>
+  <!-- void wxString::c_str () -->
+  <function name="wxString::c_str">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <const/>
+    <returnValue type="const char*"/>
+  </function>
+  <function name="wxString::begin,wxString::end">
+    <use-retval/>  
+    <noreturn>false</noreturn>
+  </function>
   <!-- void wxBitmap::SetMask( wxMask * mask ) -->
   <function name="wxBitmap::SetMask">
     <noreturn>false</noreturn>
@@ -14219,7 +14235,7 @@ wxItemKind kind = wxITEM_NORMAL) -->
     <arg nr="2" direction="in" default="0">
       <not-uninit/>
     </arg>
-    <arg nr="3" direction="in" default="std::wxString::npos">
+    <arg nr="3" direction="in" default="wxString::npos">
       <not-uninit/>
     </arg>
   </function>
diff --git a/test/cfg/openssl.c b/test/cfg/openssl.c
index 9c12cd37100..99b467cd1ca 100644
--- a/test/cfg/openssl.c
+++ b/test/cfg/openssl.c
@@ -28,6 +28,7 @@ int valid_code_do_crypt(char *outfile)
     FILE *out;
 
     ctx = EVP_CIPHER_CTX_new();
+    // cppcheck-suppress checkLibraryFunction
     EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key, iv);
 
     if (!EVP_EncryptUpdate(ctx, outbuf, &outlen, intext, strlen(intext))) {
diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
index eeeb1659daa..584d1015a38 100644
--- a/test/cfg/qt.cpp
+++ b/test/cfg/qt.cpp
@@ -441,6 +441,7 @@ void validCode(int * pIntPtr, QString & qstrArg, double d)
 
     printf(QT_TR_NOOP("Hi"));
 
+    // cppcheck-suppress checkLibraryFunction
     Q_DECLARE_LOGGING_CATEGORY(logging_category_test);
     QT_FORWARD_DECLARE_CLASS(forwardDeclaredClass);
     QT_FORWARD_DECLARE_STRUCT(forwardDeclaredStruct);
diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
index fca7be269ab..c7210bd0d9d 100644
--- a/test/cfg/std.cpp
+++ b/test/cfg/std.cpp
@@ -4489,6 +4489,7 @@ void getline()
     in.close();
 }
 
+// cppcheck-suppress passedByValue
 void stream_write(std::ofstream& s, std::vector<char> v) {
     if (v.empty()) {}
     s.write(v.data(), v.size());
@@ -4647,9 +4648,11 @@ void stdspan()
     spn.back();
     //cppcheck-suppress constStatement
     spn[0];
+    //cppcheck-suppress ignoredReturnValue
     spn.data();
     //cppcheck-suppress ignoredReturnValue
     spn.size();
+    //cppcheck-suppress ignoredReturnValue
     spn.size_bytes();
     //cppcheck-suppress ignoredReturnValue
     spn.empty();