commit 2fdd227

Style

 1@@ -7,7 +7,7 @@
 2 ssize_t
 3 send_fd(int socket, int fd, const void *buffer, ssize_t buffer_size)
 4 {
 5-	char control[CMSG_SPACE(sizeof(int))];
 6+	char control[CMSG_SPACE(sizeof(fd))];
 7 	struct iovec iov = {
 8 		.iov_base = (void *)buffer,
 9 		.iov_len = buffer_size,
10@@ -22,14 +22,14 @@ send_fd(int socket, int fd, const void *buffer, ssize_t buffer_size)
11 
12 	if (fd != -1) {
13 		message.msg_control = control,
14-		message.msg_controllen = sizeof control;
15+		message.msg_controllen = sizeof(control);
16 
17 		cmsg = CMSG_FIRSTHDR(&message);
18-		cmsg->cmsg_len = CMSG_LEN(sizeof fd);
19+		cmsg->cmsg_len = CMSG_LEN(sizeof(fd));
20 		cmsg->cmsg_level = SOL_SOCKET;
21 		cmsg->cmsg_type = SCM_RIGHTS;
22 
23-		memcpy(CMSG_DATA(cmsg), &fd, sizeof fd);
24+		memcpy(CMSG_DATA(cmsg), &fd, sizeof(fd));
25 	} else {
26 		message.msg_control = NULL;
27 		message.msg_controllen = 0;
28@@ -45,7 +45,7 @@ receive_fd(int socket, int *fd, void *buffer, ssize_t buffer_size)
29 		return recv(socket, buffer, buffer_size, 0);
30 
31 	ssize_t size;
32-	char control[CMSG_SPACE(sizeof(int))];
33+	char control[CMSG_SPACE(sizeof(*fd))];
34 	struct iovec iov = {
35 		.iov_base = buffer,
36 		.iov_len = buffer_size,
37@@ -67,10 +67,10 @@ receive_fd(int socket, int *fd, void *buffer, ssize_t buffer_size)
38 
39 	cmsg = CMSG_FIRSTHDR(&message);
40 
41-	if (cmsg && cmsg->cmsg_len == CMSG_LEN(sizeof(int)) &&
42+	if (cmsg && cmsg->cmsg_len == CMSG_LEN(sizeof(*fd)) &&
43 	    cmsg->cmsg_level == SOL_SOCKET &&
44 	    cmsg->cmsg_type == SCM_RIGHTS) {
45-		memcpy(fd, CMSG_DATA(cmsg), sizeof *fd);
46+		memcpy(fd, CMSG_DATA(cmsg), sizeof(*fd));
47 	}
48 
49 	return size;