git.iko.soy/unity8
on xenial help sign in
Do not call |= on uninitialized sigterm.sa_flags

Also replace the other two constructs of = and then |= to just = with the second value

commita9e341873c3010b88b48f49cc6220ef90d18f7a4 authorAlbert Astals Cid <albert.astals@canonical.com> dateFri 17 Jun 2016, 01:15 (10 years ago) parentc9f0fb15815415
1 file changed+3−5
compare with xenial
unifiedsplit
src/UnixSignalHandler.cpp+3−5
src/UnixSignalHandler.cpp+3−5
@@ -77,8 +77,7 @@ int UnixSignalHandler::setupUnixSignalHandlers()
7777
7878 sighup.sa_handler = UnixSignalHandler::hupSignalHandler;
7979 sigemptyset(&sighup.sa_mask);
80− sighup.sa_flags = 0;
81− sighup.sa_flags |= SA_RESTART;
80+ sighup.sa_flags = SA_RESTART;
8281
8382 if (sigaction(SIGHUP, &sighup, 0) > 0)
8483 {
@@ -87,8 +86,7 @@ int UnixSignalHandler::setupUnixSignalHandlers()
8786
8887 sigint.sa_handler = UnixSignalHandler::intSignalHandler;
8988 sigemptyset(&sigint.sa_mask);
90− sigint.sa_flags = 0;
91− sigint.sa_flags |= SA_RESTART;
89+ sigint.sa_flags = SA_RESTART;
9290
9391 if (sigaction(SIGINT, &sigint, 0) > 0)
9492 {
@@ -97,7 +95,7 @@ int UnixSignalHandler::setupUnixSignalHandlers()
9795
9896 sigterm.sa_handler = UnixSignalHandler::termSignalHandler;
9997 sigemptyset(&sigterm.sa_mask);
100− sigterm.sa_flags |= SA_RESTART;
98+ sigterm.sa_flags = SA_RESTART;
10199
102100 if (sigaction(SIGTERM, &sigterm, 0) > 0)
103101 {