diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2017-11-18 23:33:53 +0100 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2017-11-21 01:41:57 +0100 |
| commit | 7e975e3ccff9aa809c1fec7b2642615f2a934c10 (patch) | |
| tree | 87c4b5833476c339d20af4af5bc04e3d1daa7603 /nx-X11/programs/Xserver/hw/nxagent/Colormap.c | |
| parent | 3b640a0f8de615e53dd6801ebd2aa0cf04f76c69 (diff) | |
| download | nx-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/Colormap.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Colormap.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c index c21bcbbe7..401f05b94 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c @@ -257,8 +257,7 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen) free(icws.cmapIDs); if (!nxagentSameInstalledColormapWindows(icws.windows, icws.numWindows)) { - if (nxagentOldInstalledColormapWindows) - free(nxagentOldInstalledColormapWindows); + free(nxagentOldInstalledColormapWindows); #ifdef _XSERVER64 { @@ -318,13 +317,12 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen) #endif /* DUMB_WINDOW_MANAGERS */ } else - if (icws.windows) free(icws.windows); + free(icws.windows); } void nxagentSetScreenSaverColormapWindow(ScreenPtr pScreen) { - if (nxagentOldInstalledColormapWindows) - free(nxagentOldInstalledColormapWindows); + free(nxagentOldInstalledColormapWindows); #ifdef _XSERVER64 { |