Mir

Merge lp:~raof/mir/fix-two-clang-analyse-results into lp:~mir-team/mir/trunk

Proposed by Chris Halse Rogers on 2013-07-08
Status: Merged
Approved by: Alan Griffiths on 2013-07-08
Approved revision: 822
Merged at revision: 822
Proposed branch: lp:~raof/mir/fix-two-clang-analyse-results
Merge into: lp:~mir-team/mir/trunk
Diff against target: 31 lines (+9/-1)
2 files modified
examples/demo-inprocess-surface-client/inprocess_egl_client.cpp (+1/-1)
src/server/graphics/gbm/linux_virtual_terminal.cpp (+8/-0)
To merge this branch: bzr merge lp:~raof/mir/fix-two-clang-analyse-results
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-07-08
Alan Griffiths Approve on 2013-07-08
Thomas Voß (community) 2013-07-08 Approve on 2013-07-08
Review via email: mp+173462@code.launchpad.net

Commit message

Fix two issues caught by Clang's static analyser

Description of the change

Fix two issues caught by Clang's static analyser

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'examples/demo-inprocess-surface-client/inprocess_egl_client.cpp'
--- examples/demo-inprocess-surface-client/inprocess_egl_client.cpp 2013-06-13 22:05:06 +0000
+++ examples/demo-inprocess-surface-client/inprocess_egl_client.cpp 2013-07-08 10:36:24 +0000
@@ -106,7 +106,7 @@
106 {106 {
107 gl_animation.render_gl();107 gl_animation.render_gl();
108 rc = eglSwapBuffers(helper.the_display(), helper.the_surface());108 rc = eglSwapBuffers(helper.the_display(), helper.the_surface());
109 assert(rc = EGL_TRUE);109 assert(rc == EGL_TRUE);
110110
111 gl_animation.step();111 gl_animation.step();
112 }112 }
113113
=== modified file 'src/server/graphics/gbm/linux_virtual_terminal.cpp'
--- src/server/graphics/gbm/linux_virtual_terminal.cpp 2013-06-25 03:25:49 +0000
+++ src/server/graphics/gbm/linux_virtual_terminal.cpp 2013-07-08 10:36:24 +0000
@@ -209,6 +209,14 @@
209 << boost::errinfo_errno(errno));209 << boost::errinfo_errno(errno));
210 }210 }
211 status = fops->ioctl(vt_fd, VT_WAITACTIVE, vt_number);211 status = fops->ioctl(vt_fd, VT_WAITACTIVE, vt_number);
212 if (status < 0)
213 {
214 BOOST_THROW_EXCEPTION(
215 boost::enable_error_info(
216 std::runtime_error("Failed to wait for VT to become active"))
217 << boost::errinfo_file_name(active_vt_path)
218 << boost::errinfo_errno(errno));
219 }
212 }220 }
213221
214 return vt_fd;222 return vt_fd;

Subscribers

People subscribed via source and target branches