diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-10-30 23:32:27 -0400 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-11-06 14:56:47 -0500 |
commit | 34a6778fb9d1065f3fbb8e2243b9f0f25d1d18f1 (patch) | |
tree | fe7b1e7f19cb5d0a3fd8af80b14de1a345d7b046 /src/machine/machinectl.c | |
parent | 97123e532d87fab09e301c8106e878482911c6f1 (diff) | |
download | systemd-34a6778fb9d1065f3fbb8e2243b9f0f25d1d18f1.tar.gz |
machinectl: use initialization instead of zeroing
Diffstat (limited to 'src/machine/machinectl.c')
-rw-r--r-- | src/machine/machinectl.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 894309c7d2..c48abcd0bb 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -409,11 +409,14 @@ static int openpt_in_namespace(pid_t pid, int flags) { _cleanup_close_ int nsfd = -1, rootfd = -1; _cleanup_free_ char *ns = NULL, *root = NULL; _cleanup_close_pipe_ int sock[2] = { -1, -1 }; - struct msghdr mh; union { struct cmsghdr cmsghdr; uint8_t buf[CMSG_SPACE(sizeof(int))]; - } control; + } control = {}; + struct msghdr mh = { + .msg_control = &control, + .msg_controllen = sizeof(control), + }; struct cmsghdr *cmsg; int master = -1, r; pid_t child; @@ -438,11 +441,6 @@ static int openpt_in_namespace(pid_t pid, int flags) { if (socketpair(AF_UNIX, SOCK_DGRAM, 0, sock) < 0) return -errno; - zero(control); - zero(mh); - mh.msg_control = &control; - mh.msg_controllen = sizeof(control); - child = fork(); if (child < 0) return -errno; |