aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-08-03 17:08:30 +0200
committerUlrich Sibiller <uli42@gmx.de>2021-01-15 19:50:35 +0100
commit5871100dd5db7f05e3f67cd90fda25dc9a68a29d (patch)
tree2cc9df2d7417799fd6f82ed34170c2e575df7cfb /nx-X11
parent41bf839792be7c20447251fd679b6132775749db (diff)
downloadnx-libs-5871100dd5db7f05e3f67cd90fda25dc9a68a29d.tar.gz
nx-libs-5871100dd5db7f05e3f67cd90fda25dc9a68a29d.tar.bz2
nx-libs-5871100dd5db7f05e3f67cd90fda25dc9a68a29d.zip
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."
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXpicture.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
index 159a7b55d..ae9de652a 100644
--- 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;