X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsptps_test.c;h=e7dcea22a89ca4dee464442fc2c366e78d4679bd;hb=3a316823b971396a428f020f401b9fe41252d98d;hp=3a72f1d6fb7a6a624b8e1a6d173fed476fc7eee4;hpb=843990d8df0c060db9b64e170996e9d49c8c921d;p=tinc

diff --git a/src/sptps_test.c b/src/sptps_test.c
index 3a72f1d6..e7dcea22 100644
--- a/src/sptps_test.c
+++ b/src/sptps_test.c
@@ -59,7 +59,7 @@ static bool send_data(void *handle, uint8_t type, const void *data, size_t len)
 
 static bool receive_record(void *handle, uint8_t type, const void *data, uint16_t len) {
 	if(verbose)
-		fprintf(stderr, "Received type %d record of %hu bytes:\n", type, len);
+		fprintf(stderr, "Received type %d record of %u bytes:\n", type, len);
 	if(!writeonly)
 		write(out, data, len);
 	return true;
@@ -221,7 +221,7 @@ int main(int argc, char *argv[]) {
 #endif
 
 	struct addrinfo *ai, hint;
-	memset(&hint, 0, sizeof hint);
+	memset(&hint, 0, sizeof(hint));
 
 	hint.ai_family = addressfamily;
 	hint.ai_socktype = datagram ? SOCK_DGRAM : SOCK_STREAM;
@@ -240,7 +240,7 @@ int main(int argc, char *argv[]) {
 	}
 
 	int one = 1;
-	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof one);
+	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof(one));
 
 	if(initiator) {
 		if(connect(sock, ai->ai_addr, ai->ai_addrlen)) {
@@ -271,9 +271,9 @@ int main(int argc, char *argv[]) {
 
 			char buf[65536];
 			struct sockaddr addr;
-			socklen_t addrlen = sizeof addr;
+			socklen_t addrlen = sizeof(addr);
 
-			if(recvfrom(sock, buf, sizeof buf, MSG_PEEK, &addr, &addrlen) <= 0) {
+			if(recvfrom(sock, buf, sizeof(buf), MSG_PEEK, &addr, &addrlen) <= 0) {
 				fprintf(stderr, "Could not read from socket: %s\n", sockstrerror(sockerrno));
 				return 1;
 			}
@@ -331,7 +331,7 @@ int main(int argc, char *argv[]) {
 			return 1;
 
 		if(FD_ISSET(in, &fds)) {
-			ssize_t len = read(in, buf, sizeof buf);
+			ssize_t len = read(in, buf, sizeof(buf));
 			if(len < 0) {
 				fprintf(stderr, "Could not read from stdin: %s\n", strerror(errno));
 				return 1;
@@ -351,12 +351,12 @@ int main(int argc, char *argv[]) {
 				if(len > 1)
 					sptps_send_record(&s, 0, buf, len);
 			} else
-			if(!sptps_send_record(&s, buf[0] == '!' ? 1 : 0, buf, (len == 1 && buf[0] == '\n') ? 0 : buf[0] == '*' ? sizeof buf : len))
+			if(!sptps_send_record(&s, buf[0] == '!' ? 1 : 0, buf, (len == 1 && buf[0] == '\n') ? 0 : buf[0] == '*' ? sizeof(buf) : len))
 				return 1;
 		}
 
 		if(FD_ISSET(sock, &fds)) {
-			ssize_t len = recv(sock, buf, sizeof buf, 0);
+			ssize_t len = recv(sock, buf, sizeof(buf), 0);
 			if(len < 0) {
 				fprintf(stderr, "Could not read from socket: %s\n", sockstrerror(sockerrno));
 				return 1;