Fix 'make checkcfg' by adding inline suppressions when obsolete functions are used.

danmar · danmar · commit e8182395f771 · 2015-11-22T17:52:47.000+01:00
diff --git a/test/cfg/posix.c b/test/cfg/posix.c
@@ -51,8 +51,10 @@ void nullPointer(char *p)
     mkdir(p, 0);
     getcwd(0, 0);
     // cppcheck-suppress nullPointer
+    // cppcheck-suppress readdirCalled
     readdir(0);
     // cppcheck-suppress nullPointer
+    // cppcheck-suppress utimeCalled
     utime(NULL, NULL);
 }
 
@@ -135,10 +137,14 @@ void ignoredReturnValue(void *addr, int fd)
 void invalidFunctionArg()
 {
     // cppcheck-suppress invalidFunctionArg
+    // cppcheck-suppress usleepCalled
     usleep(-1);
+    // cppcheck-suppress usleepCalled
     usleep(0);
+    // cppcheck-suppress usleepCalled
     usleep(999999);
     // cppcheck-suppress invalidFunctionArg
+    // cppcheck-suppress usleepCalled
     usleep(1000000);
 }
 
@@ -171,15 +177,19 @@ void uninitvar(int fd)
     regerror(0, &reg, 0, 0);
     // cppcheck-suppress uninitvar
     // cppcheck-suppress unreadVariable
+    // cppcheck-suppress ecvtCalled
     char *buffer = ecvt(d, 11, &decimal, &sign);
+    // cppcheck-suppress gcvtCalled
     gcvt(3.141, 2, buf);
 
     char *filename;
     struct utimbuf *times;
     // cppcheck-suppress uninitvar
+    // cppcheck-suppress utimeCalled
     utime(filename, times);
     struct timeval times1[2];
     // cppcheck-suppress uninitvar
+    // cppcheck-suppress utimeCalled
     utime(filename, times1);
 }
 
@@ -211,9 +221,11 @@ void timet_h(struct timespec* ptp1)
     // cppcheck-suppress uninitvar
     clock_settime(CLOCK_REALTIME, &tp); // #6577 - false negative
     // cppcheck-suppress uninitvar
+    // cppcheck-suppress clock_settimeCalled
     clock_settime(clk_id, &tp);
 
     time_t clock = time(0);
     char buf[26];
+    // cppcheck-suppress ctime_rCalled
     ctime_r(&clock, buf);
 }
diff --git a/test/cfg/std.c b/test/cfg/std.c
@@ -424,7 +424,7 @@ void uninitvar_asctime(void)
 {
     const struct tm *tm;
     // cppcheck-suppress uninitvar
-    // cppcheck-suppress obsoleteFunctionsasctime
+    // cppcheck-suppress asctimeCalled
     (void)asctime(tm);
 }
 
@@ -1636,7 +1636,7 @@ void uninitvar_getenv(void)
 void uninitvar_gets(void)
 {
     char *buffer;
-    // cppcheck-suppress obsoleteFunctionsgets
+    // cppcheck-suppress getsCalled
     // cppcheck-suppress uninitvar
     (void)gets(buffer);
 }
@@ -2394,7 +2394,7 @@ void uninitvar_malloc(void)
 void uninitvar_alloca(void)
 {
     size_t size;
-    // cppcheck-suppress obsoleteFunctionsalloca
+    // cppcheck-suppress allocaCalled
     // cppcheck-suppress uninitvar
     (void)alloca(size);
 }
@@ -3585,10 +3585,10 @@ void ignoredReturnValue_abs(int i)
 void nullPointer_asctime(void)
 {
     struct tm *tm = 0;
-    // cppcheck-suppress obsoleteFunctionsasctime
+    // cppcheck-suppress asctimeCalled
     // cppcheck-suppress nullPointer
     (void)asctime(tm);
-    // cppcheck-suppress obsoleteFunctionsasctime
+    // cppcheck-suppress asctimeCalled
     // cppcheck-suppress nullPointer
     (void)asctime(0);
 }
diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
@@ -166,7 +166,7 @@ void uninitvar_asctime(void)
 {
     const struct tm *tm;
     // cppcheck-suppress uninitvar
-    // cppcheck-suppress obsoleteFunctionsasctime
+    // cppcheck-suppress asctimeCalled
     (void)std::asctime(tm);
 }
 
