tests: eliminated build warnings

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

5 files changed, 8 insertions, 11 deletions

diff --git a/devel/fuzz/gnutls_client_fuzzer.cc b/devel/fuzz/gnutls_client_fuzzer.cc
index 5a198ce9ea..7719502230 100644
--- a/devel/fuzz/gnutls_client_fuzzer.cc
+++ b/devel/fuzz/gnutls_client_fuzzer.cc
@@ -38,7 +38,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     res = socketpair(AF_UNIX, SOCK_STREAM, 0, socket_fds);
     assert(res >= 0);
     ssize_t send_res = send(socket_fds[1], data, size, 0);
-    assert(send_res == size);
+    assert((size_t)send_res == size);
     res = shutdown(socket_fds[1], SHUT_WR);
     assert(res == 0);
 
diff --git a/devel/fuzz/gnutls_server_fuzzer.cc b/devel/fuzz/gnutls_server_fuzzer.cc
index 1d1f87d195..546ab14b15 100644
--- a/devel/fuzz/gnutls_server_fuzzer.cc
+++ b/devel/fuzz/gnutls_server_fuzzer.cc
@@ -208,7 +208,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
     res = socketpair(AF_UNIX, SOCK_STREAM, 0, socket_fds);
     assert(res >= 0);
     ssize_t send_res = send(socket_fds[1], data, size, 0);
-    assert(send_res == size);
+    assert((size_t)send_res == size);
     res = shutdown(socket_fds[1], SHUT_WR);
     assert(res == 0);
 
diff --git a/lib/x509/ip-in-cidr.h b/lib/x509/ip-in-cidr.h
index 7613de9c09..86fd8e50e4 100644
--- a/lib/x509/ip-in-cidr.h
+++ b/lib/x509/ip-in-cidr.h
@@ -34,19 +34,19 @@
  -*/
 static unsigned ip_in_cidr(const gnutls_datum_t *ip, const gnutls_datum_t *cidr)
 {
+	unsigned byte;
+#ifndef BUILD_IN_TESTS
 	char str_ip[48];
 	char str_cidr[97];
-	unsigned byte;
 
 	_gnutls_hard_log("matching %.*s with CIDR constraint %.*s\n",
 					 (int) sizeof(str_ip),
 					 _gnutls_ip_to_string(ip->data, ip->size, str_ip, sizeof(str_ip)),
 					 (int) sizeof(str_cidr),
 					 _gnutls_cidr_to_string(cidr->data, cidr->size, str_cidr, sizeof(str_cidr)));
-
-	unsigned ipsize = ip->size;
-	for (byte = 0; byte < ipsize; byte++)
-		if (((ip->data[byte] ^ cidr->data[byte]) & cidr->data[ipsize+byte]) != 0)
+#endif
+	for (byte = 0; byte < ip->size; byte++)
+		if (((ip->data[byte] ^ cidr->data[byte]) & cidr->data[ip->size+byte]) != 0)
 			return 0;
 
 	return 1; /* match */
diff --git a/tests/ip-utils.c b/tests/ip-utils.c
index 0e164aba56..cac1e85bc1 100644
--- a/tests/ip-utils.c
+++ b/tests/ip-utils.c
@@ -35,9 +35,7 @@
 # include <cmocka.h>
 # include <arpa/inet.h>
 
-#define _gnutls_hard_log(...)
-#define _gnutls_ip_to_string(...)
-#define _gnutls_cidr_to_string(...)
+#define BUILD_IN_TESTS
 #include "../lib/x509/ip-in-cidr.h"
 
 #define _MATCH_FUNC(fname, CIDR, IP, status) \
diff --git a/tests/rng-fork.c b/tests/rng-fork.c
index 2b3683b7c1..1083085c99 100644
--- a/tests/rng-fork.c
+++ b/tests/rng-fork.c
@@ -54,7 +54,6 @@ void doit(void)
 	unsigned char buf1[64];
 	unsigned char buf2[64];
 	pid_t pid;
-	unsigned char *tmp;
 	int ret;
 	FILE *fp;
 	unsigned i;