From 55ae961ac28a1951b4c10c21258c866bd86d74a2 Mon Sep 17 00:00:00 2001
From: orbitcowboy <orbitcowboy@web.de>
Date: Sat, 26 Nov 2016 21:31:15 +0100
Subject: [PATCH] std.cfg and windows.cfg: Improved support for <use-retval/>
 for functions like ftell(), [f]get[w]c().

---
 cfg/std.cfg     | 4 ++++
 cfg/windows.cfg | 7 +++++--
 test/cfg/std.c  | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/cfg/std.cfg b/cfg/std.cfg
index d6e173262..743ca2eac 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -832,6 +832,7 @@
   <function name="fgetc,std::fgetc">
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <use-retval/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -841,6 +842,7 @@
   <function name="fgetwc,std::fgetwc">
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <use-retval/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -1408,6 +1410,7 @@
   <function name="getc,std::getc">
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <use-retval/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -1417,6 +1420,7 @@
   <function name="getwc,std::getwc">
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <use-retval/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index a3571b237..6f6d8b75a 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -2095,10 +2095,13 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
-  <!-- __int64 _ftelli64(FILE *stream); -->
-  <function name="_ftelli64">
+  <!-- __int64 _ftelli64(FILE *stream); 
+         long _ftell_nolock(FILE *stream);  
+       __int64 _ftelli64_nolock(FILE *stream); -->
+  <function name="_ftelli64,_ftell_nolock,_ftelli64_nolock">
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <use-retval/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
diff --git a/test/cfg/std.c b/test/cfg/std.c
index d774ab5ce..0fea8bef0 100644
--- a/test/cfg/std.c
+++ b/test/cfg/std.c
@@ -78,7 +78,7 @@ void nullpointer(int value)
     // cppcheck-suppress nullPointer
     feof(0);
     // cppcheck-suppress nullPointer
-    fgetc(0);
+    (void)fgetc(0);
     // cppcheck-suppress nullPointer
     fclose(0);
     // cppcheck-suppress ignoredReturnValue
@@ -265,7 +265,7 @@ void uninit_fgetc(void)
 {
     FILE *fp;
     // cppcheck-suppress uninitvar
-    fgetc(fp);
+    (void)fgetc(fp);
 }
 
 void uninit_fgetpos(void)