Skip to content

C
criu
Commit 339ad2d8 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov
Browse files
Options

files: Get rid of strict-aliasing violations 

Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
parent 7050ea2c
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
files.c
View file @ 339ad2d8
...@@ -329,7 +329,8 @@ static int open_fd(int pid, struct fdinfo_entry *fe, ...@@ -329,7 +329,8 @@ static int open_fd(int pid, struct fdinfo_entry *fe,
struct msghdr hdr; struct msghdr hdr;
struct iovec data; struct iovec data;
char cmsgbuf[CMSG_SPACE(sizeof(int))]; char cmsgbuf[CMSG_SPACE(sizeof(int))];
struct cmsghdr* cmsg; struct cmsghdr *cmsg;
int *cmsg_data;
char dummy = '*'; char dummy = '*';
...@@ -365,7 +366,8 @@ static int open_fd(int pid, struct fdinfo_entry *fe, ...@@ -365,7 +366,8 @@ static int open_fd(int pid, struct fdinfo_entry *fe,
cmsg->cmsg_level = SOL_SOCKET; cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS; cmsg->cmsg_type = SCM_RIGHTS;
*(int*)CMSG_DATA(cmsg) = fe->addr; cmsg_data = (int *)CMSG_DATA(cmsg);
*cmsg_data = fe->addr;
tmp = sendmsg(sock, &hdr, 0); tmp = sendmsg(sock, &hdr, 0);
if (tmp < 0) { if (tmp < 0) {
...@@ -387,6 +389,7 @@ static int recv_fd(int sock) ...@@ -387,6 +389,7 @@ static int recv_fd(int sock)
char buf[1]; char buf[1];
char ccmsg[CMSG_SPACE(sizeof(int))]; char ccmsg[CMSG_SPACE(sizeof(int))];
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
int *cmsg_data;
iov.iov_base = buf; iov.iov_base = buf;
iov.iov_len = 1; iov.iov_len = 1;
int ret; int ret;
...@@ -411,7 +414,8 @@ static int recv_fd(int sock) ...@@ -411,7 +414,8 @@ static int recv_fd(int sock)
return -1; return -1;
} }
return *(int*)CMSG_DATA(cmsg); cmsg_data = (int *)CMSG_DATA(cmsg);
return *cmsg_data;
} }
static int receive_fd(int pid, struct fdinfo_entry *fe, struct fdinfo_desc *fi) static int receive_fd(int pid, struct fdinfo_entry *fe, struct fdinfo_desc *fi)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment