NXpicture.c: remove unneccessary check

Code can only be reached if pPicture is non-NULL. Besides, pPicture will be accessed later anyway, regardless of this check. Finding of PVS Studio: "V547 Expression 'pPicture != NULL' is always true."

NXpicture.c: remove unneccessary check
5871100d · Ulrich Sibiller · 41bf8397 · 5871100d
Commit 5871100d authored Aug 03, 2020 by Ulrich Sibiller
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 15 deletions

NXpicture.c nx-X11/programs/Xserver/hw/nxagent/NXpicture.c +12 -15

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
@@ -320,27 +320,24 @@ static PicturePtr createSourcePicture(void)
    if (!pPicture)
      return 0;

-    if (pPicture != NULL)
-    {
-      DevUnion *ppriv = (DevUnion *) (pPicture + 1);
+    DevUnion *ppriv = (DevUnion *) (pPicture + 1);

-      for (int i = 0; i < picturePrivateCount; ++i)
-      {
-        /*
-         * Other privates are inaccessible.
-         */
+    for (int i = 0; i < picturePrivateCount; ++i)
+    {
+      /*
+       * Other privates are inaccessible.
+       */

-        ppriv[i].ptr = NULL;
-      }
+      ppriv[i].ptr = NULL;
+    }

-      char *privPictureRecAddr = (char *) &ppriv[picturePrivateCount];
+    char *privPictureRecAddr = (char *) &ppriv[picturePrivateCount];

-      ppriv[nxagentPicturePrivateIndex].ptr = (void *) privPictureRecAddr;
+    ppriv[nxagentPicturePrivateIndex].ptr = (void *) privPictureRecAddr;

-      pPicture -> devPrivates = ppriv;
+    pPicture -> devPrivates = ppriv;

-      nxagentPicturePriv(pPicture) -> picture = 0;
-    }
+    nxagentPicturePriv(pPicture) -> picture = 0;

    pPicture->pDrawable = 0;
    pPicture->pFormat = 0;