Merge lp://staging/~sforshee/powerd/fix-warnings into lp://staging/powerd
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~sforshee/powerd/fix-warnings |
Merge into: | lp://staging/powerd |
Diff against target: |
44 lines (+6/-5) 3 files modified
src/display.c (+1/-1) src/powerd-internal.h (+1/-1) src/powerd-object.c (+4/-3) |
To merge this branch: | bzr merge lp://staging/~sforshee/powerd/fix-warnings |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Matt Fischer | Pending | ||
Review via email: mp+188613@code.staging.launchpad.net |
Commit message
Fix build warnings
Description of the change
Fix build warnings
Unmerged revisions
- 98. By Seth Forshee
-
powerd-object: Fix tabs/space indentation in previous commit
- 97. By Seth Forshee
-
powerd-object: Fix warning about format string
Something changed recently to cause gcc to start warning about
some code that it had no problem with previously:src/powerd-
object. c: In function 'handle_ ack_state_ change' :
src/powerd-object. c:131:47: warning: format not a string literal and no format arguments [-Wformat-security]
G_ DBUS_ERROR_ INVALID_ ARGS, msg);
^ This is probably just gcc being pedantic. Change it to something
which is completely equivalent but does not generate warnings. - 96. By Seth Forshee
-
display: Make power_mode argument to display_
set_power_ mode() const This fixes a warning:
powerd.cpp: In function 'gboolean {anonymous}
::call_ shutdown( gpointer) ':
powerd.cpp:127:40: warning: deprecated conversion from string constant to 'char*' [-Wwrite-strings]The argument is read-only, so it really ought to be const anyway.
PASSED: Continuous integration, rev:98 jenkins. qa.ubuntu. com/job/ powerd- ci/125/ jenkins. qa.ubuntu. com/job/ powerd- saucy-armhf- ci/79 jenkins. qa.ubuntu. com/job/ powerd- saucy-armhf- ci/79/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ powerd- ci/125/ rebuild
http://