Merge lp:~aacid/unity8/fix_uninitialized_use into lp:unity8

[Albert Astals Cid]

Do not call |= on uninitialized sigterm.sa_flags

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

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[lp:~aacid/unity8/fix_uninitialized_use]

2410. By Albert Astals Cid on 2016-05-26

Do not call |= on uninitialized sigterm.sa_flags

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

[Lukáš Tinkl (lukas-kde)]

LGTM, fixes the initialization

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1354/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1792
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/885
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/885
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/885
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1817
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1764
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1764
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1764
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1755
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1755/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1755
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1755/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1755
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1755/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1755
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1755/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1755
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1755/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1755
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1755/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1755
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1755/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1755
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1755/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1755
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1755/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1354/rebuild

review: Approve (continuous-integration)

=== modified file 'tools/unix-signal-handler.cpp'
--- tools/unix-signal-handler.cpp	2015-07-01 10:48:40 +0000
+++ tools/unix-signal-handler.cpp	2016-05-26 08:49:32 +0000
@@ -77,8 +77,7 @@
 
     sighup.sa_handler = UnixSignalHandler::hupSignalHandler;
     sigemptyset(&sighup.sa_mask);
-    sighup.sa_flags = 0;
-    sighup.sa_flags |= SA_RESTART;
+    sighup.sa_flags = SA_RESTART;
 
     if (sigaction(SIGHUP, &sighup, 0) > 0)
     {
@@ -87,8 +86,7 @@
 
     sigint.sa_handler = UnixSignalHandler::intSignalHandler;
     sigemptyset(&sigint.sa_mask);
-    sigint.sa_flags = 0;
-    sigint.sa_flags |= SA_RESTART;
+    sigint.sa_flags = SA_RESTART;
 
     if (sigaction(SIGINT, &sigint, 0) > 0)
     {
@@ -97,7 +95,7 @@
 
     sigterm.sa_handler = UnixSignalHandler::termSignalHandler;
     sigemptyset(&sigterm.sa_mask);
-    sigterm.sa_flags |= SA_RESTART;
+    sigterm.sa_flags = SA_RESTART;
 
     if (sigaction(SIGTERM, &sigterm, 0) > 0)
     {