[PATCH v2] kernelbase: Remove redundant not-NULL check (coccinellery)

Zhiyi Zhang zzhang at codeweavers.com
Thu Feb 21 20:41:41 CST 2019


From: Michael Stefaniuc <mstefani at winehq.org>

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
---
v2: Also remove no longer needed braces. Supersede 159016

 dlls/kernelbase/path.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c
index dfcc825838..3eefcd7bc1 100644
--- a/dlls/kernelbase/path.c
+++ b/dlls/kernelbase/path.c
@@ -326,7 +326,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl
     if (!path1 || !path2) return PathAllocCanonicalize(path1 ? path1 : path2, flags, out);
 
     /* If path2 is fully qualified, use path2 only */
-    if (path2 && ((isalphaW(path2[0]) && path2[1] == ':') || (path2[0] == '\\' && path2[1] == '\\')))
+    if ((isalphaW(path2[0]) && path2[1] == ':') || (path2[0] == '\\' && path2[1] == '\\'))
     {
         path1 = path2;
         path2 = NULL;
-- 
2.20.1




More information about the wine-devel mailing list