From dede22843a99f6d19c8a2dddcfc7ef0ad45ce815 Mon Sep 17 00:00:00 2001
From: Ruihan Li <lrh2000@pku.edu.cn>
Date: Sat, 16 Mar 2024 00:40:17 +0800
Subject: [PATCH] Resolve compiler warnings for regression tests

---
 regression/apps/network/send_buf_full.c | 2 --
 regression/apps/network/tcp_client.c    | 4 ++--
 regression/apps/network/tcp_server.c    | 4 ++--
 regression/apps/network/unix_client.c   | 4 ++--
 regression/apps/network/unix_server.c   | 6 +++---
 regression/apps/pthread/pthread_test.c  | 3 ++-
 regression/apps/signal_c/signal_test.c  | 1 +
 regression/apps/test_common.mk          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/regression/apps/network/send_buf_full.c b/regression/apps/network/send_buf_full.c
index cff7230a0..3892df055 100644
--- a/regression/apps/network/send_buf_full.c
+++ b/regression/apps/network/send_buf_full.c
@@ -5,7 +5,6 @@
 #include <stdio.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
-#include <sched.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
@@ -196,7 +195,6 @@ int test_full_send_buffer(struct sockaddr_in *addr)
 	}
 
 	if (pid == 0) {
-		int i;
 		ssize_t recv_len;
 
 		// Ensure that the parent executes send() first, then the child
diff --git a/regression/apps/network/tcp_client.c b/regression/apps/network/tcp_client.c
index 374ae2666..c9a8b7edf 100644
--- a/regression/apps/network/tcp_client.c
+++ b/regression/apps/network/tcp_client.c
@@ -10,7 +10,7 @@
 
 int main()
 {
-	int sock = 0, valread;
+	int sock = 0;
 	struct sockaddr_in serv_addr;
 	char *hello = "Hello from client";
 	char buffer[1024] = { 0 };
@@ -40,7 +40,7 @@ int main()
 	// Send message to the server and receive the reply
 	send(sock, hello, strlen(hello), 0);
 	printf("Hello message sent\n");
-	valread = read(sock, buffer, 1024);
+	read(sock, buffer, 1024);
 	printf("Server: %s\n", buffer);
 	return 0;
 }
diff --git a/regression/apps/network/tcp_server.c b/regression/apps/network/tcp_server.c
index 0c81f5779..4552ff843 100644
--- a/regression/apps/network/tcp_server.c
+++ b/regression/apps/network/tcp_server.c
@@ -10,7 +10,7 @@
 
 int main()
 {
-	int server_fd, new_socket, valread;
+	int server_fd, new_socket;
 	struct sockaddr_in address;
 	int opt = 1;
 	int addrlen = sizeof(address);
@@ -60,7 +60,7 @@ int main()
 	}
 
 	// Read the message from the client and reply
-	valread = read(new_socket, buffer, 1024);
+	read(new_socket, buffer, 1024);
 	printf("Client: %s\n", buffer);
 	send(new_socket, hello, strlen(hello), 0);
 	printf("Hello message sent\n");
diff --git a/regression/apps/network/unix_client.c b/regression/apps/network/unix_client.c
index 95810eaac..b95dde175 100644
--- a/regression/apps/network/unix_client.c
+++ b/regression/apps/network/unix_client.c
@@ -13,7 +13,7 @@
 
 int main()
 {
-	int client_fd, len;
+	int client_fd;
 	struct sockaddr_un server_addr, peer_addr;
 	char buf[BUFFER_SIZE];
 
@@ -36,7 +36,7 @@ int main()
 		exit(EXIT_FAILURE);
 	}
 
-	int addrlen = sizeof(peer_addr);
+	socklen_t addrlen = sizeof(peer_addr);
 	int rc =
 		getpeername(client_fd, (struct sockaddr *)&peer_addr, &addrlen);
 	if (rc == -1) {
diff --git a/regression/apps/network/unix_server.c b/regression/apps/network/unix_server.c
index 2b8f40997..609af3e14 100644
--- a/regression/apps/network/unix_server.c
+++ b/regression/apps/network/unix_server.c
@@ -13,7 +13,7 @@
 
 int main()
 {
-	int server_fd, accepted_fd, len;
+	int server_fd, accepted_fd;
 	struct sockaddr_un server_addr, client_addr;
 	char buf[BUFFER_SIZE];
 
@@ -45,14 +45,14 @@ int main()
 	printf("Server is listening...\n");
 
 	// Accept the incoming connection
-	len = sizeof(client_addr);
+	socklen_t len = sizeof(client_addr);
 	accepted_fd = accept(server_fd, (struct sockaddr *)&client_addr, &len);
 	if (accepted_fd == -1) {
 		perror("accept");
 		exit(EXIT_FAILURE);
 	}
 
-	int addrlen = sizeof(client_addr);
+	socklen_t addrlen = sizeof(client_addr);
 	int rc = getpeername(accepted_fd, (struct sockaddr *)&client_addr,
 			     &addrlen);
 	if (rc == -1) {
diff --git a/regression/apps/pthread/pthread_test.c b/regression/apps/pthread/pthread_test.c
index 5e24d1807..ed9dde798 100644
--- a/regression/apps/pthread/pthread_test.c
+++ b/regression/apps/pthread/pthread_test.c
@@ -292,6 +292,7 @@ int main()
 {
 	test_mutex_with_concurrent_counter();
 	test_robust_mutex_with_concurrent_counter();
-	// test_mutex_with_cond_wait();
+	// FIXME: Add the `test_mutex_with_cond_wait` test back.
+	(void)test_mutex_with_cond_wait;
 	return 0;
 }
diff --git a/regression/apps/signal_c/signal_test.c b/regression/apps/signal_c/signal_test.c
index cfe809eb9..c529ba45b 100644
--- a/regression/apps/signal_c/signal_test.c
+++ b/regression/apps/signal_c/signal_test.c
@@ -193,6 +193,7 @@ int test_handle_sigfpe()
 	volatile int c;
 	fxsave(x);
 	c = div_maybe_zero(a, b);
+	(void)c;
 	fxsave(y);
 
 	// Asterinas does not save and restore fpregs now, so we emit this check.
diff --git a/regression/apps/test_common.mk b/regression/apps/test_common.mk
index 373f7fc79..b8f2a18d5 100644
--- a/regression/apps/test_common.mk
+++ b/regression/apps/test_common.mk
@@ -13,7 +13,7 @@ C_DEPS := $(addprefix $(DEP_OUTPUT_DIR)/,$(C_SRCS:%.c=%.d))
 ASM_SRCS := $(wildcard *.s)
 ASM_OBJS := $(addprefix $(OBJ_OUTPUT_DIR)/,$(ASM_SRCS:%.s=%))
 CC := gcc
-C_FLAGS :=
+C_FLAGS := -Wall -Werror
 
 .PHONY: all
 all: $(C_OBJS) $(ASM_OBJS)