From bba8123b4ed9e188d2eeab0a24ba6f5068845960 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 19 Feb 2018 00:01:43 +0100 Subject: [PATCH] start: lxc_init_handler() Signed-off-by: Christian Brauner --- src/lxc/start.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/lxc/start.c b/src/lxc/start.c index 7ca376422..386a4a2d6 100644 --- a/src/lxc/start.c +++ b/src/lxc/start.c @@ -657,16 +657,13 @@ struct lxc_handler *lxc_init_handler(const char *name, struct lxc_conf *conf, struct lxc_handler *handler; handler = malloc(sizeof(*handler)); - if (!handler) { - ERROR("failed to allocate memory"); + if (!handler) return NULL; - } - memset(handler, 0, sizeof(*handler)); - /* Note that am_guest_unpriv() checks the effective uid. We probably don't - * care if we are real root only if we are running as root so this - * should be fine. + /* Note that am_guest_unpriv() checks the effective uid. We + * probably don't care if we are real root only if we are running + * as root so this should be fine. */ handler->am_root = !am_guest_unpriv(); handler->data_sock[0] = handler->data_sock[1] = -1; @@ -685,8 +682,8 @@ struct lxc_handler *lxc_init_handler(const char *name, struct lxc_conf *conf, if (daemonize && !handler->conf->reboot) { /* Create socketpair() to synchronize on daemonized startup. - * When the container reboots we don't need to synchronize again - * currently so don't open another socketpair(). + * When the container reboots we don't need to synchronize + * again currently so don't open another socketpair(). */ ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, handler->state_socket_pair); -- 2.47.2