Commit 8c0a6dc9 authored Aug 28, 2017 by Philippe Mathieu-Daudé Committed by Daniel P. Berrangé Sep 04, 2017

tests: fix incorrect size_t format in benchmark-crypto



  $ make check-speed
  tests/benchmark-crypto-hash.c: In function 'test_hash_speed':
  tests/benchmark-crypto-hash.c:44:5: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'size_t' [-Werror=format=]
       g_print("Testing chunk_size %ld bytes ", chunk_size);
       ^
  tests/benchmark-crypto-hash.c: In function 'main':
  tests/benchmark-crypto-hash.c:62:9: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'size_t' [-Werror=format=]
           snprintf(name, sizeof(name), "/crypto/hash/speed-%lu", i);
           ^
  cc1: all warnings being treated as errors
  rules.mak:66: recipe for target 'tests/benchmark-crypto-hash.o' failed
  make: *** [tests/benchmark-crypto-hash.o] Error 1

Reviewed-by: Longpeng(Mike) <longpeng@huawei.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

parent 32f0f68b

tests/benchmark-crypto-cipher.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ static void test_cipher_speed(const void *opaque)
		total /= 1024 * 1024; /* to MB */

		g_print("cbc(aes128): ");
		g_print("Testing chunk_size %ld bytes ", chunk_size);
		g_print("Testing chunk_size %zu bytes ", chunk_size);
		g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
		g_print("%.2f MB/sec\n", total / g_test_timer_last());

		@@ -80,7 +80,7 @@ int main(int argc, char **argv)

		for (i = 512; i <= (64 * 1204); i *= 2) {
		memset(name, 0 , sizeof(name));
		snprintf(name, sizeof(name), "/crypto/cipher/speed-%lu", i);
		snprintf(name, sizeof(name), "/crypto/cipher/speed-%zu", i);
		g_test_add_data_func(name, (void *)i, test_cipher_speed);
		}

tests/benchmark-crypto-hash.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ static void test_hash_speed(const void *opaque)

		total /= 1024 * 1024; /* to MB */
		g_print("sha256: ");
		g_print("Testing chunk_size %ld bytes ", chunk_size);
		g_print("Testing chunk_size %zu bytes ", chunk_size);
		g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
		g_print("%.2f MB/sec\n", total / g_test_timer_last());

		@@ -59,7 +59,7 @@ int main(int argc, char **argv)

		for (i = 512; i <= (64 * 1204); i *= 2) {
		memset(name, 0 , sizeof(name));
		snprintf(name, sizeof(name), "/crypto/hash/speed-%lu", i);
		snprintf(name, sizeof(name), "/crypto/hash/speed-%zu", i);
		g_test_add_data_func(name, (void *)i, test_hash_speed);
		}

tests/benchmark-crypto-hmac.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ static void test_hmac_speed(const void *opaque)
		total /= 1024 * 1024; /* to MB */

		g_print("hmac(sha256): ");
		g_print("Testing chunk_size %ld bytes ", chunk_size);
		g_print("Testing chunk_size %zu bytes ", chunk_size);
		g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
		g_print("%.2f MB/sec\n", total / g_test_timer_last());

		@@ -74,7 +74,7 @@ int main(int argc, char **argv)

		for (i = 512; i <= (64 * 1204); i *= 2) {
		memset(name, 0 , sizeof(name));
		snprintf(name, sizeof(name), "/crypto/hmac/speed-%lu", i);
		snprintf(name, sizeof(name), "/crypto/hmac/speed-%zu", i);
		g_test_add_data_func(name, (void *)i, test_hmac_speed);
		}