diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-11-21 11:47:04 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-11-21 11:47:04 +0100 |
| commit | ce182e88a11c3f3a3218241a6046f3aeb08aabb7 (patch) | |
| tree | 0c738dec27fdbdf055bf72caa0c96a57d6a706cf /nx-X11/programs/Xserver/hw/nxagent/Window.c | |
| parent | 3b640a0f8de615e53dd6801ebd2aa0cf04f76c69 (diff) | |
| parent | dc43f4c98287b283747e47e37501c5ca158a8aa6 (diff) | |
| download | nx-libs-ce182e88a11c3f3a3218241a6046f3aeb08aabb7.tar.gz nx-libs-ce182e88a11c3f3a3218241a6046f3aeb08aabb7.tar.bz2 nx-libs-ce182e88a11c3f3a3218241a6046f3aeb08aabb7.zip | |
Merge branch 'uli42-pr/simplify_free' into 3.6.x
Attributes GH PR #555: https://github.com/ArcticaProject/nx-libs/pull/555
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Window.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Window.c | 19 |
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; |