aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Window.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-11-18 23:33:53 +0100
committerUlrich Sibiller <uli42@gmx.de>2017-11-21 01:41:57 +0100
commit7e975e3ccff9aa809c1fec7b2642615f2a934c10 (patch)
tree87c4b5833476c339d20af4af5bc04e3d1daa7603 /nx-X11/programs/Xserver/hw/nxagent/Window.c
parent3b640a0f8de615e53dd6801ebd2aa0cf04f76c69 (diff)
downloadnx-libs-7e975e3ccff9aa809c1fec7b2642615f2a934c10.tar.gz
nx-libs-7e975e3ccff9aa809c1fec7b2642615f2a934c10.tar.bz2
nx-libs-7e975e3ccff9aa809c1fec7b2642615f2a934c10.zip
simply free() calls
free() can handle NULL so there's no need to check this ourselves
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Window.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Window.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index d58a2516d..2fa6bc136 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -3151,12 +3151,7 @@ FIXME: Do we need to set save unders attribute here?
&hints);
#ifdef _XSERVER64
-
- if (data64 != NULL)
- {
- free(data64);
- }
-
+ free(data64);
#endif
}
}
@@ -3404,10 +3399,7 @@ Bool nxagentCheckWindowIntegrity(WindowPtr pWin)
XDestroyImage(image);
}
- if (data)
- {
- free(data);
- }
+ free(data);
}
else
{
@@ -3947,11 +3939,8 @@ int nxagentEmptyBSPixmapList()
for (i = 0; i < BSPIXMAPLIMIT; i++)
{
- if (nxagentBSPixmapList[i] != NULL)
- {
- free(nxagentBSPixmapList[i]);
- nxagentBSPixmapList[i] = NULL;
- }
+ free(nxagentBSPixmapList[i]);
+ nxagentBSPixmapList[i] = NULL;
}
return 1;