From f24fdb42576a5c7857997906c887db3b4c62d96a Mon Sep 17 00:00:00 2001
From: orbitcowboy <ettl.martin78@gmail.com>
Date: Mon, 31 Aug 2015 17:10:10 +0200
Subject: [PATCH] Improved testing of std.cfg.

---
 cfg/std.cfg      |  6 +++++-
 test/cfg/std.c   | 17 ++++++++++++++++-
 test/cfg/std.cpp |  9 +++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/cfg/std.cfg b/cfg/std.cfg
index 761a6591f..cd5f60f75 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -941,6 +941,7 @@
     <formatstr/>
     <arg nr="2">
       <formatstr/>
+      <not-uninit/>
     </arg>
     <arg nr="any">
       <not-uninit/>
@@ -957,6 +958,7 @@
     <formatstr/>
     <arg nr="2">
       <formatstr/>
+      <not-uninit/>
     </arg>
     <arg nr="any">
       <not-uninit/>
@@ -973,6 +975,7 @@
     <formatstr/>
     <arg nr="2">
       <formatstr/>
+      <not-uninit/>
     </arg>
     <arg nr="any">
       <not-uninit/>
@@ -1103,7 +1106,7 @@
     </arg>
   </function>
   <!-- int fscanf(FILE *stream, const char *format, ...); -->
-  <function name="fscanf">
+  <function name="fscanf,std::fscanf">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -1112,6 +1115,7 @@
     <formatstr scan="true"/>
     <arg nr="2">
       <formatstr/>
+      <not-uninit/>
     </arg>
   </function>
   <!-- int vfscanf(FILE *stream, const char * format, va_list arg); -->
diff --git a/test/cfg/std.c b/test/cfg/std.c
index d1092d5da..54662c5d8 100644
--- a/test/cfg/std.c
+++ b/test/cfg/std.c
@@ -1254,7 +1254,7 @@ void uninitar_vfprintf(void)
     (void)vfprintf(stream, format, arg);
 }
 
-void uninitar_vfwprintf(void)
+void uninitar_vfwprintf(FILE *s, wchar_t *f, va_list a)
 {
     FILE *stream;
     wchar_t *format;
@@ -1262,6 +1262,12 @@ void uninitar_vfwprintf(void)
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
     (void)vfwprintf(stream, format, arg);
+    // cppcheck-suppress uninitvar
+    (void)vfwprintf(s, format, a);
+    // cppcheck-suppress uninitvar
+    (void)vfwprintf(stream, f, a);
+    // no warning is expected
+    (void)vfwprintf(s, f, a);
 }
 
 void uninitvar_fputc(void)
@@ -1357,6 +1363,15 @@ void uninitvar_hypot(void)
     (void)hypotl(ld1,ld2);
 }
 
+void uninitvar_fscanf(void)
+{
+    FILE *stream;
+    char *format;
+    int i;
+    // cppcheck-suppress uninitvar
+    (void)fscanf(stream,format,i);
+}
+
 void ignoreretrn(void)
 {
     char szNumbers[] = "2001 60c0c0 -1101110100110100100000 0x6fffff";
diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
index 6f39bb80d..96ab6feca 100644
--- a/test/cfg/std.cpp
+++ b/test/cfg/std.cpp
@@ -879,3 +879,12 @@ void uninitvar_hypot(void)
     // cppcheck-suppress uninitvar
     (void)std::hypot(ld1,ld2);
 }
+
+void uninitvar_fscanf(void)
+{
+    FILE *stream;
+    char *format;
+    int i;
+    // cppcheck-suppress uninitvar
+    (void)std::fscanf(stream,format,i);
+}