Michael Stefaniuc : wineandroid.drv: Remove redundant not-NULL checks ( coccinellery).

Alexandre Julliard julliard at winehq.org
Wed Feb 20 16:37:01 CST 2019


Module: wine
Branch: master
Commit: c0cc126d579e078f2804112c14f0c18b38f68937
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c0cc126d579e078f2804112c14f0c18b38f68937

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Wed Feb 20 20:54:26 2019 +0100

wineandroid.drv: Remove redundant not-NULL checks (coccinellery).

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wineandroid.drv/device.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c
index 0800ad7..0b8bf67 100644
--- a/dlls/wineandroid.drv/device.c
+++ b/dlls/wineandroid.drv/device.c
@@ -520,8 +520,8 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR
 
     if (!data || data->parent == win)
     {
-        if (win) pANativeWindow_release( win );
-        if (data && win) PostMessageW( hwnd, WM_ANDROID_REFRESH, opengl, 0 );
+        pANativeWindow_release( win );
+        if (data) PostMessageW( hwnd, WM_ANDROID_REFRESH, opengl, 0 );
         TRACE( "%p -> %p win %p (unchanged)\n", hwnd, data, win );
         return;
     }
@@ -529,15 +529,12 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR
     release_native_window( data );
     data->parent = win;
     data->generation++;
-    if (win)
-    {
-        wrap_java_call();
-        if (data->api) win->perform( win, NATIVE_WINDOW_API_CONNECT, data->api );
-        win->perform( win, NATIVE_WINDOW_SET_BUFFERS_FORMAT, data->buffer_format );
-        win->setSwapInterval( win, data->swap_interval );
-        unwrap_java_call();
-        PostMessageW( hwnd, WM_ANDROID_REFRESH, opengl, 0 );
-    }
+    wrap_java_call();
+    if (data->api) win->perform( win, NATIVE_WINDOW_API_CONNECT, data->api );
+    win->perform( win, NATIVE_WINDOW_SET_BUFFERS_FORMAT, data->buffer_format );
+    win->setSwapInterval( win, data->swap_interval );
+    unwrap_java_call();
+    PostMessageW( hwnd, WM_ANDROID_REFRESH, opengl, 0 );
     TRACE( "%p -> %p win %p\n", hwnd, data, win );
 }
 




More information about the wine-cvs mailing list