From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Sat, 8 Sep 2018 13:56:49 +0000 (+0500)
Subject: MagickCore/xwindow.c: remove not needed check (#1292)
X-Git-Tag: 7.0.8-12~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e81c1a4553c43611ff28944c8c48313e32b1699;p=imagemagick

MagickCore/xwindow.c: remove not needed check (#1292)

found by cppcheck

there's already check in line 3367
https://github.com/ImageMagick/ImageMagick/blob/master/MagickCore/xwindow.c#L3367
---

diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index a394851fa..7149c4055 100644
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -3374,17 +3374,14 @@ MagickExport XrmDatabase XGetResourceDatabase(Display *display,
   /*
     Combine application database.
   */
-  if (client_name != (char *) NULL)
-    {
-      /*
-        Get basename of client.
-      */
-      p=client_name+(strlen(client_name)-1);
-      while ((p > client_name) && (*p != '/'))
-        p--;
-      if (*p == '/')
-        client_name=p+1;
-    }
+  /*
+    Get basename of client.
+  */
+  p=client_name+(strlen(client_name)-1);
+  while ((p > client_name) && (*p != '/'))
+    p--;
+  if (*p == '/')
+    client_name=p+1;
   c=(int) (*client_name);
   if ((c >= XK_a) && (c <= XK_z))
     c-=(XK_a-XK_A);