From 434b506e581cbe43d1a9d5bed8ad1d58caeaeb27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Tue, 14 Jan 2020 10:28:05 +0100 Subject: [PATCH] testsuites/danmar-verify: fix syntax errors --- test/testsuites/danmar-verify/divbyzero.cpp | 28 +++++++++++++-------- test/testsuites/danmar-verify/uninit.c | 8 +++--- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/test/testsuites/danmar-verify/divbyzero.cpp b/test/testsuites/danmar-verify/divbyzero.cpp index 10e0657fc..ffd7b7bb4 100644 --- a/test/testsuites/danmar-verify/divbyzero.cpp +++ b/test/testsuites/danmar-verify/divbyzero.cpp @@ -1,6 +1,8 @@ // make USE_Z3=yes // ./cppcheck --verify --inline-suppr --enable=information test/testsuites/danmar-verify/divbyzero.cpp +#include +#include struct S { int x; }; @@ -8,61 +10,65 @@ int globalvar; void dostuff(); -void callfunc1() { +int callfunc1() { int x = 16; scanf("%i\n", &x); // cppcheck-suppress verificationDivByZero return 100000 / x; } -void float1(float f) { +int float1(float f) { // cppcheck-suppress verificationDivByZero return 100000 / (int)f; } -void float2(float f) { +float float2(float f) { // cppcheck-suppress verificationDivByZeroFloat return 100000 / f; } -void functionCall() { +int functionCall() { +#ifdef __clang__ + return 0; +#else // cppcheck-suppress verificationDivByZero return 100000 / unknown_function(); +#endif } -void globalVar1() { +int globalVar1() { // cppcheck-suppress verificationDivByZero return 100000 / globalvar; } -void globalVar1() { +int globalVar2() { globalvar = 123; dostuff(); // cppcheck-suppress verificationDivByZero return 100000 / globalvar; } -void pointer1(int *p) { +int pointer1(int *p) { // cppcheck-suppress verificationDivByZero return 100000 / *p; } -void pointer2(int *p) { +int pointer2(int *p) { // cppcheck-suppress verificationDivByZero return 100000 / p[32]; } -void stdmap(std::map &data) { +int stdmap(std::map &data) { // cppcheck-suppress verificationDivByZero return 100000 / data[43]; } -void struct1(struct S *s) { +int struct1(struct S *s) { // cppcheck-suppress verificationDivByZero return 100000 / s->x; } -void trycatch() { +int trycatch() { int x = 0; try { dostuff(); diff --git a/test/testsuites/danmar-verify/uninit.c b/test/testsuites/danmar-verify/uninit.c index 3eeadd528..ba3178099 100644 --- a/test/testsuites/danmar-verify/uninit.c +++ b/test/testsuites/danmar-verify/uninit.c @@ -2,6 +2,8 @@ // make USE_Z3=yes // ./cppcheck --verify --inline-suppr --enable=information test/testsuites/danmar-verify/uninit.c +#include + int array1() { int a[10]; a[0] = 0; @@ -16,7 +18,7 @@ int array2() { return a[2][3]; } -void local1() { +int local1() { int x; // cppcheck-suppress verificationUninit // cppcheck-suppress uninitvar @@ -28,8 +30,8 @@ int pointer1(int *p) { return *p; } -void pointer2(char *p) { +int pointer2(char *p) { // cppcheck-suppress verificationUninitArg - strlen(p); + return strlen(p); }