diff options
| author | Philipp Brüschweiler <blei42@gmail.com> | 2013-03-09 19:38:56 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-03-19 14:28:01 -0400 |
| commit | ff253129c5b7f2f841d50f3e5dce675b2d31464e (patch) | |
| tree | 81986fceaad6646aeabbb07a34fceeefacc0b31c | |
| parent | 063a882dc7bb39fbda9ab8cd124a0f30e076e22b (diff) | |
weston-launch: move function calls out of assert()
| -rw-r--r-- | src/weston-launch.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/weston-launch.c b/src/weston-launch.c index bc7f8a2f..98f01113 100644 --- a/src/weston-launch.c +++ b/src/weston-launch.c @@ -209,6 +209,7 @@ setup_launcher_socket(struct weston_launch *wl) static int setup_signals(struct weston_launch *wl) { + int ret; sigset_t mask; struct sigaction sa; struct epoll_event ev; @@ -216,13 +217,16 @@ setup_signals(struct weston_launch *wl) memset(&sa, 0, sizeof sa); sa.sa_handler = SIG_DFL; sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; - assert(sigaction(SIGCHLD, &sa, NULL) == 0); + ret = sigaction(SIGCHLD, &sa, NULL); + assert(ret == 0); - assert(sigemptyset(&mask) == 0); + ret = sigemptyset(&mask); + assert(ret == 0); sigaddset(&mask, SIGCHLD); sigaddset(&mask, SIGINT); sigaddset(&mask, SIGTERM); - assert(sigprocmask(SIG_BLOCK, &mask, NULL) == 0); + ret = sigprocmask(SIG_BLOCK, &mask, NULL); + assert(ret == 0); wl->signalfd = signalfd(-1, &mask, SFD_NONBLOCK | SFD_CLOEXEC); if (wl->signalfd < 0) |