Merge branch 'lukeshu/misc'

1 files changed, 15 insertions, 7 deletions

diff --git a/libhw_cr/host_net.c b/libhw_cr/host_net.c
index 01f4370..4a2e65f 100644
--- a/libhw_cr/host_net.c
+++ b/libhw_cr/host_net.c
@@ -53,7 +53,7 @@ static void hostnet_handle_sig_io(int LM_UNUSED(sig), siginfo_t *info, void *LM_
 }
 
 static void hostnet_init(void) {
-	struct sigaction action = {0};
+	struct sigaction action = {};
 
 	if (hostnet_sig_io)
 		return;
@@ -128,7 +128,7 @@ void hostnet_tcp_listener_init(struct hostnet_tcp_listener *self, uint16_t port)
 	union {
 		struct sockaddr_in in;
 		struct sockaddr gen;
-	} addr = { 0 };
+	} addr = {};
 
 	hostnet_init();
 
@@ -241,6 +241,10 @@ static ssize_t hostnet_tcp_readv(struct _hostnet_tcp_conn *conn, const struct io
 	assert(conn);
 	assert(iov);
 	assert(iovcnt > 0);
+	size_t count = 0;
+	for (int i = 0; i < iovcnt; i++)
+		count += iov[i].iov_len;
+	assert(count);
 
 	ssize_t ret;
 	struct hostnet_pthread_readv_args args = {
@@ -259,7 +263,7 @@ static ssize_t hostnet_tcp_readv(struct _hostnet_tcp_conn *conn, const struct io
 			return -NET_ERECV_TIMEOUT;
 		args.timeout = ns_to_host_us_time(conn->read_deadline_ns-now_ns);
 	} else {
-		args.timeout = (host_us_time_t){0};
+		args.timeout = (host_us_time_t){};
 	}
 
 	if (RUN_PTHREAD(hostnet_pthread_readv, &args))
@@ -319,6 +323,10 @@ static ssize_t hostnet_tcp_writev(struct _hostnet_tcp_conn *conn, const struct i
 	assert(conn);
 	assert(iov);
 	assert(iovcnt > 0);
+	size_t count = 0;
+	for (int i = 0; i < iovcnt; i++)
+		count += iov[i].iov_len;
+	assert(count);
 
 	ssize_t ret;
 	struct hostnet_pthread_writev_args args = {
@@ -359,7 +367,7 @@ void hostnet_udp_conn_init(struct hostnet_udp_conn *self, uint16_t port) {
 		struct sockaddr_in      in;
 		struct sockaddr         gen;
 		struct sockaddr_storage stor;
-	} addr = { 0 };
+	} addr = {};
 
 	hostnet_init();
 
@@ -396,7 +404,7 @@ static void *hostnet_pthread_sendto(void *_args) {
 		struct sockaddr_in      in;
 		struct sockaddr         gen;
 		struct sockaddr_storage stor;
-	} addr = { 0 };
+	} addr = {};
 
 	addr.in.sin_family = AF_INET;
 	addr.in.sin_addr.s_addr =
@@ -464,7 +472,7 @@ static void *hostnet_pthread_recvfrom(void *_args) {
 		struct sockaddr_in      in;
 		struct sockaddr         gen;
 		struct sockaddr_storage stor;
-	} addr = { 0 };
+	} addr = {};
 	socklen_t addr_size;
 
 	*(args->ret_size) = setsockopt(args->connfd, SOL_SOCKET, SO_RCVTIMEO,
@@ -518,7 +526,7 @@ static ssize_t hostnet_udp_recvfrom(struct hostnet_udp_conn *conn, void *buf, si
 			return -NET_ERECV_TIMEOUT;
 		args.timeout = ns_to_host_us_time(conn->read_deadline_ns-now_ns);
 	} else {
-		args.timeout = (host_us_time_t){0};
+		args.timeout = (host_us_time_t){};
 	}
 
 	if (RUN_PTHREAD(hostnet_pthread_recvfrom, &args))