shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 01:27:11 +03:00
Code

udev: use initialization instead of zeroing in one place

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-10-11 19:34:21 -04:00
parent 872c8faaf2
commit 97fec53e5e
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/udev/udev-ctrl.c
View File

@ -340,13 +340,18 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl_connection *conn)
{ {
struct udev_ctrl_msg *uctrl_msg; struct udev_ctrl_msg *uctrl_msg;
ssize_t size; ssize_t size;
struct msghdr smsg;
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
struct iovec iov; struct iovec iov;
struct ucred *cred;
char cred_msg[CMSG_SPACE(sizeof(struct ucred))]; char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
struct msghdr smsg = {
.msg_iov = &iov,
.msg_iovlen = 1,
.msg_control = cred_msg,
.msg_controllen = sizeof(cred_msg),
};
struct ucred *cred;
uctrl_msg = calloc(1, sizeof(struct udev_ctrl_msg)); uctrl_msg = new0(struct udev_ctrl_msg, 1);
if (uctrl_msg == NULL) if (uctrl_msg == NULL)
return NULL; return NULL;
uctrl_msg->refcount = 1; uctrl_msg->refcount = 1;
@ -381,11 +386,7 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl_connection *conn)
iov.iov_base = &uctrl_msg->ctrl_msg_wire; iov.iov_base = &uctrl_msg->ctrl_msg_wire;
iov.iov_len = sizeof(struct udev_ctrl_msg_wire); iov.iov_len = sizeof(struct udev_ctrl_msg_wire);
memset(&smsg, 0x00, sizeof(struct msghdr));
smsg.msg_iov = &iov;
smsg.msg_iovlen = 1;
smsg.msg_control = cred_msg;
smsg.msg_controllen = sizeof(cred_msg);
size = recvmsg(conn->sock, &smsg, 0); size = recvmsg(conn->sock, &smsg, 0);
if (size < 0) { if (size < 0) {
log_error("unable to receive ctrl message: %m\n"); log_error("unable to receive ctrl message: %m\n");

5
src/udev/udevd.c
View File

@ -779,10 +779,11 @@ static void handle_signal(struct udev *udev, int signo)
if (WIFEXITED(status)) { if (WIFEXITED(status)) {
if (WEXITSTATUS(status) != 0) if (WEXITSTATUS(status) != 0)
log_error("worker [%u] exit with return code %i\n", pid, WEXITSTATUS(status)); log_error("worker [%u] exit with return code %i\n",
pid, WEXITSTATUS(status));
} else if (WIFSIGNALED(status)) { } else if (WIFSIGNALED(status)) {
log_error("worker [%u] terminated by signal %i (%s)\n", log_error("worker [%u] terminated by signal %i (%s)\n",
pid, WTERMSIG(status), strsignal(WTERMSIG(status))); pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
} else if (WIFSTOPPED(status)) { } else if (WIFSTOPPED(status)) {
log_error("worker [%u] stopped\n", pid); log_error("worker [%u] stopped\n", pid);
} else if (WIFCONTINUED(status)) { } else if (WIFCONTINUED(status)) {