mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weston-launch: move function calls out of assert()

Browse Source
This commit is contained in:
Philipp Brüschweiler
2013-03-09 19:38:56 +01:00
committed by Kristian Høgsberg
parent 063a882dc7
commit ff253129c5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/weston-launch.c
+7 -3
View File
@@ -209,6 +209,7 @@ setup_launcher_socket(struct weston_launch *wl)
static int static int
setup_signals(struct weston_launch *wl) setup_signals(struct weston_launch *wl)
{ {
int ret;
sigset_t mask; sigset_t mask;
struct sigaction sa; struct sigaction sa;
struct epoll_event ev; struct epoll_event ev;
@@ -216,13 +217,16 @@ setup_signals(struct weston_launch *wl)
memset(&sa, 0, sizeof sa); memset(&sa, 0, sizeof sa);
sa.sa_handler = SIG_DFL; sa.sa_handler = SIG_DFL;
sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; 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, SIGCHLD);
sigaddset(&mask, SIGINT); sigaddset(&mask, SIGINT);
sigaddset(&mask, SIGTERM); 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); wl->signalfd = signalfd(-1, &mask, SFD_NONBLOCK | SFD_CLOEXEC);
if (wl->signalfd < 0) if (wl->signalfd < 0)