From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 22 Jan 2015 16:30:58 +0000 (+0100)
Subject: machinectl: minor simplification
X-Git-Tag: v219~354
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=813c65c34beae2eed1f93d9317f97d7e806389f5;hp=6e18cc9fa078d2a967251017ddb5baefb104b720

machinectl: minor simplification
---

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index ec403e8f3..8e2780e9c 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -1355,7 +1355,6 @@ static int login_machine(int argc, char *argv[], void *userdata) {
         int master = -1, r, ret = 0;
         sd_bus *bus = userdata;
         const char *pty, *match;
-        sigset_t mask;
         char last_char = 0;
         bool machine_died;
 
@@ -1417,9 +1416,7 @@ static int login_machine(int argc, char *argv[], void *userdata) {
         if (r < 0)
                 return bus_log_parse_error(r);
 
-        assert_se(sigemptyset(&mask) == 0);
-        sigset_add_many(&mask, SIGWINCH, SIGTERM, SIGINT, -1);
-        assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
+        sigprocmask_many(SIG_BLOCK, SIGWINCH, SIGTERM, SIGINT, -1);
 
         log_info("Connected to machine %s. Press ^] three times within 1s to exit session.", argv[1]);