From 34a6778fb9d1065f3fbb8e2243b9f0f25d1d18f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 30 Oct 2013 23:32:27 -0400 Subject: [PATCH] machinectl: use initialization instead of zeroing --- src/machine/machinectl.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 894309c7d..c48abcd0b 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; -- 2.30.2