diff options
author | Szczepan Zalega <szczepan@nitrokey.com> | 2018-04-19 12:11:55 +0200 |
---|---|---|
committer | Szczepan Zalega <szczepan@nitrokey.com> | 2018-04-19 12:11:55 +0200 |
commit | e71601bdc6e1df905aca36baa6e8e85096397f80 (patch) | |
tree | 6fdeea27d6b55e713554216b00b6922d3451a504 /unittest | |
parent | 5b36f06f49c88fb1921da18f54524081729cb4d5 (diff) | |
parent | bc4e9c7bcfd7d7b3f62b23e583ef216a05975e80 (diff) | |
download | libnitrokey-e71601bdc6e1df905aca36baa6e8e85096397f80.tar.gz libnitrokey-e71601bdc6e1df905aca36baa6e8e85096397f80.tar.bz2 |
Merge branch '97-compilation_warnings'
Diffstat (limited to 'unittest')
-rw-r--r-- | unittest/test1.cc (renamed from unittest/test.cc) | 0 | ||||
-rw-r--r-- | unittest/test_C_API.cpp | 2 | ||||
-rw-r--r-- | unittest/test_HOTP.cc | 2 | ||||
-rw-r--r-- | unittest/test_offline.cc | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/unittest/test.cc b/unittest/test1.cc index 51a2ef6..51a2ef6 100644 --- a/unittest/test.cc +++ b/unittest/test1.cc diff --git a/unittest/test_C_API.cpp b/unittest/test_C_API.cpp index 2d83ef4..acfadd2 100644 --- a/unittest/test_C_API.cpp +++ b/unittest/test_C_API.cpp @@ -74,7 +74,7 @@ TEST_CASE("multiple devices with ID", "[BASIC]") { int t; string = strndup(s, 4096); - free ( (void*) s); + free (static_cast<void*>(const_cast<char*>(s))); while ((token = strsep(&string, ";")) != nullptr){ if (strnlen(token, 4096) < 3) continue; diff --git a/unittest/test_HOTP.cc b/unittest/test_HOTP.cc index c13fb8e..b11cf25 100644 --- a/unittest/test_HOTP.cc +++ b/unittest/test_HOTP.cc @@ -38,7 +38,7 @@ void hexStringToByte(uint8_t data[], const char* hexString){ REQUIRE(strlen(hexString)%2==0); char buf[3]; buf[2] = '\0'; - for(int i=0; i<strlen(hexString); i++){ + for(size_t i=0; i<strlen(hexString); i++){ buf[i%2] = hexString[i]; if (i%2==1){ data[i/2] = strtoul(buf, NULL, 16) & 0xFF; diff --git a/unittest/test_offline.cc b/unittest/test_offline.cc index 3ef63d2..468849e 100644 --- a/unittest/test_offline.cc +++ b/unittest/test_offline.cc @@ -113,7 +113,7 @@ TEST_CASE("Test helper function - hex_string_to_byte", "[fast]") { REQUIRE_NOTHROW(v = hex_string_to_byte("00112233445566")); const uint8_t test_data[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66}; REQUIRE(v.size() == sizeof(test_data)); - for (int i = 0; i < v.size(); ++i) { + for (size_t i = 0; i < v.size(); ++i) { INFO("Position i: " << i); REQUIRE(v[i] == test_data[i]); } |