mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

exposay: remove redundant NULL check in highlight_surface

Browse Source 
exposay_highlight_surface() is called from exposay_pick(),
exposay_layout(), and exposay_maybe_move() where the esurface
parameter is already validated prior to the call.  This makes
the 'esurface' NULL check redundant.  This assumes any future
calls to exposay_highlight_surface() will also validate the
'esurface' parameter prior to the call.

This fixes the logic in exposay_highlight_surface so static
analyzers don't complain about the possibility that 'view'
might be NULL deref'd when a 'esurface' == NULL condition is
true.

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
This commit is contained in:
U. Artie Eoff
2014-01-15 13:42:18 -08:00
committed by Kristian Høgsberg
parent bae79ca741
commit 6d6d190b30
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/exposay.c
+3 -6
View File
@@ -136,13 +136,10 @@ static void
exposay_highlight_surface(struct desktop_shell *shell, exposay_highlight_surface(struct desktop_shell *shell,
struct exposay_surface *esurface) struct exposay_surface *esurface)
{ {
struct weston_view *view = NULL; struct weston_view *view = esurface->view;
if (esurface) { shell->exposay.row_current = esurface->row;
shell->exposay.row_current = esurface->row; shell->exposay.column_current = esurface->column;
shell->exposay.column_current = esurface->column;
view = esurface->view;
}
activate(shell, view->surface, shell->exposay.seat); activate(shell, view->surface, shell->exposay.seat);
shell->exposay.focus_current = view; shell->exposay.focus_current = view;