[PATCH] ddraw/tests: Remove redundant not NULL check (coccinellery)

Michael Stefaniuc mstefani at winehq.org
Wed Feb 20 13:54:24 CST 2019


Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
skip + return at the beginning prior to the first goto.
Same object files generated with CFLAGS="-O2 -g0".
But of course the check can be kept to not break the pattern.


 dlls/ddraw/tests/ddraw1.c | 2 +-
 dlls/ddraw/tests/ddraw2.c | 2 +-
 dlls/ddraw/tests/ddraw4.c | 2 +-
 dlls/ddraw/tests/ddraw7.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index ceb1f83367..d0ed33dbc4 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -5246,7 +5246,7 @@ cleanup:
     if (gl) FreeLibrary(gl);
     if (hdc) ReleaseDC(window, hdc);
     if (hdc2) ReleaseDC(window2, hdc2);
-    if (window) DestroyWindow(window);
+    DestroyWindow(window);
     if (window2) DestroyWindow(window2);
 }
 
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index db67afa0e4..37238e162f 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -6271,7 +6271,7 @@ cleanup:
     if (gl) FreeLibrary(gl);
     if (hdc) ReleaseDC(window, hdc);
     if (hdc2) ReleaseDC(window2, hdc2);
-    if (window) DestroyWindow(window);
+    DestroyWindow(window);
     if (window2) DestroyWindow(window2);
 }
 
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index dbba9b5104..b60606fca3 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -7785,7 +7785,7 @@ cleanup:
     if (gl) FreeLibrary(gl);
     if (hdc) ReleaseDC(window, hdc);
     if (hdc2) ReleaseDC(window2, hdc2);
-    if (window) DestroyWindow(window);
+    DestroyWindow(window);
     if (window2) DestroyWindow(window2);
 }
 
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 215e1c7107..3339b32d20 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -7615,7 +7615,7 @@ cleanup:
     if (gl) FreeLibrary(gl);
     if (hdc) ReleaseDC(window, hdc);
     if (hdc2) ReleaseDC(window2, hdc2);
-    if (window) DestroyWindow(window);
+    DestroyWindow(window);
     if (window2) DestroyWindow(window2);
 }
 
-- 
2.20.1




More information about the wine-devel mailing list