exposay: remove redundant NULL check in highlight_surface
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>
diff --git a/desktop-shell/exposay.c b/desktop-shell/exposay.c
index 01bf0b1..fe7a3a7 100644
--- a/desktop-shell/exposay.c
+++ b/desktop-shell/exposay.c
@@ -136,13 +136,10 @@
exposay_highlight_surface(struct desktop_shell *shell,
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.column_current = esurface->column;
- view = esurface->view;
- }
+ shell->exposay.row_current = esurface->row;
+ shell->exposay.column_current = esurface->column;
activate(shell, view->surface, shell->exposay.seat);
shell->exposay.focus_current = view;