diff options
| author | Marian Klymov <nekto1989@gmail.com> | 2018-06-02 23:52:56 +0300 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-06-11 11:14:48 +0200 |
| commit | c45360d4633850839bb9c2d77dbf8a8285e9ad49 (patch) | |
| tree | 20159c553a74ed98c2431fc8f2852067f79ac4e9 /tests/unit | |
| parent | 38203f1585da53e07e54e37c7d5da4d72f509a2e (diff) | |
cppcheck: fix warnings
- Get rid of variable that was generating false positive warning
(unitialized)
- Fix issues in tests
- Reduce scope of several variables all over
etc
Closes #2631
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/unit1300.c | 2 | ||||
| -rw-r--r-- | tests/unit/unit1303.c | 2 | ||||
| -rw-r--r-- | tests/unit/unit1307.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/unit/unit1300.c b/tests/unit/unit1300.c index c64fadef9..6030db0d2 100644 --- a/tests/unit/unit1300.c +++ b/tests/unit/unit1300.c @@ -264,7 +264,7 @@ UNITTEST_START fail_unless(llist_destination.tail != NULL, "llist_destination tail set to null after moving an element"); - fail_unless(llist_destination.tail == llist_destination.tail, + fail_unless(llist_destination.tail == llist_destination.head, "llist_destination tail doesn't equal llist_destination head"); } UNITTEST_STOP diff --git a/tests/unit/unit1303.c b/tests/unit/unit1303.c index 75a8e59c2..b065683a6 100644 --- a/tests/unit/unit1303.c +++ b/tests/unit/unit1303.c @@ -75,7 +75,6 @@ struct timetest { UNITTEST_START { struct curltime now; - time_t timeout; unsigned int i; const struct timetest run[] = { @@ -139,6 +138,7 @@ UNITTEST_START data->progress.t_startop.tv_usec = 0; for(i = 0; i < sizeof(run)/sizeof(run[0]); i++) { + time_t timeout; NOW(run[i].now_s, run[i].now_us); TIMEOUTS(run[i].timeout_ms, run[i].connecttimeout_ms); timeout = Curl_timeleft(data, &now, run[i].connecting); diff --git a/tests/unit/unit1307.c b/tests/unit/unit1307.c index 22afa4bf2..d6664ff69 100644 --- a/tests/unit/unit1307.c +++ b/tests/unit/unit1307.c @@ -272,7 +272,7 @@ enum system { UNITTEST_START { int testnum = sizeof(tests) / sizeof(struct testcase); - int i, rc; + int i; enum system machine; #ifdef HAVE_FNMATCH @@ -290,7 +290,7 @@ UNITTEST_START for(i = 0; i < testnum; i++) { int result = tests[i].result; - rc = Curl_fnmatch(NULL, tests[i].pattern, tests[i].string); + int rc = Curl_fnmatch(NULL, tests[i].pattern, tests[i].string); if(result & (LINUX_DIFFER|MAC_DIFFER)) { if((result & LINUX_DIFFER) && (machine == SYSTEM_LINUX)) result >>= LINUX_SHIFT; |