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/Pixmap.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/Pixmap.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index be5408d13..853621709 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -1172,10 +1172,7 @@ Bool nxagentCheckPixmapIntegrity(PixmapPtr pPixmap) XDestroyImage(image); } - if (data != NULL) - { - free(data); - } + free(data); } else { @@ -1421,10 +1418,7 @@ FIXME: If the pixmap has a different depth from the window, the fprintf(stderr, "nxagentPixmapOnShadowDisplay: XCreateImage failed.\n"); #endif - if (data != NULL) - { - free(data); - } + free(data); return False; } @@ -1583,10 +1577,7 @@ Bool nxagentFbOnShadowDisplay() fprintf(stderr, "nxagentFbOnShadowDisplay: XCreateImage failed.\n"); #endif - if (data) - { - free(data); - } + free(data); return False; } |