Merge

danmar · Apr 27, 2024 · 2c8c2fa · 2c8c2fa
2 parents 18082bc + fae65de
commit 2c8c2fa
Show file tree

Hide file tree

Showing 59 changed files with 739 additions and 578 deletions.
diff --git a/Makefile b/Makefile
@@ -583,7 +583,7 @@ $(libcppdir)/errortypes.o: lib/errortypes.cpp lib/config.h lib/errortypes.h lib/
 $(libcppdir)/forwardanalyzer.o: lib/forwardanalyzer.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/forwardanalyzer.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueptr.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/forwardanalyzer.cpp
 
-$(libcppdir)/fwdanalysis.o: lib/fwdanalysis.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/fwdanalysis.o: lib/fwdanalysis.cpp lib/addoninfo.h lib/astutils.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/fwdanalysis.cpp
 
 $(libcppdir)/importproject.o: lib/importproject.cpp externals/picojson/picojson.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/config.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
@@ -862,7 +862,7 @@ test/testtoken.o: test/testtoken.cpp lib/addoninfo.h lib/check.h lib/color.h lib
 test/testtokenize.o: test/testtokenize.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtokenize.cpp
 
-test/testtokenlist.o: test/testtokenlist.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testtokenlist.o: test/testtokenlist.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtokenlist.cpp
 
 test/testtokenrange.o: test/testtokenrange.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/tokenrange.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h

diff --git a/cfg/cppcheck-cfg.rng b/cfg/cppcheck-cfg.rng
@@ -122,7 +122,7 @@
                 </attribute>
               </optional>
               <empty/>
-            </element>            
+            </element>
           </optional>
           <optional>
             <element name="pure"><empty/></element>
@@ -194,6 +194,9 @@
               <optional>
                 <attribute name="strlen-arg"><data type="positiveInteger"/></attribute>
               </optional>
+              <optional>
+                <attribute name="count-arg"><data type="positiveInteger"/></attribute>
+              </optional>
               <empty/>
             </element>
           </optional>
@@ -573,7 +576,7 @@
                 </element>
               </choice>
             </zeroOrMore>
-          </element>          
+          </element>
         </optional>
       </element>
 
@@ -651,7 +654,7 @@
       <param name="maxInclusive">2</param>
     </data>
   </define>
-  
+
   <define name="ARG-DIRECTION">
     <choice>
       <value>in</value>
@@ -720,7 +723,7 @@
       <value>empty</value>
     </choice>
   </define>
-  
+
   <define name="MINSIZE-VALUE">
     <data type="unsignedLong">
       <param name="minInclusive">1</param>

diff --git a/cfg/posix.cfg b/cfg/posix.cfg
@@ -5631,7 +5631,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <returnValue type="wchar_t *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" size-arg="3"/>
+    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" count-arg="3"/>
     <arg nr="1" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="3" baseType="wchar_t"/>

diff --git a/cfg/std.cfg b/cfg/std.cfg
@@ -68,6 +68,13 @@
   <function name="abort,std::abort,std::terminate">
     <noreturn>true</noreturn>
   </function>
+  <!--              void unexpected(); (until C++11)          -->
+  <!-- [[noreturn]] void unexpected(); (since C++11)          --> 
+  <!-- (deprecated)(removed in C++17)                         -->
+  <function name="std::unexpected">
+    <noreturn>true</noreturn>
+    <warn severity="style" alternatives="std::terminate" reason="Obsolete"/>
+  </function>
   <!-- int abs(int j); -->
   <function name="abs,std::abs">
     <use-retval/>
@@ -3951,12 +3958,12 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <valid>0:</valid>
     </arg>
   </function>
-  <!-- wchar_t * wmemcpy(wchar_t *ct, const wchar_t *cs, size_t n);-->
+  <!-- wchar_t* wmemcpy( wchar_t* dest, const wchar_t* src, std::size_t count ); -->
   <function name="wmemcpy,std::wmemcpy">
     <returnValue type="wchar_t *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" size-arg="3"/>
+    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" count-arg="3"/>
     <arg nr="1" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
@@ -5071,7 +5078,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <noreturn>false</noreturn>
     <returnValue type="wchar_t *"/>
     <leak-ignore/>
-    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" size-arg="3"/>
+    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" count-arg="3"/>
     <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
@@ -5318,7 +5325,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="wchar_t *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" size-arg="3"/>
+    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" count-arg="3"/>
     <arg nr="1">
       <not-null/>
       <minsize type="argvalue" arg="3" baseType="wchar_t"/>