@@ -3018,10 +3018,10 @@ void ignoredReturnValue_abs(int i)
 void nullPointer_asctime(void)
 {
     struct tm *tm = 0;
-    // cppcheck-suppress obsoleteFunctionsasctime
+    // cppcheck-suppress asctimeCalled
     // cppcheck-suppress nullPointer
     (void)std::asctime(tm);
-    // cppcheck-suppress obsoleteFunctionsasctime
+    // cppcheck-suppress asctimeCalled
     // cppcheck-suppress nullPointer
     (void)std::asctime(0);
 }

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ void uninitvar_asctime(void)`
`424`	`424`	`{`
`425`	`425`	`const struct tm *tm;`
`426`	`426`	`// cppcheck-suppress uninitvar`
`427`		`- // cppcheck-suppress obsoleteFunctionsasctime`
	`427`	`+ // cppcheck-suppress asctimeCalled`
`428`	`428`	`(void)asctime(tm);`
`429`	`429`	`}`
`430`	`430`
`@@ -1636,7 +1636,7 @@ void uninitvar_getenv(void)`
`1636`	`1636`	`void uninitvar_gets(void)`
`1637`	`1637`	`{`
`1638`	`1638`	`char *buffer;`
`1639`		`- // cppcheck-suppress obsoleteFunctionsgets`
	`1639`	`+ // cppcheck-suppress getsCalled`
`1640`	`1640`	`// cppcheck-suppress uninitvar`
`1641`	`1641`	`(void)gets(buffer);`
`1642`	`1642`	`}`
`@@ -2394,7 +2394,7 @@ void uninitvar_malloc(void)`
`2394`	`2394`	`void uninitvar_alloca(void)`
`2395`	`2395`	`{`
`2396`	`2396`	`size_t size;`
`2397`		`- // cppcheck-suppress obsoleteFunctionsalloca`
	`2397`	`+ // cppcheck-suppress allocaCalled`
`2398`	`2398`	`// cppcheck-suppress uninitvar`
`2399`	`2399`	`(void)alloca(size);`
`2400`	`2400`	`}`
`@@ -3585,10 +3585,10 @@ void ignoredReturnValue_abs(int i)`
`3585`	`3585`	`void nullPointer_asctime(void)`
`3586`	`3586`	`{`
`3587`	`3587`	`struct tm *tm = 0;`
`3588`		`- // cppcheck-suppress obsoleteFunctionsasctime`
	`3588`	`+ // cppcheck-suppress asctimeCalled`
`3589`	`3589`	`// cppcheck-suppress nullPointer`
`3590`	`3590`	`(void)asctime(tm);`
`3591`		`- // cppcheck-suppress obsoleteFunctionsasctime`
	`3591`	`+ // cppcheck-suppress asctimeCalled`
`3592`	`3592`	`// cppcheck-suppress nullPointer`
`3593`	`3593`	`(void)asctime(0);`
`3594`	`3594`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ void uninitvar_asctime(void)`
`166`	`166`	`{`
`167`	`167`	`const struct tm *tm;`
`168`	`168`	`// cppcheck-suppress uninitvar`
`169`		`- // cppcheck-suppress obsoleteFunctionsasctime`
	`169`	`+ // cppcheck-suppress asctimeCalled`
`170`	`170`	`(void)std::asctime(tm);`
`171`	`171`	`}`
`172`	`172`
`@@ -3018,10 +3018,10 @@ void ignoredReturnValue_abs(int i)`
`3018`	`3018`	`void nullPointer_asctime(void)`
`3019`	`3019`	`{`
`3020`	`3020`	`struct tm *tm = 0;`
`3021`		`- // cppcheck-suppress obsoleteFunctionsasctime`
	`3021`	`+ // cppcheck-suppress asctimeCalled`
`3022`	`3022`	`// cppcheck-suppress nullPointer`
`3023`	`3023`	`(void)std::asctime(tm);`
`3024`		`- // cppcheck-suppress obsoleteFunctionsasctime`
	`3024`	`+ // cppcheck-suppress asctimeCalled`
`3025`	`3025`	`// cppcheck-suppress nullPointer`
`3026`	`3026`	`(void)std::asctime(0);`
`3027`	`3027`	`}`