[waffle] [PATCH 12/13] android: remove 'self' NULL checks

Emil Velikov emil.l.velikov at gmail.com
Mon May 16 10:57:48 UTC 2016


From: Emil Velikov <emil.velikov at collabora.com>

Similar to earlier commits - the API layer already does these for us.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 src/waffle/android/droid_window.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/waffle/android/droid_window.c b/src/waffle/android/droid_window.c
index 7826acb..620569f 100644
--- a/src/waffle/android/droid_window.c
+++ b/src/waffle/android/droid_window.c
@@ -100,12 +100,7 @@ bool
 droid_window_show(struct wcore_window *wc_self)
 {
     struct droid_window *self = droid_window(wc_self);
-    struct droid_display *dpy;
-
-    if (!self)
-        return false;
-
-    dpy = droid_display(wc_self->display);
+    struct droid_display *dpy = droid_display(wc_self->display);
 
     return droid_show_surface(dpy->pSFContainer, self->pANWContainer);
 }
@@ -116,12 +111,7 @@ droid_window_resize(struct wcore_window *wc_self,
                     int32_t height)
 {
     struct droid_window *self = droid_window(wc_self);
-    struct droid_display *dpy;
-
-    if (!self)
-        return false;
-
-    dpy = droid_display(wc_self->display);
+    struct droid_display *dpy = droid_display(wc_self->display);
 
     return droid_resize_surface(dpy->pSFContainer, self->pANWContainer,
         width, height);
-- 
2.6.2



More information about the waffle mailing list