Unity 8

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

  1. fix_uninitialized_use
  2. Merge into trunk
Proposed by Albert Astals Cid on 2016-05-26
Status: Merged
Approved by: Lukáš Tinkl on 2016-05-26
Approved revision: 2410
Merged at revision: 2463
Proposed branch: lp:~aacid/unity8/fix_uninitialized_use
Merge into: lp:unity8
Diff against target: 32 lines (+3/-5)
1 file modified
tools/unix-signal-handler.cpp (+3/-5)
To merge this branch: bzr merge lp:~aacid/unity8/fix_uninitialized_use
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve on 2016-06-03
Lukáš Tinkl (community) 2016-05-26 Approve on 2016-05-26
Review via email: mp+295805@code.launchpad.net

Commit Message

Do not call |= on uninitialized sigterm.sa_flags

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

Description of the Change

 * 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

To post a comment you must log in.
lp:~aacid/unity8/fix_uninitialized_use updated on 2016-05-26
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) wrote :

LGTM, fixes the initialization

review: Approve
Unity8 CI Bot (unity8-ci-bot) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/unix-signal-handler.cpp'
2--- tools/unix-signal-handler.cpp 2015-07-01 10:48:40 +0000
3+++ tools/unix-signal-handler.cpp 2016-05-26 08:49:32 +0000
4@@ -77,8 +77,7 @@
5
6 sighup.sa_handler = UnixSignalHandler::hupSignalHandler;
7 sigemptyset(&sighup.sa_mask);
8- sighup.sa_flags = 0;
9- sighup.sa_flags |= SA_RESTART;
10+ sighup.sa_flags = SA_RESTART;
11
12 if (sigaction(SIGHUP, &sighup, 0) > 0)
13 {
14@@ -87,8 +86,7 @@
15
16 sigint.sa_handler = UnixSignalHandler::intSignalHandler;
17 sigemptyset(&sigint.sa_mask);
18- sigint.sa_flags = 0;
19- sigint.sa_flags |= SA_RESTART;
20+ sigint.sa_flags = SA_RESTART;
21
22 if (sigaction(SIGINT, &sigint, 0) > 0)
23 {
24@@ -97,7 +95,7 @@
25
26 sigterm.sa_handler = UnixSignalHandler::termSignalHandler;
27 sigemptyset(&sigterm.sa_mask);
28- sigterm.sa_flags |= SA_RESTART;
29+ sigterm.sa_flags = SA_RESTART;
30
31 if (sigaction(SIGTERM, &sigterm, 0) > 0)
32 {

Subscribers

People subscribed via source and target branches