aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/PutImage.c
diff options
context:
space:
mode:
authorwalter harms <wharms@bfs.de>2014-06-05 18:37:40 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-10-19 21:40:29 +0200
commitfc26b97ea9053a2aba54824243282e27bc4a1e15 (patch)
treee4f0db001783947e7d522873d1e27aabe5e8885b /nx-X11/lib/X11/PutImage.c
parent191d1575f42affc0d86170132bef5a1535f7bdfa (diff)
downloadnx-libs-fc26b97ea9053a2aba54824243282e27bc4a1e15.tar.gz
nx-libs-fc26b97ea9053a2aba54824243282e27bc4a1e15.tar.bz2
nx-libs-fc26b97ea9053a2aba54824243282e27bc4a1e15.zip
Remove redundant null checks before free
This patch removes some redundant null checks before free. It should not change the code otherwise. Be aware that this is only the first series. Signed-off-by: Harms <wharms@bfs,de> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/lib/X11/PutImage.c')
-rw-r--r--nx-X11/lib/X11/PutImage.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/nx-X11/lib/X11/PutImage.c b/nx-X11/lib/X11/PutImage.c
index e6ac9a23f..de085bcde 100644
--- a/nx-X11/lib/X11/PutImage.c
+++ b/nx-X11/lib/X11/PutImage.c
@@ -740,8 +740,7 @@ SendXYImage(
bytes_per_src, bytes_per_line,
bytes_per_dest, req->height, half_order);
- if (extra)
- Xfree(extra);
+ Xfree(extra);
if (buf == dpy->bufptr)
dpy->bufptr += length;
@@ -793,8 +792,7 @@ SendZImage(
((req_xoffset == 0) ||
((req_yoffset + req->height) < (unsigned)image->height))) {
Data(dpy, (char *)src, length);
- if (shifted_src)
- Xfree(shifted_src);
+ Xfree(shifted_src);
return;
}
@@ -804,7 +802,7 @@ SendZImage(
else
if ((dest = (unsigned char *)
_XAllocScratch(dpy, length)) == NULL) {
- if (shifted_src) Xfree(shifted_src);
+ Xfree(shifted_src);
UnGetReq(PutImage);
return;
}
@@ -831,8 +829,7 @@ SendZImage(
else
_XSend(dpy, (char *)dest, length);
- if (shifted_src)
- Xfree(shifted_src);
+ Xfree(shifted_src);
}
static void